From ryuo at frugalware.org Sun Jun 1 00:58:54 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 00:58:55 2008 Subject: [Frugalware-git] lxde: lxde-common-0.3.2.1-1-i686 Message-ID: <20080531225854.78DF91190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=lxde.git;a=commitdiff;h=c2c59ac252fe808a125526cc11afc9b5ae75a089 commit c2c59ac252fe808a125526cc11afc9b5ae75a089 Author: James Buren Date: Sat May 31 17:52:22 2008 -0500 lxde-common-0.3.2.1-1-i686 * (new package) - common data files for LXDE diff --git a/source/xlib-extra/lxde-common/FrugalBuild b/source/xlib-extra/lxde-common/FrugalBuild new file mode 100644 index 0000000..aec683e --- /dev/null +++ b/source/xlib-extra/lxde-common/FrugalBuild @@ -0,0 +1,14 @@ +# Compiling Time: 0.06 SBU +# Maintainer: James Buren + +pkgname=lxde-common +pkgver=0.3.2.1 +pkgrel=1 +pkgdesc="common data files for LXDE" +_F_sourceforge_dirname=lxde +_F_sourceforge_ext=.tar.bz2 +Finclude sourceforge +depends=('glib2' 'libx11') +groups=('xlib-extra' 'lxde') +archs=('i686') +sha1sums=('7de00f580bc98194bc665a59b010e0ab1421acde') From ryuo at frugalware.org Sun Jun 1 01:02:15 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 01:02:16 2008 Subject: [Frugalware-git] frugalware-current: icesndcfg-1.3-1-i686 Message-ID: <20080531230215.712B41190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=678cfc89abc05c88d63e7d0b75b6e5d89016c94e commit 678cfc89abc05c88d63e7d0b75b6e5d89016c94e Author: James Buren Date: Sat May 31 18:00:19 2008 -0500 icesndcfg-1.3-1-i686 * changed maintainer back to me diff --git a/source/xapps-extra/icesndcfg/FrugalBuild b/source/xapps-extra/icesndcfg/FrugalBuild index 653a30a..9ba2e56 100644 --- a/source/xapps-extra/icesndcfg/FrugalBuild +++ b/source/xapps-extra/icesndcfg/FrugalBuild @@ -1,6 +1,5 @@ # Compiling Time: 0.01 SBU -# Maintainer: VMiklos -# Contributor: James Buren +# Maintainer: James Buren pkgname=icesndcfg pkgver=1.3 From ryuo at frugalware.org Sun Jun 1 01:04:00 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 01:04:01 2008 Subject: [Frugalware-git] frugalware-current: icets-1.4-1-i686 Message-ID: <20080531230400.987111190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6842d5309fa685c88d3561ca627951595bc99341 commit 6842d5309fa685c88d3561ca627951595bc99341 Author: James Buren Date: Sat May 31 18:02:04 2008 -0500 icets-1.4-1-i686 * changed maintainer back to me diff --git a/source/xapps-extra/icets/FrugalBuild b/source/xapps-extra/icets/FrugalBuild index c3c63b4..27cba7e 100644 --- a/source/xapps-extra/icets/FrugalBuild +++ b/source/xapps-extra/icets/FrugalBuild @@ -1,6 +1,5 @@ # Compiling Time: 0.01 SBU -# Maintainer: VMiklos -# Contributor: James Buren +# Maintainer: James Buren pkgname=icets pkgver=1.4 From ryuo at frugalware.org Sun Jun 1 01:15:02 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 01:15:03 2008 Subject: [Frugalware-git] frugalware-current: icewoed-1.8-1-i686 Message-ID: <20080531231502.A04D41190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9b14a658a50c03663b7cf7152b304496e1ef0d99 commit 9b14a658a50c03663b7cf7152b304496e1ef0d99 Author: James Buren Date: Sat May 31 18:04:23 2008 -0500 icewoed-1.8-1-i686 * changed maintainer back to me diff --git a/source/xapps-extra/icewoed/FrugalBuild b/source/xapps-extra/icewoed/FrugalBuild index 1e3d25b..ce66f4b 100644 --- a/source/xapps-extra/icewoed/FrugalBuild +++ b/source/xapps-extra/icewoed/FrugalBuild @@ -1,6 +1,5 @@ # Compiling Time: 0.04 SBU -# Maintainer: VMiklos -# Contributor: James Buren +# Maintainer: James Buren pkgname=icewoed pkgver=1.8 From ryuo at frugalware.org Sun Jun 1 01:15:02 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 01:15:06 2008 Subject: [Frugalware-git] frugalware-current: icemergeprefs-0.5-1-i686 Message-ID: <20080531231502.C12271190A46@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3a838b5f83c3c95e7ecccfecc8ecd85aa2e9ed2a commit 3a838b5f83c3c95e7ecccfecc8ecd85aa2e9ed2a Author: James Buren Date: Sat May 31 18:06:32 2008 -0500 icemergeprefs-0.5-1-i686 * changed maintainer back to me diff --git a/source/xapps-extra/icemergeprefs/FrugalBuild b/source/xapps-extra/icemergeprefs/FrugalBuild index ffb2594..99ece79 100644 --- a/source/xapps-extra/icemergeprefs/FrugalBuild +++ b/source/xapps-extra/icemergeprefs/FrugalBuild @@ -1,6 +1,5 @@ # Compiling Time: 0 SBU -# Maintainer: VMiklos -# Contributor: James Buren +# Maintainer: James Buren pkgname=icemergeprefs pkgver=0.5 From ryuo at frugalware.org Sun Jun 1 01:15:02 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 01:15:06 2008 Subject: [Frugalware-git] frugalware-current: iceked-1.5-1-i686 Message-ID: <20080531231502.CEA3E1190A47@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=40ec14c6e21a4721caae5b002c585ce04f9d8c8b commit 40ec14c6e21a4721caae5b002c585ce04f9d8c8b Author: James Buren Date: Sat May 31 18:07:43 2008 -0500 iceked-1.5-1-i686 * changed maintainer back to me diff --git a/source/xapps-extra/iceked/FrugalBuild b/source/xapps-extra/iceked/FrugalBuild index 2bd26aa..81459dc 100644 --- a/source/xapps-extra/iceked/FrugalBuild +++ b/source/xapps-extra/iceked/FrugalBuild @@ -1,6 +1,5 @@ # Compiling Time: 0.02 SBU -# Maintainer: VMiklos -# Contributor: James Buren +# Maintainer: James Buren pkgname=iceked pkgver=1.5 From ryuo at frugalware.org Sun Jun 1 01:15:02 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 01:15:07 2008 Subject: [Frugalware-git] frugalware-current: iceiconcvt-1.0-1-i686 Message-ID: <20080531231502.DE9EA1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8861d23818d748a4cc64976537dae5593faecba3 commit 8861d23818d748a4cc64976537dae5593faecba3 Author: James Buren Date: Sat May 31 18:08:44 2008 -0500 iceiconcvt-1.0-1-i686 * changed maintainer back to me diff --git a/source/xapps-extra/iceiconcvt/FrugalBuild b/source/xapps-extra/iceiconcvt/FrugalBuild index 5865388..5f483c5 100644 --- a/source/xapps-extra/iceiconcvt/FrugalBuild +++ b/source/xapps-extra/iceiconcvt/FrugalBuild @@ -1,6 +1,5 @@ # Compiling Time: 0 SBU -# Maintainer: VMiklos -# Contributor: James Buren +# Maintainer: James Buren pkgname=iceiconcvt pkgver=1.0 From ryuo at frugalware.org Sun Jun 1 01:15:02 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 01:15:07 2008 Subject: [Frugalware-git] frugalware-current: icecursorscfg-0.6-1-i686 Message-ID: <20080531231502.E9EDC1778050@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=67f44da4463a1fec105103beea1268427a8fca5b commit 67f44da4463a1fec105103beea1268427a8fca5b Author: James Buren Date: Sat May 31 18:09:41 2008 -0500 icecursorscfg-0.6-1-i686 * changed maintainer back to me diff --git a/source/xapps-extra/icecursorscfg/FrugalBuild b/source/xapps-extra/icecursorscfg/FrugalBuild index 1be5121..f8a608a 100644 --- a/source/xapps-extra/icecursorscfg/FrugalBuild +++ b/source/xapps-extra/icecursorscfg/FrugalBuild @@ -1,6 +1,5 @@ # Compiling Time: 0 SBU -# Maintainer: VMiklos -# Contributor: James Buren +# Maintainer: James Buren pkgname=icecursorscfg pkgver=0.6 From ryuo at frugalware.org Sun Jun 1 01:15:03 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 01:15:07 2008 Subject: [Frugalware-git] frugalware-current: icemc-2.1-1-i686 Message-ID: <20080531231503.011A21788047@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f40e1e336922bc3e19f8da1a6e77ab1e6bfde86d commit f40e1e336922bc3e19f8da1a6e77ab1e6bfde86d Author: James Buren Date: Sat May 31 18:10:31 2008 -0500 icemc-2.1-1-i686 * changed maintainer back to me diff --git a/source/xapps-extra/icemc/FrugalBuild b/source/xapps-extra/icemc/FrugalBuild index d635fe9..0aee2d9 100644 --- a/source/xapps-extra/icemc/FrugalBuild +++ b/source/xapps-extra/icemc/FrugalBuild @@ -1,6 +1,5 @@ # Compiling Time: 0.04 SBU -# Maintainer: VMiklos -# Contributor: James Buren +# Maintainer: James Buren pkgname=icemc pkgver=2.1 From ryuo at frugalware.org Sun Jun 1 01:15:03 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 01:15:07 2008 Subject: [Frugalware-git] frugalware-current: icebgset-1.3-1-i686 Message-ID: <20080531231503.1381817880A4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e124d18352e82d833df9735ffd4ecbed0cbdfe81 commit e124d18352e82d833df9735ffd4ecbed0cbdfe81 Author: James Buren Date: Sat May 31 18:11:12 2008 -0500 icebgset-1.3-1-i686 * changed maintainer back to me diff --git a/source/xapps-extra/icebgset/FrugalBuild b/source/xapps-extra/icebgset/FrugalBuild index 370256a..54b4356 100644 --- a/source/xapps-extra/icebgset/FrugalBuild +++ b/source/xapps-extra/icebgset/FrugalBuild @@ -1,6 +1,5 @@ # Compiling Time: 0.02 SBU -# Maintainer: VMiklos -# Contributor: James Buren +# Maintainer: James Buren pkgname=icebgset pkgver=1.3 From ryuo at frugalware.org Sun Jun 1 01:15:03 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 01:15:07 2008 Subject: [Frugalware-git] frugalware-current: icecc-2.9-1-i686 Message-ID: <20080531231503.1CF8417880AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c9bb820d22da323cba332e1c61d5725cc76915eb commit c9bb820d22da323cba332e1c61d5725cc76915eb Author: James Buren Date: Sat May 31 18:12:10 2008 -0500 icecc-2.9-1-i686 * changed maintainer back to me diff --git a/source/xapps-extra/icecc/FrugalBuild b/source/xapps-extra/icecc/FrugalBuild index efc5728..37f3131 100644 --- a/source/xapps-extra/icecc/FrugalBuild +++ b/source/xapps-extra/icecc/FrugalBuild @@ -1,6 +1,5 @@ # Compiling Time: 0.03 SBU -# Maintainer: VMiklos -# Contributor: James Buren +# Maintainer: James Buren pkgname=icecc pkgver=2.9 From vmiklos at frugalware.org Sun Jun 1 01:21:35 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 1 01:21:37 2008 Subject: [Frugalware-git] pacman-g2: updates for 3.7.0 Message-ID: <20080531232135.88D851190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=e035f5e2a603585bed47780be7cebe890acc5fa6 commit e035f5e2a603585bed47780be7cebe890acc5fa6 Author: Miklos Vajna Date: Sun Jun 1 01:20:50 2008 +0200 updates for 3.7.0 diff --git a/NEWS b/NEWS index c147c75..75200e4 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,15 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +3.7.0 - makepkg now properly installes documentation in some + special cases as well (for example README was missing + when there was a README.Frugalware) + - libpacman now handles the case better when a download is + interrupted + - improved documentation (README) + - makepkg now gives better error message when ccache is + misconfigured + - fixed a bug in the progressbar when it outputed a large + number of spaces on failed downloads 3.6.9 - makepkg: improved the chroot cleaning code - makepkg: fixed ccache support - properly continue a -Sy after a previous one was diff --git a/configure.ac b/configure.ac index ba4dc85..e594952 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ ENV_CFLAGS=$CFLAGS AC_PREREQ(2.59) dnl Update it right before the release since $pkgver_foo are all _post_ release snapshots -AC_INIT([pacman-g2 package manager], 3.6.9, [frugalware-devel@frugalware.org], pacman-g2) +AC_INIT([pacman-g2 package manager], 3.7.0, [frugalware-devel@frugalware.org], pacman-g2) AC_LANG(C) AM_CONFIG_HEADER(config.h) AC_CANONICAL_SYSTEM @@ -20,8 +20,8 @@ esac dnl Define here the libpacman version number PM_MAJOR_VERSION=0 PM_MINOR_VERSION=3 -PM_MICRO_VERSION=6 -PM_MICRO_VERSION_SUFFIX=.9 +PM_MICRO_VERSION=7 +PM_MICRO_VERSION_SUFFIX=.0 PM_VERSION=$PM_MAJOR_VERSION.$PM_MINOR_VERSION.$PM_MICRO_VERSION$PM_MICRO_VERSION_SUFFIX dnl Needed for libtool to create proper shared lib version PM_VERSION_INFO=`expr $PM_MAJOR_VERSION + $PM_MINOR_VERSION`:$PM_MICRO_VERSION:$PM_MINOR_VERSION From ryuo at frugalware.org Sun Jun 1 01:27:39 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 01:27:41 2008 Subject: [Frugalware-git] lxde: lxsession-0.3.5-1-i686 Message-ID: <20080531232739.A85591190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=lxde.git;a=commitdiff;h=aeaab10774930499369daf94fb8b4d600dcc9e57 commit aeaab10774930499369daf94fb8b4d600dcc9e57 Author: James Buren Date: Sat May 31 18:24:29 2008 -0500 lxsession-0.3.5-1-i686 * (new package) - the session manager for LXDE diff --git a/source/x11-extra/lxsession/FrugalBuild b/source/x11-extra/lxsession/FrugalBuild new file mode 100644 index 0000000..0ab1901 --- /dev/null +++ b/source/x11-extra/lxsession/FrugalBuild @@ -0,0 +1,20 @@ +# Compiling Time: 0.05 SBU +# Maintainer: James Buren + +pkgname=lxsession +pkgver=0.3.5 +pkgrel=1 +pkgdesc="session manager for LXDE" +_F_sourceforge_name=lxsession-lite +_F_sourceforge_dirname=lxde +Finclude sourceforge +depends=('gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'hal' 'libxdamage' 'libxext') +rodepends=('lxde-common') +makedepends=('intltool') +groups=('x11-extra' 'lxde') +archs=('i686') +sha1sums=('cc5827b8760ed140e8dfb7cf98a9432419384a5d') +Fconfopts="$Fconfopts --enable-hal" +_F_cd_path="$_F_sourceforge_name-$pkgver" + +# optimization OK From vmiklos at frugalware.org Sun Jun 1 01:49:35 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 1 01:49:37 2008 Subject: [Frugalware-git] frugalware-current: pacman-g2-3.7.0-1-i686 Message-ID: <20080531234935.D5D941190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0027c954c6fb8e4add9eb7cbf034ba48f33771a4 commit 0027c954c6fb8e4add9eb7cbf034ba48f33771a4 Author: Miklos Vajna Date: Sun Jun 1 01:49:22 2008 +0200 pacman-g2-3.7.0-1-i686 - version bump diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index d0c3155..d340358 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -4,9 +4,9 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=pacman-g2 -pkgver=3.6.9 +pkgver=3.7.0 Fuse $USE_DEVEL && pkgver=3.6.5.25.gf2bbdac -pkgrel=3 +pkgrel=1 pkgdesc="A .tar.bz2 based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/" backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current}) @@ -20,9 +20,8 @@ archs=('i686' 'x86_64' 'ppc') _F_archive_nosort=y up2date="lynx -dump $url/releases/ |Flasttar" if ! Fuse $USE_DEVEL; then - source=($url/releases/$pkgname-$pkgver.tar.gz \ - http://git.frugalware.org/patches/pacman-g2/3eb117791a8edccccaac2dca0066decc8916eff9.patch) - signatures=("$source.asc" '') + source=($url/releases/$pkgname-$pkgver.tar.gz) + signatures=("$source.asc") else _F_scm_type="git" _F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2" From ryuo at frugalware.org Sun Jun 1 01:50:05 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 01:50:06 2008 Subject: [Frugalware-git] lxde: lxappearance-0.2-1-i686 Message-ID: <20080531235005.40AC91190A46@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=lxde.git;a=commitdiff;h=4cc53b66c02d9eaa6949f041b2a31ccfbc47ad27 commit 4cc53b66c02d9eaa6949f041b2a31ccfbc47ad27 Author: James Buren Date: Sat May 31 18:38:33 2008 -0500 lxappearance-0.2-1-i686 * (new package) - gtk2 switcher for LXDE diff --git a/source/xapps-extra/lxappearance/FrugalBuild b/source/xapps-extra/lxappearance/FrugalBuild new file mode 100644 index 0000000..830f4e0 --- /dev/null +++ b/source/xapps-extra/lxappearance/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.04 SBU +# Maintainer: James Buren + +pkgname=lxappearance +pkgver=0.2 +pkgrel=1 +pkgdesc="gtk2 switcher for themes, icon themes, and fonts, for LXDE" +_F_sourceforge_dirname=lxde +Finclude sourceforge +depends=('gtk+2' 'glibc' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' 'libxext' 'libxml2') +groups=('xapps-extra' 'lxde') +archs=('i686') +sha1sums=('5dac8570f4597dd213936ea4efb36bcec476f4b3') + +# optimization OK From ryuo at frugalware.org Sun Jun 1 01:50:05 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 01:50:07 2008 Subject: [Frugalware-git] lxde: lxtask-0.1-1-i686 Message-ID: <20080531235005.4EA651190A47@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=lxde.git;a=commitdiff;h=875a3f82d5ec1c2ce5d501f8e348c4167c2da41b commit 875a3f82d5ec1c2ce5d501f8e348c4167c2da41b Author: James Buren Date: Sat May 31 18:39:42 2008 -0500 lxtask-0.1-1-i686 * (new package) - task manager for LXDE diff --git a/source/xapps-extra/lxtask/FrugalBuild b/source/xapps-extra/lxtask/FrugalBuild new file mode 100644 index 0000000..ca9833c --- /dev/null +++ b/source/xapps-extra/lxtask/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.05 SBU +# Maintainer: James Buren + +pkgname=lxtask +pkgver=0.1 +pkgrel=1 +pkgdesc="task manager for LXDE" +_F_sourceforge_dirname=lxde +Finclude sourceforge +depends=('gtk+2' 'glibc' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' 'libxext' 'libxml2') +groups=('xapps-extra' 'lxde') +archs=('i686') +sha1sums=('f27bbf418665479ae8403a5fea428d3a33855d34') + +# optimization OK From ryuo at frugalware.org Sun Jun 1 01:50:05 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 01:50:07 2008 Subject: [Frugalware-git] lxde: lxpanel-0.3.6.3-1-i686 Message-ID: <20080531235005.1F6FB1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=lxde.git;a=commitdiff;h=2ff73333d0c4b041dadece5f3f14004c10e9bc32 commit 2ff73333d0c4b041dadece5f3f14004c10e9bc32 Author: James Buren Date: Sat May 31 18:30:31 2008 -0500 lxpanel-0.3.6.3-1-i686 * (new package) - preferred panel for LXDE diff --git a/source/x11-extra/lxpanel/FrugalBuild b/source/x11-extra/lxpanel/FrugalBuild new file mode 100644 index 0000000..0a46647 --- /dev/null +++ b/source/x11-extra/lxpanel/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.17 SBU +# Maintainer: James Buren + +pkgname=lxpanel +pkgver=0.3.6.3 +pkgrel=1 +pkgdesc="preffered panel for LXDE" +_F_sourceforge_dirname=lxde +Finclude sourceforge +depends=('gtk+2' 'libxml2' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' 'libxext' 'alsa-lib' 'wireless_tools' 'libxpm') +makedepends=('intltool') +groups=('x11-extra' 'lxde') +archs=('i686') +sha1sums=('c271897686b731cfe2f8cb83997bade85cf84e5b') +Fconfopts="$Fconfopts --with-plugins=netstat,volumealsa,cpu,deskno,batt,kbled,xkb" + +# optimization OK From ryuo at frugalware.org Sun Jun 1 01:50:05 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 01:50:07 2008 Subject: [Frugalware-git] lxde: lxde-common-0.3.2.1-1-i686 Message-ID: <20080531235005.5B4F01190A48@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=lxde.git;a=commitdiff;h=eb87e8d327b88f8d49a6e4efe38a8a07ed33b1c9 commit eb87e8d327b88f8d49a6e4efe38a8a07ed33b1c9 Author: James Buren Date: Sat May 31 18:47:37 2008 -0500 lxde-common-0.3.2.1-1-i686 * uploaded fpm diff --git a/source/xlib-extra/lxde-common/FrugalBuild b/source/xlib-extra/lxde-common/FrugalBuild index aec683e..2320ba3 100644 --- a/source/xlib-extra/lxde-common/FrugalBuild +++ b/source/xlib-extra/lxde-common/FrugalBuild @@ -12,3 +12,5 @@ depends=('glib2' 'libx11') groups=('xlib-extra' 'lxde') archs=('i686') sha1sums=('7de00f580bc98194bc665a59b010e0ab1421acde') + +# optimization OK From ryuo at frugalware.org Sun Jun 1 07:31:37 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 07:31:38 2008 Subject: [Frugalware-git] frugalware-current: lilo-22.8-1-i686 Message-ID: <20080601053137.C77B21190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=62a5e43fd884701125e9d099df61fdcd7d14ae0c commit 62a5e43fd884701125e9d099df61fdcd7d14ae0c Author: James Buren Date: Sun Jun 1 00:20:08 2008 -0500 lilo-22.8-1-i686 * (new package) - the old school linux bootloader diff --git a/source/base-extra/lilo/FrugalBuild b/source/base-extra/lilo/FrugalBuild new file mode 100644 index 0000000..bcdc4fd --- /dev/null +++ b/source/base-extra/lilo/FrugalBuild @@ -0,0 +1,27 @@ +# Compiling Time: 0.03 SBU +# Maintainer: James Buren + +pkgname=lilo +pkgver=22.8 +pkgrel=1 +pkgdesc="the old school linux bootloader" +url="http://home.san.rr.com/johninsd/pub/linux/lilo" +depends=('coreutils' 'device-mapper') +makedepends=('bin86') +groups=('base-extra') +archs=('i686') +up2date="Flastarchive $url .src.tar.gz" +source=($url/$pkgname-$pkgver.src.tar.gz README.Frugalware lilo.conf) +sha1sums=('59852eab59b93dcea63b39eef1db7963b7268b0d' \ + 'b98002f08cb8f3d27296d5204bb1eefc3398c337' \ + '4c2d018ae8a2e928cca4af077d114b80443e4854') +build() +{ + Fcd + make CC="gcc $CFLAGS" all || Fdie + make ROOT=$Fdestdir install || Fdie + Fdoc README.Frugalware + Ffile /etc/lilo.conf +} + +# optimization OK diff --git a/source/base-extra/lilo/README.Frugalware b/source/base-extra/lilo/README.Frugalware new file mode 100644 index 0000000..421b21b --- /dev/null +++ b/source/base-extra/lilo/README.Frugalware @@ -0,0 +1,12 @@ +So, you feel like using lilo, do ya? Well, here ye shall find instructions for +retrofitting lilo to work with Frugalware. Some things to keep in mind: +1) lilo must be rerun every time you upgrade the kernel +2) lilo must also be rerun if you change configuration for it to take effect +3) only lilo or grub can be installed to your boot sector at the same time, +however they do not conflict while simply residing on your system + +You will find an example lilo.conf in /etc/lilo.conf already. You will need to +tweak it in order for it to match your system's booting setup. The default +structure is designed to reflect the most common setup I know of, but may +still require a lot of modifications. For more information on lilo, please +refer to man lilo and man lilo.conf. diff --git a/source/base-extra/lilo/lilo.conf b/source/base-extra/lilo/lilo.conf new file mode 100644 index 0000000..d273765 --- /dev/null +++ b/source/base-extra/lilo/lilo.conf @@ -0,0 +1,19 @@ +# +# /etc/lilo.conf +# +# Configuration settings for LILO +# + +boot=/dev/ +default=frugalware +timeout=50 +lba32 +prompt + +image=/boot/vmlinuz + label=frugalware + root=/dev/ + append="quiet" + vga=791 + read-only + From devil505linux at gmail.com Sun Jun 1 08:18:10 2008 From: devil505linux at gmail.com (Devil505) Date: Sun Jun 1 08:18:12 2008 Subject: [Frugalware-git] frugalware-current: playonlinux-3.0.1-1-i686 Message-ID: <20080601061810.48DED1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c6afd66f81108ae09990a49a94df18a34a4d4e6b commit c6afd66f81108ae09990a49a94df18a34a4d4e6b Author: Devil505 Date: Sun Jun 1 08:13:23 2008 +0200 playonlinux-3.0.1-1-i686 * version bump diff --git a/source/xapps-extra/playonlinux/FrugalBuild b/source/xapps-extra/playonlinux/FrugalBuild index d69b929..32f1dd8 100644 --- a/source/xapps-extra/playonlinux/FrugalBuild +++ b/source/xapps-extra/playonlinux/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=playonlinux -pkgver=3.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="GUI for managing Windows and DOS programs under linux" url="http://www.playonlinux.com" @@ -14,8 +14,8 @@ _F_archive_name="PlayOnLinux" Fpkgversep="_" _F_cd_path="$pkgname" up2date="lynx -dump $url/en/download-generic.html | Flasttar" -source=(http://www.playonlinux.com/script_files/PlayOnLinux/$pkgver/PlayOnLinux_$pkgver.tar.gz) -sha1sums=('8728330249281b0f3e7b1cf6bc46e5894b1de9f9') +source=(http://www.playonlinux.com/script_files/$_F_archive_name/$pkgver/PlayOnLinux_$pkgver.tar.gz) +sha1sums=('5dd516fa3e42907df5e7135396029a568c3ca417') build() { From ryuo at frugalware.org Sun Jun 1 08:19:29 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 08:19:30 2008 Subject: [Frugalware-git] frugalware-current: sakura-2.1.2-1-i686 Message-ID: <20080601061929.605111190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1d0049d1d91f79cf81cc87d1f1afec173501f940 commit 1d0049d1d91f79cf81cc87d1f1afec173501f940 Author: James Buren Date: Sun Jun 1 01:17:09 2008 -0500 sakura-2.1.2-1-i686 * version bump diff --git a/source/xapps-extra/sakura/FrugalBuild b/source/xapps-extra/sakura/FrugalBuild index 80fecbe..fbca0f5 100644 --- a/source/xapps-extra/sakura/FrugalBuild +++ b/source/xapps-extra/sakura/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=sakura -pkgver=2.1.1 +pkgver=2.1.2 pkgrel=1 pkgdesc="Sakura is a terminal emulator based on GTK and VTE." url="http://pleyades.net/david/sakura.php" @@ -13,7 +13,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url | grep -m1 tar.bz2 | sed 's/.*-\(.*\).ta.*/\1/'" source=(http://pleyades.net/david/projects/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('2f4574d45178c1b8e3918a48f903b5893c685a2a') +sha1sums=('5b89d41f0af47822648971cb5e1d1200523a0021') build() { From ryuo at frugalware.org Sun Jun 1 08:21:48 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 08:21:50 2008 Subject: [Frugalware-git] frugalware-current: ristretto-0.0.20-1-i686 Message-ID: <20080601062148.BB8801190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5defeb07bcd1cb368b6a9ed9abb30dbb10c2cfa9 commit 5defeb07bcd1cb368b6a9ed9abb30dbb10c2cfa9 Author: James Buren Date: Sun Jun 1 01:19:52 2008 -0500 ristretto-0.0.20-1-i686 * version bump diff --git a/source/xfce4/ristretto/FrugalBuild b/source/xfce4/ristretto/FrugalBuild index ba50791..d315d1b 100644 --- a/source/xfce4/ristretto/FrugalBuild +++ b/source/xfce4/ristretto/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=ristretto -pkgver=0.0.19 +pkgver=0.0.20 pkgrel=1 pkgdesc="A fast and lightweight picture viewer for Xfce." makedepends=('intltool') @@ -13,6 +13,6 @@ _F_gnome_iconcache="y" _F_xfce_goodies_ext=".tar.gz" Finclude xfce4 gnome-scriptlet url="http://goodies.xfce.org/projects/applications/ristretto" -sha1sums=('4cf6a7c65f209ee47da68bc28b71fde17c6578c0') +sha1sums=('c8070c52641fa0a369f1b4221247154901583938') # optimization OK From ryuo at frugalware.org Sun Jun 1 08:24:18 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 1 08:24:20 2008 Subject: [Frugalware-git] frugalware-current: xfce4-mount-plugin-0.5.5-1-i686 Message-ID: <20080601062418.E2DB31190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=92a856d5279f2164ba01bd2712c36227969782fe commit 92a856d5279f2164ba01bd2712c36227969782fe Author: James Buren Date: Sun Jun 1 01:22:21 2008 -0500 xfce4-mount-plugin-0.5.5-1-i686 * version bump diff --git a/source/xfce4/xfce4-mount-plugin/FrugalBuild b/source/xfce4/xfce4-mount-plugin/FrugalBuild index 6c9e20c..ae8a93f 100644 --- a/source/xfce4/xfce4-mount-plugin/FrugalBuild +++ b/source/xfce4/xfce4-mount-plugin/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-mount-plugin -pkgver=0.5.4 +pkgver=0.5.5 pkgrel=1 pkgdesc="A disk mount/unmout plugin for the Xfce4 panel." makedepends=('intltool') @@ -12,6 +12,6 @@ archs=('i686' 'x86_64') _F_gnome_iconcache="y" Finclude xfce4 Finclude gnome-scriptlet -sha1sums=('95cc9066ae7235d5d237e5d6c83408e66b9a1890') +sha1sums=('1215093edd37e684542dc14375a1c349eee64a2c') # optimization OK From bouleetbil at frogdev.info Sun Jun 1 10:21:26 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jun 1 10:21:28 2008 Subject: [Frugalware-git] frugalware-current: hippo-canvas-0.2.31-1-i686 Message-ID: <20080601082126.5F9271190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=36b6326144883280f8514d111d37d288c251fd2b commit 36b6326144883280f8514d111d37d288c251fd2b Author: bouleetbil Date: Sun Jun 1 10:14:22 2008 +0200 hippo-canvas-0.2.31-1-i686 *new package diff --git a/source/xlib-extra/hippo-canvas/FrugalBuild b/source/xlib-extra/hippo-canvas/FrugalBuild new file mode 100644 index 0000000..dfc411b --- /dev/null +++ b/source/xlib-extra/hippo-canvas/FrugalBuild @@ -0,0 +1,28 @@ +# Compiling Time: 0.23 SBU +# Maintainer: bouleetbil + +pkgname=hippo-canvas +pkgver=0.2.31 +pkgrel=1 +pkgdesc="Hippocanvas is a canvas library based on GTK+2.0" +depends=('gtk+2' 'libcroco' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' \ + 'libxext' 'libffi') +makedepends=('perl-xml-parser' 'intltool' 'pygtk') +options=('scriptlet') +groups=('xlib-extra') +archs=('i686') +Finclude gnome python +sha1sums=('cb44ede5371c5982f830e2f4334dcdf56ac07caf') +Fconfopts="${Fconfopts[@]} --enable-python" +subpkgs=("hippo-canvas-python") +subdescs=('python support hippo-canvas') +subdepends=("$pkgname=$pkgver pygtk") +subgroups=('xlib-extra') +subarchs=('i686') + +build() { + Fbuild + Fsplit hippo-canvas-python $_F_python_libdir +} + +# optimization OK From krics at linuxforum.hu Sun Jun 1 10:31:50 2008 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Jun 1 10:31:51 2008 Subject: [Frugalware-git] frugalware-current: gnome-keyring-2.22.2-1-x86_64 Message-ID: <20080601083150.1DBFE1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c60da666072488822ac6c826bb5382e665525386 commit c60da666072488822ac6c826bb5382e665525386 Author: Christian Hamar alias krix Date: Sun Jun 1 10:31:42 2008 +0200 gnome-keyring-2.22.2-1-x86_64 * Version bump diff --git a/source/gnome/gnome-keyring/FrugalBuild b/source/gnome/gnome-keyring/FrugalBuild index 8dc80ac..6a34d74 100644 --- a/source/gnome/gnome-keyring/FrugalBuild +++ b/source/gnome/gnome-keyring/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-keyring -pkgver=2.22.1 +pkgver=2.22.2 pkgrel=1 pkgdesc="Password and keyring managing daemon for GNOME" url="http://www.gnome.org/" @@ -14,5 +14,5 @@ _F_gnome_schemas=('/etc/gconf/schemas/gnome-keyring.schemas') Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-gtk-doc" -sha1sums=('59956194b110a4e4576db0791e2d2371b39ff49c') +sha1sums=('b3276e2c349b761d167df9bdbb9c19268af2bd4b') # optimization OK From janny at frugalware.org Sun Jun 1 10:38:41 2008 From: janny at frugalware.org (Janos Kovacs) Date: Sun Jun 1 10:38:43 2008 Subject: [Frugalware-git] frugalware-current: gimp-2.4.6-1-i686 Message-ID: <20080601083841.7006A1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c7857bb4b262de71b7cc8a6a6233379c037c3769 commit c7857bb4b262de71b7cc8a6a6233379c037c3769 Author: Janos Kovacs Date: Sun Jun 1 10:35:33 2008 +0200 gimp-2.4.6-1-i686 * version bump * GIMP 2.4.6 is a bug-fix release in the stable 2.4 series. diff --git a/source/xapps/gimp/FrugalBuild b/source/xapps/gimp/FrugalBuild index 1440722..5664cf5 100644 --- a/source/xapps/gimp/FrugalBuild +++ b/source/xapps/gimp/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: VMiklos pkgname=gimp -pkgver=2.4.5 -pkgrel=3 +pkgver=2.4.6 +pkgrel=1 pkgdesc="The GNU Image Manipulation Program" url="http://www.gimp.org/" depends=('librsvg' 'libmng' 'libexif>=0.6.12-3' 'alsa-lib' 'libgtkhtml>=2.11.1-2' \ @@ -14,7 +14,7 @@ archs=('i686' 'x86_64') makedepends=('gimp-print' 'perl-xml-parser') up2date="lynx -dump $url/downloads/|grep tar.bz2|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" source=(ftp://ftp.gimp.org/pub/gimp/v2.4/$pkgname-$pkgver.tar.bz2) -sha1sums=('70cf6af5700cf6db73fca898510873394eb95581') +sha1sums=('6cbfda0da19bf5a2221013afe32643e3c09aeeda') options=('scriptlet' 'force') _F_gnome_desktop="y" Finclude gnome-scriptlet From devil505linux at gmail.com Sun Jun 1 11:48:44 2008 From: devil505linux at gmail.com (Devil505) Date: Sun Jun 1 11:48:45 2008 Subject: [Frugalware-git] frugalware-current: seahorse-2.22.2-1-i686 Message-ID: <20080601094844.844E81190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e6728d8815b043e65236b086c829b3b4ec5712ad commit e6728d8815b043e65236b086c829b3b4ec5712ad Author: Devil505 Date: Sun Jun 1 11:48:19 2008 +0200 seahorse-2.22.2-1-i686 * version bump diff --git a/source/gnome-extra/seahorse/FrugalBuild b/source/gnome-extra/seahorse/FrugalBuild index 9b348e6..512c102 100644 --- a/source/gnome-extra/seahorse/FrugalBuild +++ b/source/gnome-extra/seahorse/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Priyank Gosalia pkgname=seahorse -pkgver=2.22.1 -pkgrel=3 +pkgver=2.22.2 +pkgrel=1 pkgdesc="A GNOME application for managing PGP keys." url="http://www.seahorse.sourceforge.net/" depends=('gnutls=2.2.5-1' 'gtksourceview' 'gnupg' 'gpgme' 'libsoup' 'dbus' \ @@ -20,7 +20,7 @@ _F_gnome_desktop="y" _F_gnome_iconcache="y" _F_gnome_mime="y" Finclude gnome gnome-scriptlet -sha1sums=('c6a96ac670540522c6ec0d6a3871a6ed711fb082') +sha1sums=('d7b5c8d4176a2f4384fc032312c5b0f01883c7ae') subpkgs=("$pkgname-gedit" "$pkgname-nautilus" "$pkgname-applet") subdescs=('seahorse encryption plugin for gedit' \ 'seahorse encryption extension for nautilus' \ From krics at linuxforum.hu Sun Jun 1 13:24:06 2008 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Jun 1 13:24:09 2008 Subject: [Frugalware-git] frugalware-current: gtk+2-engines-2.14.2-1-x86_64 Message-ID: <20080601112406.DA8C61190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=197987d60997c0f501be3d5a3f7307f1a6c67bc2 commit 197987d60997c0f501be3d5a3f7307f1a6c67bc2 Author: Christian Hamar alias krix Date: Sun Jun 1 13:23:56 2008 +0200 gtk+2-engines-2.14.2-1-x86_64 * Version bump diff --git a/source/xlib/gtk+2-engines/FrugalBuild b/source/xlib/gtk+2-engines/FrugalBuild index c1b7abe..2108905 100644 --- a/source/xlib/gtk+2-engines/FrugalBuild +++ b/source/xlib/gtk+2-engines/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gtk+2-engines _F_gnome_name=gtk-engines -pkgver=2.14.1 +pkgver=2.14.2 pkgrel=1 pkgdesc="Theme engines for GTK+2" url="http://www.gnome.org/" @@ -16,6 +16,6 @@ provides=('gtk+2-engines-clearlooks' 'gtk+2-engines-industrial') Finclude gnome _F_cd_path="gtk-engines-$pkgver" Fconfopts="$Fconfopts --enable-animation" -sha1sums=('e4713d44df431c83b1640457b90abc3ddc71d9b1') +sha1sums=('31ed1b8fdce79cd89558c9069e4b71a4eff19ce6') # optimization OK From bouleetbil at frogdev.info Sun Jun 1 13:25:36 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jun 1 13:25:38 2008 Subject: [Frugalware-git] frugalware-current: gnucash-2.2.5-1-i686 Message-ID: <20080601112536.5E8D71190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1ed90cf79de4b35a2e1b6262b8362870e2a8ec2e commit 1ed90cf79de4b35a2e1b6262b8362870e2a8ec2e Author: bouleetbil Date: Sun Jun 1 12:23:04 2008 +0200 gnucash-2.2.5-1-i686 *version bump *add _F_gnome_iconcache *add /etc/gconf/schemas/apps_gnucash_import_qif.schemas diff --git a/source/gnome-extra/gnucash/FrugalBuild b/source/gnome-extra/gnucash/FrugalBuild index b1b27ec..eeb166b 100644 --- a/source/gnome-extra/gnucash/FrugalBuild +++ b/source/gnome-extra/gnucash/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gnucash -pkgver=2.2.2 +pkgver=2.2.5 pkgrel=1 pkgdesc="GnuCash is an application to keep track of your finances." url="http://www.gnucash.org/" @@ -25,14 +25,17 @@ _F_gnome_schemas=('/etc/gconf/schemas/apps_gnucash_dialog_business_common.schema '/etc/gconf/schemas/apps_gnucash_history.schemas' \ '/etc/gconf/schemas/apps_gnucash_import_generic_matcher.schemas' \ '/etc/gconf/schemas/apps_gnucash_warnings.schemas' \ + '/etc/gconf/schemas/apps_gnucash_import_qif.schemas' \ '/etc/gconf/schemas/apps_gnucash_window_pages_account_tree.schemas' \ '/etc/gconf/schemas/apps_gnucash_window_pages_register.schemas') _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" +_F_gnome_iconcache="y" Finclude gnome gnome-scriptlet up2date=("lynx -dump http://www.gnucash.org/pub/gnucash/sources/stable/ | grep gnucash | grep -v gnucash-docs| Flasttar") source=(http://www.gnucash.org/pub/gnucash/sources/stable/$pkgname-$pkgver.tar.gz) unset MAKEFLAGS -sha1sums=('cf040f5eb934521303d4e758b3f0eef112dbb5af') +sha1sums=('91fc316baf7d29a49d3f4be3b2e4aefb5403159c') + # optimization OK From bouleetbil at frogdev.info Sun Jun 1 13:42:09 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jun 1 13:42:10 2008 Subject: [Frugalware-git] frugalware-current: notecase-1.9.1-1-i686 Message-ID: <20080601114209.060F31190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dd3bd733bdeede73138d0356f2449bbf969839aa commit dd3bd733bdeede73138d0356f2449bbf969839aa Author: bouleetbil Date: Sun Jun 1 13:36:26 2008 +0200 notecase-1.9.1-1-i686 *version bump *fix options=('scriptlet') diff --git a/source/gnome-extra/notecase/FrugalBuild b/source/gnome-extra/notecase/FrugalBuild index 903a195..a900a76 100644 --- a/source/gnome-extra/notecase/FrugalBuild +++ b/source/gnome-extra/notecase/FrugalBuild @@ -2,17 +2,18 @@ # Maintainer: Christian Hamar alias krix pkgname=notecase -pkgver=1.7.4 +pkgver=1.9.1 pkgrel=1 pkgdesc="a hierarchical note manager (aka. outliner)" depends=('avahi' 'gnome-vfs') groups=('gnome-extra') archs=('i686' 'x86_64') +options=('scriptlet') _F_sourceforge_ext=_src.zip _F_gnome_desktop="y" _F_gnome_mime="y" Finclude sourceforge gnome-scriptlet url="http://notecase.sourceforge.net/" -options=('scriptlet') -sha1sums=('9156194f48553ae4a17f9fcf7151d42c0f146793') +sha1sums=('cb966d8c069e02c52832ff7cb0cbf83bcf44820f') + # optimization OK From bouleetbil at frogdev.info Sun Jun 1 14:29:26 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jun 1 14:29:28 2008 Subject: [Frugalware-git] frugalware-current: gnome-themes-2.22.2-1 Message-ID: <20080601122926.865661190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b6e31620de7b61e12bdce797ac209d306e535c4f commit b6e31620de7b61e12bdce797ac209d306e535c4f Author: bouleetbil Date: Sun Jun 1 14:05:41 2008 +0200 gnome-themes-2.22.2-1 *version bump diff --git a/source/gnome/gnome-themes/FrugalBuild b/source/gnome/gnome-themes/FrugalBuild index ea96252..77dab4a 100644 --- a/source/gnome/gnome-themes/FrugalBuild +++ b/source/gnome/gnome-themes/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-themes -pkgver=2.22.0 +pkgver=2.22.2 pkgrel=1 pkgdesc="Default themes for GNOME" url="http://www.gnome.org/" @@ -11,4 +11,4 @@ makedepends=('perl-xml-parser' 'icon-naming-utils') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') Finclude gnome -sha1sums=('e04a77f401a016abfd6d16c386e676527621400c') +sha1sums=('ec386aea350cd22d1a5769a8ca011f59660d9ff6') From crazy at frugalware.org Sun Jun 1 14:47:43 2008 From: crazy at frugalware.org (crazy) Date: Sun Jun 1 14:47:45 2008 Subject: [Frugalware-git] frugalware-current: lilo-22.8-1-x86_64 Message-ID: <20080601124743.AD93E1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6badaed592139b6c00496df51f02e69be67253d6 commit 6badaed592139b6c00496df51f02e69be67253d6 Author: crazy Date: Sun Jun 1 14:47:05 2008 +0200 lilo-22.8-1-x86_64 * added missing backup for lilo.conf * yeah sure add it as fpm and tell the user * to fsck off and update and hack everything manually ? * no please it is 'Frugalware' and not 'Archfoo'.. * added nobuild , that should make clear we don't support it. diff --git a/source/base-extra/lilo/FrugalBuild b/source/base-extra/lilo/FrugalBuild index bcdc4fd..abf92d0 100644 --- a/source/base-extra/lilo/FrugalBuild +++ b/source/base-extra/lilo/FrugalBuild @@ -10,6 +10,8 @@ depends=('coreutils' 'device-mapper') makedepends=('bin86') groups=('base-extra') archs=('i686') +backup=('etc/lilo.conf') +options=('nobuild') up2date="Flastarchive $url .src.tar.gz" source=($url/$pkgname-$pkgver.src.tar.gz README.Frugalware lilo.conf) sha1sums=('59852eab59b93dcea63b39eef1db7963b7268b0d' \ From vmiklos at frugalware.org Sun Jun 1 15:00:58 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 1 15:01:00 2008 Subject: [Frugalware-git] frugalware-current: lilo-22.8-1-i686 Message-ID: <20080601130058.028AE1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7e26b9af445e96d78a28415894c21f2b6014459b commit 7e26b9af445e96d78a28415894c21f2b6014459b Author: Miklos Vajna Date: Sun Jun 1 15:00:15 2008 +0200 lilo-22.8-1-i686 - README.Frugalware: convert to asciidoc - minor spelling fixes (ya -> you) diff --git a/source/base-extra/lilo/FrugalBuild b/source/base-extra/lilo/FrugalBuild index abf92d0..d3010c7 100644 --- a/source/base-extra/lilo/FrugalBuild +++ b/source/base-extra/lilo/FrugalBuild @@ -15,7 +15,7 @@ options=('nobuild') up2date="Flastarchive $url .src.tar.gz" source=($url/$pkgname-$pkgver.src.tar.gz README.Frugalware lilo.conf) sha1sums=('59852eab59b93dcea63b39eef1db7963b7268b0d' \ - 'b98002f08cb8f3d27296d5204bb1eefc3398c337' \ + 'f0dc15f59ff37a21abb555d35702a878217cb2ce' \ '4c2d018ae8a2e928cca4af077d114b80443e4854') build() { diff --git a/source/base-extra/lilo/README.Frugalware b/source/base-extra/lilo/README.Frugalware index 421b21b..4aaba65 100644 --- a/source/base-extra/lilo/README.Frugalware +++ b/source/base-extra/lilo/README.Frugalware @@ -1,12 +1,18 @@ -So, you feel like using lilo, do ya? Well, here ye shall find instructions for -retrofitting lilo to work with Frugalware. Some things to keep in mind: -1) lilo must be rerun every time you upgrade the kernel -2) lilo must also be rerun if you change configuration for it to take effect -3) only lilo or grub can be installed to your boot sector at the same time, -however they do not conflict while simply residing on your system - -You will find an example lilo.conf in /etc/lilo.conf already. You will need to +So, you feel like using `lilo`, do you? Well, here you will find +instructions for configuring `lilo` to work with Frugalware. Some things +to keep in mind: + +. `lilo` must be rerun every time you upgrade the kernel + +. `lilo` must also be rerun if you change configuration for it to take effect + +. only `lilo` or grub can be installed to your boot sector at the same + time, however they do not conflict while simply residing on your system + +You will find an example `lilo.conf` in `/etc/lilo.conf` already. You will need to tweak it in order for it to match your system's booting setup. The default structure is designed to reflect the most common setup I know of, but may -still require a lot of modifications. For more information on lilo, please -refer to man lilo and man lilo.conf. +still require a lot of modifications. For more information on `lilo`, please +refer to `man lilo` and `man lilo.conf`. + +// vim: ft=asciidoc From vmiklos at frugalware.org Sun Jun 1 15:09:12 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 1 15:09:13 2008 Subject: [Frugalware-git] frugalware-current: tailor-0.9.34-1-i686 Message-ID: <20080601130912.DF6BD1190A46@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c095a5a1a9329823117172119464577c1bd56e53 commit c095a5a1a9329823117172119464577c1bd56e53 Author: Miklos Vajna Date: Sun Jun 1 15:05:50 2008 +0200 tailor-0.9.34-1-i686 - version bump diff --git a/source/devel-extra/tailor/FrugalBuild b/source/devel-extra/tailor/FrugalBuild index b68537e..0827382 100644 --- a/source/devel-extra/tailor/FrugalBuild +++ b/source/devel-extra/tailor/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=tailor -pkgver=0.9.33 +pkgver=0.9.34 pkgrel=1 pkgdesc="Tailor is a tool to migrate changesets between various repository formats." url="http://progetti.arstecnica.it/tailor" @@ -11,4 +11,4 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="Flasttar http://darcs.arstecnica.it/" source=(http://darcs.arstecnica.it/tailor-$pkgver.tar.gz) -sha1sums=('54323b942dc7deb4235126683cb64846ff392b18') +sha1sums=('a1d02afeec3a9510e4a5ffe95a2a2bae68d56414') From vmiklos at frugalware.org Sun Jun 1 15:09:12 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 1 15:09:15 2008 Subject: [Frugalware-git] frugalware-current: lxml-2.0.6-1-i686 Message-ID: <20080601130912.CABF11190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=08b56c65b433621e848bebb981a013d3a1af971d commit 08b56c65b433621e848bebb981a013d3a1af971d Author: Miklos Vajna Date: Sun Jun 1 15:04:56 2008 +0200 lxml-2.0.6-1-i686 - version bump diff --git a/source/devel-extra/lxml/FrugalBuild b/source/devel-extra/lxml/FrugalBuild index 3c27064..f57dbbe 100644 --- a/source/devel-extra/lxml/FrugalBuild +++ b/source/devel-extra/lxml/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=lxml -pkgver=2.0.5 +pkgver=2.0.6 pkgrel=1 pkgdesc="Easy-to-use library for working with XML and HTML in Python." url="http://codespeak.net/lxml/" @@ -11,7 +11,7 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep latest|sed 's/.*lxml \(.*\), .*/\1/;q'" source=(http://cheeseshop.python.org/packages/source/l/lxml/lxml-$pkgver.tar.gz) -sha1sums=('e04f526aef2538efeb910188ff6e906ad74e98ce') +sha1sums=('b0a077a9da58aaaeae5a7337ce3a99f32d07da96') build() { From vmiklos at frugalware.org Sun Jun 1 15:09:13 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 1 15:09:15 2008 Subject: [Frugalware-git] frugalware-current: perl-svn-mirror-0.74-1-i686 Message-ID: <20080601130913.02C4E1190A48@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d551d01c100b583a6264128ec1a54097620a5981 commit d551d01c100b583a6264128ec1a54097620a5981 Author: Miklos Vajna Date: Sun Jun 1 15:07:34 2008 +0200 perl-svn-mirror-0.74-1-i686 - version bump diff --git a/source/devel-extra/perl-svn-mirror/FrugalBuild b/source/devel-extra/perl-svn-mirror/FrugalBuild index f127fde..b4eb7a4 100644 --- a/source/devel-extra/perl-svn-mirror/FrugalBuild +++ b/source/devel-extra/perl-svn-mirror/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Zsolt Szalai pkgname=perl-svn-mirror -pkgver=0.73 +pkgver=0.74 pkgrel=1 pkgdesc="Mirror remote repository to local Subversion repository" depends=('perl-readkey' 'perl-file-chdir' 'perl-class-accessor>=0.30' \ @@ -14,4 +14,4 @@ _F_perl_author=C/CL/CLKAO _F_conf_perl_pipefrom="echo n" Finclude perl archs=('i686' 'x86_64') -sha1sums=('9733e39a512af571b39ba236f1e33f20ce517148') +sha1sums=('81784651495ad88a777cdcde8cf1ff8ed089d024') From vmiklos at frugalware.org Sun Jun 1 15:09:13 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 1 15:09:15 2008 Subject: [Frugalware-git] frugalware-current: perl-date-manip-5.54-1-i686 Message-ID: <20080601130913.0CF5D1190A49@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=176e612537e6802226a4faa6235fc4cbf5469165 commit 176e612537e6802226a4faa6235fc4cbf5469165 Author: Miklos Vajna Date: Sun Jun 1 15:09:03 2008 +0200 perl-date-manip-5.54-1-i686 - version bump diff --git a/source/devel-extra/perl-date-manip/FrugalBuild b/source/devel-extra/perl-date-manip/FrugalBuild index 9a29595..3403723 100644 --- a/source/devel-extra/perl-date-manip/FrugalBuild +++ b/source/devel-extra/perl-date-manip/FrugalBuild @@ -3,9 +3,9 @@ _F_perl_name=Date-Manip _F_perl_author=S/SB/SBECK -pkgver=5.50 +pkgver=5.54 pkgrel=1 pkgdesc="Routines for parsing/manipulating dates and time." Finclude perl archs=('i686' 'x86_64') -sha1sums=('bd5fd89f775f2ed303b81ade433b91d0c402c2cb') +sha1sums=('88ce43556343024c3b86815e4938399226eab55a') From vmiklos at frugalware.org Sun Jun 1 15:09:12 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 1 15:09:16 2008 Subject: [Frugalware-git] frugalware-current: perl-time-format-1.09-1-i686 Message-ID: <20080601130912.ED7121190A47@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f542fe4a3c990dab565643db20c9f480e9e23e67 commit f542fe4a3c990dab565643db20c9f480e9e23e67 Author: Miklos Vajna Date: Sun Jun 1 15:06:22 2008 +0200 perl-time-format-1.09-1-i686 - version bump diff --git a/source/devel-extra/perl-time-format/FrugalBuild b/source/devel-extra/perl-time-format/FrugalBuild index 77a4ef3..4f18563 100644 --- a/source/devel-extra/perl-time-format/FrugalBuild +++ b/source/devel-extra/perl-time-format/FrugalBuild @@ -3,8 +3,8 @@ _F_perl_name=Time-Format _F_perl_author=R/RO/ROODE -pkgver=1.07 +pkgver=1.09 pkgdesc="Easy-to-use date/time formatting." Finclude perl -sha1sums=('89bf001bbac63da6b71cc9aadf94df6ee6947ade') +sha1sums=('f032b862337b547bc7a5e6e7902e8e476502f9bf') archs=(${archs[@]} 'x86_64') From vmiklos at frugalware.org Sun Jun 1 16:56:55 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 1 16:56:57 2008 Subject: [Frugalware-git] frugalware-current: imlib2-1.4.0-2-i686 Message-ID: <20080601145655.3D5641190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9a1ae6bc9acd3e1513881acbe101fc446074c761 commit 9a1ae6bc9acd3e1513881acbe101fc446074c761 Author: Miklos Vajna Date: Sun Jun 1 16:56:13 2008 +0200 imlib2-1.4.0-2-i686 - added CVE-2008-2426.patch - closes #3124 diff --git a/source/xlib/imlib2/CVE-2008-2426.patch b/source/xlib/imlib2/CVE-2008-2426.patch new file mode 100644 index 0000000..87269fd --- /dev/null +++ b/source/xlib/imlib2/CVE-2008-2426.patch @@ -0,0 +1,98 @@ +diff -Nur imlib2-1.2.1/src/modules/loaders/loader_argb.c imlib2-1.2.1.new/src/modules/loaders/loader_argb.c +--- imlib2-1.2.1/src/modules/loaders/loader_argb.c 2006-11-06 01:27:59.000000000 -0800 ++++ imlib2-1.2.1.new/src/modules/loaders/loader_argb.c 2006-11-06 01:30:41.000000000 -0800 +@@ -23,7 +23,7 @@ + load(ImlibImage * im, ImlibProgressFunction progress, + char progress_granularity, char immediate_load) + { +- int w, h, alpha; ++ int w=0, h=0, alpha=0; + FILE *f; + + if (im->data) +@@ -36,6 +36,8 @@ + { + char buf[256], buf2[256]; + ++ memset(buf, 0, sizeof(buf)); ++ memset(buf2, 0, sizeof(buf)); + if (!fgets(buf, 255, f)) + { + fclose(f); +diff -Nur imlib2-1.2.1/src/modules/loaders/loader_jpeg.c imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c +--- imlib2-1.2.1/src/modules/loaders/loader_jpeg.c 2006-11-06 01:27:59.000000000 -0800 ++++ imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c 2006-11-06 01:33:01.000000000 -0800 +@@ -104,8 +104,9 @@ + im->w = w = cinfo.output_width; + im->h = h = cinfo.output_height; + +- if (cinfo.rec_outbuf_height > 16) ++ if (cinfo.rec_outbuf_height > 16 || w < 1 || h < 1 || w > 16383 || h > 16383) + { ++ im->w = im->h = 0; + jpeg_destroy_decompress(&cinfo); + fclose(f); + return 0; +diff -Nur imlib2-1.2.1/src/modules/loaders/loader_lbm.c imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c +--- imlib2-1.2.1/src/modules/loaders/loader_lbm.c 2006-11-06 01:27:59.000000000 -0800 ++++ imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c 2006-11-06 01:30:41.000000000 -0800 +@@ -453,6 +453,7 @@ + } + } + if (!full || !ok) { ++ im->w = im->h = 0; + freeilbm(&ilbm); + return ok; + } +@@ -467,12 +468,13 @@ + cancel = 0; + plane[0] = NULL; + ++ n = ilbm.depth; ++ if (ilbm.mask == 1) n++; ++ + im->data = malloc(im->w * im->h * sizeof(DATA32)); +- if (im->data) { +- n = ilbm.depth; +- if (ilbm.mask == 1) n++; ++ plane[0] = malloc(((im->w + 15) / 16) * 2 * n); ++ if (im->data && plane[0]) { + +- plane[0] = malloc(((im->w + 15) / 16) * 2 * n); + for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2; + + z = ((im->w + 15) / 16) * 2 * n; +@@ -511,6 +513,7 @@ + * the memory for im->data. + *----------*/ + if (!ok) { ++ im->w = im->h = 0; + if (im->data) free(im->data); + im->data = NULL; + } +diff -Nur imlib2-1.2.1/src/modules/loaders/loader_pnm.c imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c +--- imlib2-1.2.1/src/modules/loaders/loader_pnm.c 2006-11-06 01:27:59.000000000 -0800 ++++ imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c 2006-11-06 01:30:41.000000000 -0800 +@@ -80,7 +80,7 @@ + int i = 0; + + /* read numbers */ +- while (c != EOF && !isspace(c)) ++ while (c != EOF && i+1 < sizeof(buf) && !isspace(c)) + { + buf[i++] = c; + c = fgetc(f); +diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tga.c imlib2-1.2.1.new/src/modules/loaders/loader_tga.c +--- imlib2-1.2.1/src/modules/loaders/loader_tga.c 2006-11-06 01:27:59.000000000 -0800 ++++ imlib2-1.2.1.new/src/modules/loaders/loader_tga.c 2006-11-06 01:30:41.000000000 -0800 +@@ -365,7 +369,9 @@ + else + dataptr = im->data + (y * im->w); + +- for (x = 0; x < im->w; x++) /* for each pixel in the row */ ++ for (x = 0; ++ x < im->w && bufptr+bpp/8 < bufend; ++ x++) /* for each pixel in the row */ + { + switch (bpp) + { diff --git a/source/xlib/imlib2/FrugalBuild b/source/xlib/imlib2/FrugalBuild index aff67e8..b1ecb0d 100644 --- a/source/xlib/imlib2/FrugalBuild +++ b/source/xlib/imlib2/FrugalBuild @@ -3,7 +3,7 @@ pkgname=imlib2 pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Imlib 2 is the successor to Imlib, it is NOT a newer version" _F_sourceforge_dirname="enlightenment" Finclude sourceforge @@ -13,7 +13,9 @@ depends=('libtiff' 'freetype2' 'libxext' 'libjpeg' \ groups=('xlib') archs=('i686' 'x86_64') up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=2 |grep imlib2-src |sed 's/.*]\([0-9\.]*\) [A-Z].*/\1/;q'" -sha1sums=('2bbd65b82a690d21dab2bfeb33cc370f6bb49393') +source=($source CVE-2008-2426.patch) +sha1sums=('2bbd65b82a690d21dab2bfeb33cc370f6bb49393' \ + 'ce2a8c515e9f16bffcb996a6e9171e3832a94323') if [ "$CARCH" != "x86_64" ]; then Fconfopts="$Fconfopts --enable-mmx" From vmiklos at frugalware.org Sun Jun 1 17:06:05 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 1 17:06:07 2008 Subject: [Frugalware-git] frugalware-0.8: openssl-0.9.8-12kalgan1-i686 Message-ID: <20080601150605.C58BA1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=8b5f500a655f85808368f3686529e69e154ce4c4 commit 8b5f500a655f85808368f3686529e69e154ce4c4 Author: Miklos Vajna Date: Sun Jun 1 17:05:26 2008 +0200 openssl-0.9.8-12kalgan1-i686 - secfix bump to patchlevel h - closes #3114 diff --git a/source/lib/openssl/FrugalBuild b/source/lib/openssl/FrugalBuild index 93bfc61..de994a7 100644 --- a/source/lib/openssl/FrugalBuild +++ b/source/lib/openssl/FrugalBuild @@ -4,8 +4,8 @@ pkgname=openssl pkgver=0.9.8 -pkgextraver=g -pkgrel=11 +pkgextraver=h +pkgrel=12kalgan1 pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security" url="http://www.openssl.org/source/" groups=('lib' 'chroot-core') From vmiklos at frugalware.org Sun Jun 1 17:14:09 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 1 17:14:11 2008 Subject: [Frugalware-git] frugalware-0.8: horde-webmail-1.1-1kalgan1-i686 Message-ID: <20080601151409.E3DC71190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=aef4ce0baadd685a85843a383b35fe4e37f1324f commit aef4ce0baadd685a85843a383b35fe4e37f1324f Author: Miklos Vajna Date: Sun Jun 1 17:13:26 2008 +0200 horde-webmail-1.1-1kalgan1-i686 - secfix bump bump - closes #3120 diff --git a/source/network-extra/horde-webmail/FrugalBuild b/source/network-extra/horde-webmail/FrugalBuild index f609031..c267345 100644 --- a/source/network-extra/horde-webmail/FrugalBuild +++ b/source/network-extra/horde-webmail/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CSCSY Lszl pkgname=horde-webmail -pkgver=1.0.6 +pkgver=1.1 pkgrel=1kalgan1 pkgdesc="a free, enterprise ready, browser based communication suite" url="http://horde.org/webmail/" @@ -28,5 +28,5 @@ build() Fdoc README.Frugalware } # optimization OK - noarch -sha1sums=('03dda9d8e6d6a4ff432c16b52c9f740d19f27023'\ +sha1sums=('e787d87772e2c73850441abb5f73b94851ca928d'\ 'b539999b809904f06b3783af8ae93b7b656420da') From bouleetbil at frogdev.info Sun Jun 1 17:22:52 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jun 1 17:22:53 2008 Subject: [Frugalware-git] frugalware-current: gnome-desktop-2.22.2-1 Message-ID: <20080601152252.740871190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=362f53d2c6bfc8d1d2f9ab04d30f1e58b52578b5 commit 362f53d2c6bfc8d1d2f9ab04d30f1e58b52578b5 Author: bouleetbil Date: Sun Jun 1 14:34:16 2008 +0200 gnome-desktop-2.22.2-1 *version bump diff --git a/source/gnome/gnome-desktop/FrugalBuild b/source/gnome/gnome-desktop/FrugalBuild index 43b8789..38b9da2 100644 --- a/source/gnome/gnome-desktop/FrugalBuild +++ b/source/gnome/gnome-desktop/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-desktop -pkgver=2.22.1 +pkgver=2.22.2 pkgrel=1 pkgdesc="The GNOME Desktop" url="http://www.gnome.org/" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --with-gnome-distributor=Frugalware" -sha1sums=('f805edeaef5f419fbea9c5533f0bc3fcd497ce75') +sha1sums=('fb46b036c50fa77a41ef2bcf8aa4b3c56568bc99') # optimization OK From bouleetbil at frogdev.info Sun Jun 1 17:32:33 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jun 1 17:32:34 2008 Subject: [Frugalware-git] frugalware-current: evolution-data-server-2.22.2-1 Message-ID: <20080601153233.371CB1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dec1b6bac814247f74404fecfcc835c1c57d12e8 commit dec1b6bac814247f74404fecfcc835c1c57d12e8 Author: bouleetbil Date: Sun Jun 1 17:21:24 2008 +0200 evolution-data-server-2.22.2-1 *version bump diff --git a/source/gnome/evolution-data-server/FrugalBuild b/source/gnome/evolution-data-server/FrugalBuild index 6361cc9..8e0a565 100644 --- a/source/gnome/evolution-data-server/FrugalBuild +++ b/source/gnome/evolution-data-server/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=evolution-data-server -pkgver=2.22.1.1 +pkgver=2.22.2 pkgrel=1 pkgdesc="Evolution Data Server provides a central location for addressbook and calendar in the GNOME Desktop" depends=('nss>=3.11.7' 'libsoup>=2.4.1' 'libgnomeui>=2.22.1' 'heimdal>=1.1' 'gnome-keyring>=2.22.1' \ @@ -11,7 +11,7 @@ makedepends=('intltool' 'gtk-doc>=1.9' 'openldap>=2.3.24') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') Finclude gnome -sha1sums=('aef33e349c747309edcb535cc89dbd13dfc70e0d') +sha1sums=('d3fc33802fec51a16b017abb7516f4ed79311dfa') subpkgs=('evolution-data-server-ldap' "$pkgname-docs") subdescs=('Evolution Data Server LDAP extensions.' "Evolution Data Server Documentation") From krics at linuxforum.hu Sun Jun 1 21:51:15 2008 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Jun 1 21:51:17 2008 Subject: [Frugalware-git] frugalware-current: openttd-0.6.1-1-x86_64 Message-ID: <20080601195115.2864D1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cc155a010c1c83a4b17796b9ca5d52f853371366 commit cc155a010c1c83a4b17796b9ca5d52f853371366 Author: Christian Hamar alias krix Date: Sun Jun 1 21:50:50 2008 +0200 openttd-0.6.1-1-x86_64 * Version bump * Added libtimidity, fontconfig, freetype2 as depends (because openttd uses those) diff --git a/source/games-extra/openttd/FrugalBuild b/source/games-extra/openttd/FrugalBuild index 5d2ae80..7521861 100644 --- a/source/games-extra/openttd/FrugalBuild +++ b/source/games-extra/openttd/FrugalBuild @@ -3,13 +3,13 @@ # Maintainer: voroskoi pkgname=openttd -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="An open source clone of the Microprose game Transport Tycoon Deluxe" _F_sourceforge_ext="-source.tar.gz" Finclude sourceforge url="http://www.openttd.com/" -depends=('sdl' 'libpng') +depends=('sdl' 'libpng' 'libtimidity' 'freetype2' 'fontconfig') groups=('games-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.openttd.com/downloads.php |grep latest |sed -ne 's/.*is \(.*\),.*/\1/;1p'" @@ -30,7 +30,7 @@ build() { _F_desktop_icon="openttd.64.png" Fdesktop2 } -sha1sums=('9760889a5463ff01969fcdb53b9a2bb8e4026ecb' \ +sha1sums=('b44200949ac3567a2fac83eb7948d405b74a7544' \ 'f4fbcdeb9109489bf69e0976c68955381ff6d6d6' \ '965fc34bbe9998741ea07531772c9673b33aab99' \ '88b3caff739fbf7bd4eb143ae97925556e813ce4') From bouleetbil at frogdev.info Sun Jun 1 22:15:25 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jun 1 22:15:28 2008 Subject: [Frugalware-git] frugalware-current: gnome-menus-2.22.2-1-i686 Message-ID: <20080601201525.D2CBC1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7ae242a030dc5c1ceb5326ef497a5563b860229a commit 7ae242a030dc5c1ceb5326ef497a5563b860229a Author: bouleetbil Date: Sun Jun 1 22:05:03 2008 +0200 gnome-menus-2.22.2-1-i686 *version bump *change categorize-prefs-menu.patch for bump version diff --git a/source/gnome/gnome-menus/FrugalBuild b/source/gnome/gnome-menus/FrugalBuild index 5833292..8630c51 100644 --- a/source/gnome/gnome-menus/FrugalBuild +++ b/source/gnome/gnome-menus/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-menus -pkgver=2.22.1 +pkgver=2.22.2 pkgrel=1 pkgdesc="GNOME menus and menu editor" depends=('gamin>=0.1.9-3' 'pygtk>=2.12.1-2') @@ -14,7 +14,7 @@ Finclude gnome Fsysconfdir="/etc/gnome" Fconfopts="$Fconfopts --enable-python --enable-debug=no --enable-inotify" source=(${source[@]} $pkgname-2.18.0-categorize-prefs-menu.patch) -sha1sums=('a943facc7d279145b683fe8b13aff0abe8c102c5' \ - '16d2d01801f13b0aa827371cf89a2e9fb7030c08') +sha1sums=('48d2557cd33265a760e43402b4f87faf6a8990db' \ + 'a6b1f615f6f831c9a950ce89a635d3795572e2cf') # optimization OK diff --git a/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch b/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch index 237f68c..c8ef917 100644 --- a/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch +++ b/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch @@ -12,7 +12,8 @@ diff -Naur gnome-menus-2.20.0.orig/desktop-directories/Hardware.directory.in gno diff -Naur gnome-menus-2.20.0.orig/layout/preferences.menu gnome-menus-2.20.0/layout/preferences.menu --- gnome-menus-2.20.0.orig/layout/preferences.menu 2007-09-22 00:28:45.000000000 +0200 +++ gnome-menus-2.20.0/layout/preferences.menu 2007-09-22 00:37:01.000000000 +0200 -@@ -12,14 +12,28 @@ +00000 +0200 +@@ -12,30 +12,106 @@ @@ -36,15 +37,14 @@ diff -Naur gnome-menus-2.20.0.orig/layout/preferences.menu gnome-menus-2.20.0/la + DesktopSettings + X-GNOME-NetworkSettings + HardwareSettings -+ X-GNOME-SystemSettings ++ X-GNOME-SystemSettings System - Accessibility + gnomecc.desktop -@@ -30,16 +44,78 @@ - gnomecc.desktop - + - + @@ -73,7 +73,7 @@ diff -Naur gnome-menus-2.20.0.orig/layout/preferences.menu gnome-menus-2.20.0/la - -+ ++ + + + @@ -126,3 +126,4 @@ diff -Naur gnome-menus-2.20.0.orig/layout/preferences.menu gnome-menus-2.20.0/la + + From hermier at frugalware.org Sun Jun 1 23:13:16 2008 From: hermier at frugalware.org (Michel Hermier) Date: Sun Jun 1 23:13:18 2008 Subject: [Frugalware-git] frugalware-current: deluge-0.5.9.1-0-i686.fpm Message-ID: <20080601211316.B81CC1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4e8c3ef3c9216afa99377087e5747e2f3cdb5e91 commit 4e8c3ef3c9216afa99377087e5747e2f3cdb5e91 Author: Michel Hermier Date: Sun Jun 1 23:13:03 2008 +0200 deluge-0.5.9.1-0-i686.fpm * Version bump. diff --git a/source/gnome-extra/deluge/FrugalBuild b/source/gnome-extra/deluge/FrugalBuild index a9a3c7b..b1e4d79 100644 --- a/source/gnome-extra/deluge/FrugalBuild +++ b/source/gnome-extra/deluge/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Artur Grunau pkgname=deluge -pkgver=0.5.9.0 +pkgver=0.5.9.1 pkgrel=1 pkgdesc="BitTorrent client written in Python and GTK+." url="http://deluge-torrent.org/" @@ -18,7 +18,7 @@ source=(http://download.deluge-torrent.org/source/$pkgver/$pkgname-$pkgver.tar.g _F_gnome_iconcache=y _F_cd_path="deluge-torrent-$pkgver" Finclude gnome-scriptlet -sha1sums=('b5272771383af27dc3acbe952d1c46bd6e85ee8b' \ +sha1sums=('1144d07fc808669aa74af00b1f7808db73c8d96d' \ '1effeb55eccdba6bbad0af32e76854fc38919b85') build() From vmiklos at frugalware.org Mon Jun 2 02:04:47 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 2 02:04:50 2008 Subject: [Frugalware-git] frugalware-current: freemind-0.8.1-1-i686 Message-ID: <20080602000447.493241190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1c93deebc4cc2bea8151ef2cf9ac593f73a1fe73 commit 1c93deebc4cc2bea8151ef2cf9ac593f73a1fe73 Author: Miklos Vajna Date: Mon Jun 2 02:04:13 2008 +0200 freemind-0.8.1-1-i686 - new package - requested by boobaa, i hava one more beer now ;) diff --git a/source/xapps-extra/freemind/FrugalBuild b/source/xapps-extra/freemind/FrugalBuild new file mode 100644 index 0000000..da91653 --- /dev/null +++ b/source/xapps-extra/freemind/FrugalBuild @@ -0,0 +1,43 @@ +# Compiling Time: 0.26 SBU +# Maintainer: VMiklos + +pkgname=freemind +pkgver=0.8.1 +pkgrel=1 +pkgdesc="A free mind mapping software" +_F_sourceforge_ext=".zip" +_F_sourceforge_name="$pkgname-src" +Finclude sourceforge java +makedepends=(${makedepends[@]} 'j2sdk') +up2date="lynx -dump http://freemind.sourceforge.net/wiki/index.php/Download | grep 'latest stable' | sed 's/.* is \(.*\)\. .*/\1/'" +source=(${source/$pkgver/${pkgver//./_}}) +groups=('xapps-extra') +archs=('i686') +sha1sums=('27b09fdbd4b39219ab16d4b9574b972dbafe54e1') + +build() +{ + Fcd $pkgname + # no java 1.2, thx + Fsed '1\.2' '1.3' build.xml + + # it won't build with gcj because it uses + # sun.misc.BASE64Encoder, so for now build using Sun's javac + #Fjavacleanup + export JAVA_HOME=/usr/lib/java + + Fant dist browser + + # wtf? this really spams outside the cwd.. + Fdocrel doc/* + cd "$Fsrcdir/bin/dist" + Fmkdir /usr/lib/freemind + chmod 755 freemind.sh + rm -f *.bat *.exe + for i in * + do + Fcprel $i /usr/lib/freemind/ + done + # no, a symlink won't work + Fwrapper /usr/lib/freemind/freemind.sh freemind +} From boobaa at frugalware.org Mon Jun 2 08:50:15 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Mon Jun 2 08:50:17 2008 Subject: [Frugalware-git] frugalware-current: drupal-scheduler-5.x_1.15-1-i686 Message-ID: <20080602065015.2E4631190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6af277c8969ebb61ddcc6a1e2d5567000ab04665 commit 6af277c8969ebb61ddcc6a1e2d5567000ab04665 Author: CSCSY Lszl Date: Mon Jun 2 08:50:07 2008 +0200 drupal-scheduler-5.x_1.15-1-i686 version bump diff --git a/source/network-extra/drupal-scheduler/FrugalBuild b/source/network-extra/drupal-scheduler/FrugalBuild index 8e070bf..f8c2967 100644 --- a/source/network-extra/drupal-scheduler/FrugalBuild +++ b/source/network-extra/drupal-scheduler/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSCSY Lszl _F_drupal_module=scheduler -pkgver=5.x_1.14 +pkgver=5.x_1.15 pkgrel=1 pkgdesc="Drupal module to publish and/or unpublish nodes on specified dates" Finclude drupal -sha1sums=('d280ba3846a297ff84b12438a26e6d5b84d7d618') +sha1sums=('e20b0dc0bd8bb6baf1e4ac9c18f77024a24867df') From crazy at frugalware.org Mon Jun 2 13:41:41 2008 From: crazy at frugalware.org (crazy) Date: Mon Jun 2 13:41:45 2008 Subject: [Frugalware-git] frugalware-current: vlc-0.8.6-17-x86_64 Message-ID: <20080602114141.B1C301190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5154684899f8fd137f5bf18c350089749aa0b8b2 commit 5154684899f8fd137f5bf18c350089749aa0b8b2 Author: crazy Date: Mon Jun 2 13:39:42 2008 +0200 vlc-0.8.6-17-x86_64 * Version bump * removed patches are merged upstream already * live gone from depends , seems to be badly broken. * we get a lot 'errors in ...libliveMedia.a(.eh_frame).. ' * and the fmp size grows from 3MB to 67MB with live enabled , heh. diff --git a/source/xmultimedia-extra/vlc/CVE-2008-1686.patch b/source/xmultimedia-extra/vlc/CVE-2008-1686.patch deleted file mode 100644 index ca68a39..0000000 --- a/source/xmultimedia-extra/vlc/CVE-2008-1686.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: THANKS -=================================================================== ---- THANKS (revision aba5ca0b02bd17740f11ef993c1d8003b453a288) -+++ THANKS (revision 8060b3457e20e6223b70927693f8da8f547b8fef) -@@ -79,4 +79,5 @@ - Enrico Gueli - Brightness threshold in adjust video filter - Enrique Osuna - Various bug fixes in libvlc. Major Mac OS X Framework improvements. -+Eren Trkay - Speex boundary checks and security fix - Espen Skoglund - FreeBSD autoconf and Makefile patches - Ethan C. Baldridge - directory browsing code -Index: modules/codec/speex.c -=================================================================== ---- modules/codec/speex.c (revision 449fd28aaf007c6411251dae9d0dbfdc65b135d1) -+++ modules/codec/speex.c (revision 8060b3457e20e6223b70927693f8da8f547b8fef) -@@ -358,5 +358,5 @@ - return VLC_EGENERIC; - } -- if( p_header->mode >= SPEEX_NB_MODES ) -+ if( p_header->mode >= SPEEX_NB_MODES || p_header->mode < 0 ) - { - msg_Err( p_dec, "mode number %d does not (yet/any longer) exist in " diff --git a/source/xmultimedia-extra/vlc/FrugalBuild b/source/xmultimedia-extra/vlc/FrugalBuild index e195d71..134b393 100644 --- a/source/xmultimedia-extra/vlc/FrugalBuild +++ b/source/xmultimedia-extra/vlc/FrugalBuild @@ -4,42 +4,39 @@ pkgname=vlc pkgver=0.8.6 -pkgextraver=f -pkgrel=16 +pkgextraver=g +pkgrel=17 pkgdesc="The cross-platform media player and streaming server." url="http://www.videolan.org/vlc/" depends=('alsa-lib' 'dbus-glib>=0.71' 'hal>=0.5.7.1-3' 'libxml2' 'libdvdnav' 'libmad' 'libmatroska' \ 'mpeg2dec' 'ffmpeg>=20080427' 'fribidi' 'wxgtk-u8>=2.8.7' 'live' 'speex>=1.2beta3.2' 'libdca' \ 'sysfsutils' 'mesa' 'libdvbpsi' 'libxv' 'sdlimage' 'libcdio' \ - 'libid3tag' 'libtheora' 'faad2' 'xvidcore' 'libtheora' 'libebml>=0.7.8') -## WARNING: do NOT add any VCD option to build its kill off the GUI + 'libid3tag' 'libtheora' 'faad2' 'xvidcore' 'libtheora' 'libebml>=0.7.8' \ + 'libtar') makedepends=('firefox' 'samba' 'cvs') options=('scriptlet') groups=('xmultimedia-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download-sources.html|grep -m1 'Latest VLC'|sed 's/.*(\(.*\)).*/\1/;s/$pkgextraver//'" source=(http://download.videolan.org/pub/videolan/vlc/$pkgver$pkgextraver/$pkgname-$pkgver$pkgextraver.tar.bz2 \ - $pkgname-ffmpeg.diff $pkgname.desktop vlc-0.8.5-libintl.diff \ - libdca.patch CVE-2008-1686.patch) -sha1sums=('9684bb7504636d3e3143734698c2bbac250f4a03' \ - 'd95c19c510fc56d92ccd38df864f27f782565126' \ + $pkgname.desktop vlc-0.8.5-libintl.diff \ + libdca.patch) +sha1sums=('6dab0e1593607d3a1ee585ba009b99627477f467' \ '0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0' \ '50bfbc12fc0ad94178b2e08df22a0b26da36c1d5' \ - 'edc3a14dfd9b022dca7593e006c324fa5cc17e48' \ - 'e8d8887fe34e6214f16214dca3e509ec842be04c') + 'edc3a14dfd9b022dca7593e006c324fa5cc17e48') build() { Fpatchall - export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" Fsed 'mozilla-config' 'firefox-config' configure.ac Fsed 'firefox-config\.h' 'mozilla-config\.h' configure.ac Fsed '/usr/lib/mozilla' '/usr/lib/firefox' configure.ac Fsed '/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf' \ '/usr/lib/X11/fonts/TTF/VeraBd.ttf' \ modules/misc/freetype.c - #./bootstrap || return 1 - autoconf || Fdie + ./bootstrap || return 1 + #autoconf || Fdie Fconf \ --enable-faad \ --enable-dvdread \ @@ -63,6 +60,7 @@ build() --with-gnu-ld \ --enable-dvbpsi \ --with-dvbpsi=/usr/include/dvbpsi \ + --enable-libtool \ --with-ffmpeg-{mp3lame,faac,faad,dts,vorbis,theora,ogg} Fsed '%{idldir}' '/usr/share/idl/firefox' mozilla/Makefile make || return 1 diff --git a/source/xmultimedia-extra/vlc/vlc-ffmpeg.diff b/source/xmultimedia-extra/vlc/vlc-ffmpeg.diff deleted file mode 100644 index ef215e4..0000000 --- a/source/xmultimedia-extra/vlc/vlc-ffmpeg.diff +++ /dev/null @@ -1,141 +0,0 @@ -diff -aur vlc-0.8.6f/configure.ac fw_vlc-0.8.6f/configure.ac ---- vlc-0.8.6f/configure.ac 2008-03-23 23:41:48.000000000 +0100 -+++ fw_vlc-0.8.6f/configure.ac 2008-04-28 16:45:57.000000000 +0200 -@@ -2694,12 +2694,12 @@ - else - - dnl Trying with pkg-config -- PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat], -+ PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat, libpostproc], - [ -- AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] ) -- AC_CHECK_HEADERS(ffmpeg/avformat.h) -- AC_CHECK_HEADERS(ffmpeg/avutil.h) -- AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] ) -+ AC_CHECK_HEADERS(libavcodec/avcodec.h, [], [AC_MSG_ERROR([Missing header file libavcodec/avcodec.h.])] ) -+ AC_CHECK_HEADERS(libavformat/avformat.h) -+ AC_CHECK_HEADERS(libavutil/avutil.h) -+ AC_CHECK_HEADERS(libpostproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file libpostproc/postprocess.h.])] ) - if test "${SYS}" = "darwin"; then - VLC_ADD_BUILTINS([ffmpeg]) - else -diff -aur vlc-0.8.6f/modules/codec/ffmpeg/audio.c fw_vlc-0.8.6f/modules/codec/ffmpeg/audio.c ---- vlc-0.8.6f/modules/codec/ffmpeg/audio.c 2008-03-23 23:41:48.000000000 +0100 -+++ fw_vlc-0.8.6f/modules/codec/ffmpeg/audio.c 2008-04-28 17:16:47.000000000 +0200 -@@ -32,7 +32,7 @@ - #ifdef HAVE_FFMPEG_AVCODEC_H - # include - #else --# include -+# include - #endif - - #include "ffmpeg.h" -diff -aur vlc-0.8.6f/modules/codec/ffmpeg/chroma.c fw_vlc-0.8.6f/modules/codec/ffmpeg/chroma.c ---- vlc-0.8.6f/modules/codec/ffmpeg/chroma.c 2008-03-23 23:41:48.000000000 +0100 -+++ fw_vlc-0.8.6f/modules/codec/ffmpeg/chroma.c 2008-04-28 17:18:30.000000000 +0200 -@@ -31,7 +31,7 @@ - #ifdef HAVE_FFMPEG_AVCODEC_H - # include - #else --# include -+# include - #endif - - #include "ffmpeg.h" -diff -aur vlc-0.8.6f/modules/codec/ffmpeg/demux.c fw_vlc-0.8.6f/modules/codec/ffmpeg/demux.c ---- vlc-0.8.6f/modules/codec/ffmpeg/demux.c 2008-03-31 21:07:51.000000000 +0200 -+++ fw_vlc-0.8.6f/modules/codec/ffmpeg/demux.c 2008-04-28 17:31:52.000000000 +0200 -@@ -35,7 +35,7 @@ - #ifdef HAVE_FFMPEG_AVFORMAT_H - # include - #else --# include -+# include - #endif - - #include "ffmpeg.h" -diff -aur vlc-0.8.6f/modules/codec/ffmpeg/encoder.c fw_vlc-0.8.6f/modules/codec/ffmpeg/encoder.c ---- vlc-0.8.6f/modules/codec/ffmpeg/encoder.c 2008-03-23 23:41:48.000000000 +0100 -+++ fw_vlc-0.8.6f/modules/codec/ffmpeg/encoder.c 2008-04-28 17:32:19.000000000 +0200 -@@ -39,7 +39,7 @@ - #ifdef HAVE_FFMPEG_AVCODEC_H - # include - #else --# include -+# include - #endif - - #if LIBAVCODEC_BUILD < 4704 -diff -aur vlc-0.8.6f/modules/codec/ffmpeg/ffmpeg.c fw_vlc-0.8.6f/modules/codec/ffmpeg/ffmpeg.c ---- vlc-0.8.6f/modules/codec/ffmpeg/ffmpeg.c 2008-03-23 23:41:48.000000000 +0100 -+++ fw_vlc-0.8.6f/modules/codec/ffmpeg/ffmpeg.c 2008-04-28 17:32:40.000000000 +0200 -@@ -33,7 +33,7 @@ - #ifdef HAVE_FFMPEG_AVCODEC_H - # include - #else --# include -+# include - #endif - - #if LIBAVCODEC_BUILD < 4680 -diff -aur vlc-0.8.6f/modules/codec/ffmpeg/mux.c fw_vlc-0.8.6f/modules/codec/ffmpeg/mux.c ---- vlc-0.8.6f/modules/codec/ffmpeg/mux.c 2008-03-23 23:41:48.000000000 +0100 -+++ fw_vlc-0.8.6f/modules/codec/ffmpeg/mux.c 2008-04-28 17:33:16.000000000 +0200 -@@ -34,7 +34,7 @@ - #ifdef HAVE_FFMPEG_AVFORMAT_H - # include - #else --# include -+# include - #endif - - #include "ffmpeg.h" -diff -aur vlc-0.8.6f/modules/codec/ffmpeg/postprocess.c fw_vlc-0.8.6f/modules/codec/ffmpeg/postprocess.c ---- vlc-0.8.6f/modules/codec/ffmpeg/postprocess.c 2008-03-23 23:41:48.000000000 +0100 -+++ fw_vlc-0.8.6f/modules/codec/ffmpeg/postprocess.c 2008-04-28 17:33:28.000000000 +0200 -@@ -30,7 +30,7 @@ - #ifdef HAVE_FFMPEG_AVCODEC_H - # include - #else --# include -+# include - #endif - - #include "ffmpeg.h" -diff -aur vlc-0.8.6f/modules/codec/ffmpeg/video.c fw_vlc-0.8.6f/modules/codec/ffmpeg/video.c ---- vlc-0.8.6f/modules/codec/ffmpeg/video.c 2008-03-23 23:41:48.000000000 +0100 -+++ fw_vlc-0.8.6f/modules/codec/ffmpeg/video.c 2008-04-28 17:07:14.000000000 +0200 -@@ -33,7 +33,7 @@ - #ifdef HAVE_FFMPEG_AVCODEC_H - # include - #else --# include -+# include - #endif - - #include "ffmpeg.h" -diff -aur vlc-0.8.6f/modules/codec/ffmpeg/video_filter.c fw_vlc-0.8.6f/modules/codec/ffmpeg/video_filter.c ---- vlc-0.8.6f/modules/codec/ffmpeg/video_filter.c 2008-03-23 23:41:48.000000000 +0100 -+++ fw_vlc-0.8.6f/modules/codec/ffmpeg/video_filter.c 2008-04-28 17:33:59.000000000 +0200 -@@ -33,7 +33,7 @@ - #ifdef HAVE_FFMPEG_AVCODEC_H - # include - #else --# include -+# include - #endif - - #include "ffmpeg.h" -diff -aur vlc-0.8.6f/modules/stream_out/switcher.c fw_vlc-0.8.6f/modules/stream_out/switcher.c ---- vlc-0.8.6f/modules/stream_out/switcher.c 2008-03-23 23:41:49.000000000 +0100 -+++ fw_vlc-0.8.6f/modules/stream_out/switcher.c 2008-04-28 18:28:31.000000000 +0200 -@@ -39,7 +39,7 @@ - #ifdef HAVE_FFMPEG_AVCODEC_H - # include - #else --# include -+# include - #endif - - #ifdef HAVE_POSTPROC_POSTPROCESS_H From crazy at frugalware.org Mon Jun 2 13:50:02 2008 From: crazy at frugalware.org (crazy) Date: Mon Jun 2 13:50:04 2008 Subject: [Frugalware-git] frugalware-current: xdvik-22.84.14-1-x86_64 Message-ID: <20080602115002.EB8B91190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=695f084698637149e707ebe628e069f602dd49cd commit 695f084698637149e707ebe628e069f602dd49cd Author: crazy Date: Mon Jun 2 13:49:06 2008 +0200 xdvik-22.84.14-1-x86_64 * Version bump * closes FS#3127 in -current diff --git a/source/xapps-extra/xdvik/FrugalBuild b/source/xapps-extra/xdvik/FrugalBuild index 90205fe..54a06c1 100644 --- a/source/xapps-extra/xdvik/FrugalBuild +++ b/source/xapps-extra/xdvik/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=xdvik -pkgver=22.84.12 +pkgver=22.84.14 pkgrel=1 pkgdesc="Xdvik is a program for displaying DVI files." _F_sourceforge_dirname="xdvi" @@ -14,15 +14,13 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://xdvi.sourceforge.net/releases.html|grep -m1 ^[0-9]|sed 's/://'" source=($source xdvik.png) -sha1sums=('15a0b23ec679707792f4f329d80002cbbe9e9ab6' \ +sha1sums=('1ca7f0c7930d24c3e10cc1d7115abed7dd39e95e' \ '820ccc3807167abb206719b7726e7a9f2ee031fd') build() { Fbuild --with-system-t1lib - Fmv usr/bin/*-linux-gnu/* usr/bin/ - Frm usr/bin/*-linux-gnu Fmv usr/share/texmf/release-tetex-src.txt \ usr/share/texmf/$pkgname-release-tetex-src.txt Ffilerel ../xdvik.png /usr/share/icons/hicolor/48x48/apps/xdvik.png From crazy at frugalware.org Mon Jun 2 13:54:01 2008 From: crazy at frugalware.org (crazy) Date: Mon Jun 2 13:54:03 2008 Subject: [Frugalware-git] frugalware-current: fontconfig-2.6.0-1-x86_64 Message-ID: <20080602115401.4E3711190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6f4929aeeb11b2246bdceb213474f65bb5e872f9 commit 6f4929aeeb11b2246bdceb213474f65bb5e872f9 Author: crazy Date: Mon Jun 2 13:52:54 2008 +0200 fontconfig-2.6.0-1-x86_64 * Version bump diff --git a/source/lib/fontconfig/FrugalBuild b/source/lib/fontconfig/FrugalBuild index 4a86ad4..a3d7318 100644 --- a/source/lib/fontconfig/FrugalBuild +++ b/source/lib/fontconfig/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=fontconfig -pkgver=2.5.93 +pkgver=2.6.0 pkgrel=1 pkgdesc="A library for configuring and customizing font access" url="http://fontconfig.org/" @@ -30,7 +30,7 @@ build() Fmakeinstall } -sha1sums=('7377fcdc83f7e1fb6843eb31b8aa3765890057b3' \ +sha1sums=('93752566b8327485b153bd156049614f779b4c57' \ '9dd37943df4199edf0d8adca65a075286e84ed04' \ 'e1c3d5c855149692d9fc7278fa57ad3c6a43e919') # optimization OK From crazy at frugalware.org Mon Jun 2 14:18:31 2008 From: crazy at frugalware.org (crazy) Date: Mon Jun 2 14:18:32 2008 Subject: [Frugalware-git] frugalware-current: sdl_gfx-2.0.17-1-x86_64 Message-ID: <20080602121831.3BC2B1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3d5935dd516b42740843bcaf2e29ce565c8b6441 commit 3d5935dd516b42740843bcaf2e29ce565c8b6441 Author: crazy Date: Mon Jun 2 14:17:55 2008 +0200 sdl_gfx-2.0.17-1-x86_64 * Version bump diff --git a/source/xlib/sdl_gfx/FrugalBuild b/source/xlib/sdl_gfx/FrugalBuild index 3a0dede..d86baa5 100644 --- a/source/xlib/sdl_gfx/FrugalBuild +++ b/source/xlib/sdl_gfx/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=sdl_gfx -pkgver=2.0.16 +pkgver=2.0.17 pkgrel=1 pkgdesc="SDL library for graphics drawing primitives and other support functions." url="http://www.ferzkopp.net/mambo/index.php?option=com_content&task=view&id=14&Itemid=29" @@ -12,14 +12,14 @@ groups=('xlib') archs=('i686' 'x86_64') up2date="lynx -dump 'http://www.ferzkopp.net/joomla/content/view/19/14/'|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).tar.gz/\1/'" source=(http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-$pkgver.tar.gz) -sha1sums=('c0277d25daf4b680876ef04a893f64e90d9ce03d') +sha1sums=('7be52033ca8f014ee7761f6f298feac8336bfa5a') build() { Fcd SDL_gfx-$pkgver - opts="--with-gnu-ld --with-x" - [ "${CARCH}" == "x86_64" ] && opts="$opts --disable-mmx" - Fbuild $opts + Fautoreconf + [ "${CARCH}" == "x86_64" ] && Fconfopts="$Fconfopts --disable-mmx" + Fbuild --libdir=/usr/lib --with-gnu-ld } # optimization OK From vmiklos at frugalware.org Mon Jun 2 15:50:46 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 2 15:50:47 2008 Subject: [Frugalware-git] frugalware-current: coreutils-6.12-1-i686 Message-ID: <20080602135046.54A801190A46@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=40f8ea482f857f03fb9b07b5d1b6a20a0c5b3953 commit 40f8ea482f857f03fb9b07b5d1b6a20a0c5b3953 Author: Miklos Vajna Date: Mon Jun 2 15:49:56 2008 +0200 coreutils-6.12-1-i686 - version bump diff --git a/source/base/coreutils/FrugalBuild b/source/base/coreutils/FrugalBuild index 71363f0..af376d4 100644 --- a/source/base/coreutils/FrugalBuild +++ b/source/base/coreutils/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=coreutils -pkgver=6.11 +pkgver=6.12 pkgrel=1 pkgdesc="These are the GNU core utilities, the basic command line programs" url="http://www.gnu.org/software/coreutils" @@ -23,14 +23,13 @@ build() --enable-largefile ac_cv_func_openat=no Ffile /etc/DIR_COLORS - # cosmetics :) + # compat symlinks Fmkdir /usr/{bin,sbin} Fln install /usr/bin/ginstall Fln install.1.gz /usr/man/man1/ginstall.1.gz Fln test /bin/[ + # this is not needed when /usr is not available Fmv /bin/chroot /usr/sbin/chroot - # these are unnecessary - Frm /usr/bin/dircolors /usr/info/dir # confilicts with procps Frm /bin/{uptime,kill} /usr/share/man/man1/{uptime,kill}.1 # confilicts with shadow From vmiklos at frugalware.org Mon Jun 2 15:50:46 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 2 15:50:49 2008 Subject: [Frugalware-git] frugalware-current: stunnel-4.25-1-i686 Message-ID: <20080602135046.395B91190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fd004be022e67978ce109efa6323c6a5329a88a8 commit fd004be022e67978ce109efa6323c6a5329a88a8 Author: Miklos Vajna Date: Mon Jun 2 15:44:07 2008 +0200 stunnel-4.25-1-i686 - version bump diff --git a/source/network-extra/stunnel/FrugalBuild b/source/network-extra/stunnel/FrugalBuild index a463e60..f1a67aa 100644 --- a/source/network-extra/stunnel/FrugalBuild +++ b/source/network-extra/stunnel/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=stunnel -pkgver=4.24 +pkgver=4.25 pkgrel=1 pkgdesc="Universal SSL Wrapper" url="http://www.stunnel.org/" From vmiklos at frugalware.org Mon Jun 2 16:07:25 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 2 16:07:28 2008 Subject: [Frugalware-git] frugalware-current: ipw3945-1.2.2-19-i686 Message-ID: <20080602140725.E7B841190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2975a59f9f335cb4d897ff242b71049b667fbc8a commit 2975a59f9f335cb4d897ff242b71049b667fbc8a Author: Miklos Vajna Date: Mon Jun 2 16:07:00 2008 +0200 ipw3945-1.2.2-19-i686 - bin, replaced by the in-kernel iwl driver diff --git a/source/network-extra/ipw3945/FrugalBuild b/source/network-extra/ipw3945/FrugalBuild deleted file mode 100644 index 3adc114..0000000 --- a/source/network-extra/ipw3945/FrugalBuild +++ /dev/null @@ -1,39 +0,0 @@ -# Compiling Time: 0.05 SBU -# Maintainer: VMiklos - -pkgname=ipw3945 -pkgver=1.2.2 -pkgrel=19 -pkgdesc="Intel PRO/Wireless 3945ABG Driver for Linux" -_F_sourceforge_ext=".tgz" -Finclude sourceforge kernel-module -up2date="lynx -dump http://ipw3945.sourceforge.net/|grep download$|sed 's/.*-\(.*\)\.t.*/\1/;q'" -depends=(${depends[@]} 'ipw3945-ucode' 'ipw3945d' 'wireless_tools') -groups=('network-extra') -archs=('i686' 'x86_64') -source=($source compile-2.6.24.patch) -sha1sums=('a212551b7d0d6d2266b0a69459db82c20897719f' \ - 'fa90f77b09fc68b3187a5069bf02ae0c84671789') - -# there is an iwl3945 driver in the kernel but we should not remove this -# package till it's not fully functional (it does not support WPA for example -# ATM). -# however, the in-kernel driver has a better quality, so try to use it when -# possible and blacklist this by default. - -build() -{ - # no Fcheckkernel, crosscompilation verified - Fpatchall - Fsed 'uname -r' "echo $_F_kernelmod_uname" Makefile - find . -type f -exec sed -i '/#include /d' {} \; - Fsed "s:^#\(CONFIG_IPW3945_QOS\)=.*:\1=y:" Makefile - Fsed "s:^# \(CONFIG_IPW3945_MONITOR\)=.*:\1=y:" Makefile - Fsed "s:^# \(CONFIG_IEEE80211_RADIOTAP\)=.*:\1=y:" Makefile - Fsed "s:^# \(CONFIG_IPW3945_PROMISCUOUS\)=.*:\1=y:" Makefile - make KVER=$_F_kernelmod_uname || return 1 - Ffilerel $_F_kernelmod_dir/kernel/drivers/net/wireless/ipw3945/ipw3945.ko - Fbuild_kernelmod_scriptlet - echo "blacklist $pkgname" >$pkgname - Ffilerel /etc/modprobe.d/$pkgname -} diff --git a/source/network-extra/ipw3945/compile-2.6.24.patch b/source/network-extra/ipw3945/compile-2.6.24.patch deleted file mode 100644 index f6350fc..0000000 --- a/source/network-extra/ipw3945/compile-2.6.24.patch +++ /dev/null @@ -1,43 +0,0 @@ -Author: Samuel Tardieu -Date: Tue Oct 16 12:31:58 2007 +0200 - - MAC_ARG is not defined by the kernel headers anymore - -diff --git a/ipw3945.c b/ipw3945.c -index eec20b7..cc36b9c 100644 ---- a/ipw3945.c -+++ b/ipw3945.c -@@ -102,6 +102,12 @@ - #define VQ - #endif - -+/* stolen from net/ieee80211.h */ -+#ifndef MAC_ARG -+#define MAC_ARG(x) ((u8*)(x))[0], ((u8*)(x))[1], ((u8*)(x))[2], \ -+ ((u8*)(x))[3], ((u8*)(x))[4], ((u8*)(x))[5] -+#endif -+ - #define IPW3945_VERSION "1.2.2" VD VM VP VR VQ - - #define DRV_DESCRIPTION "Intel(R) PRO/Wireless 3945 Network Connection driver for Linux" - - - -Author: Samuel Tardieu -Date: Tue Oct 16 12:37:54 2007 +0200 - - Nuke SET_MODULE_OWNER() use - -diff --git a/ipw3945.c b/ipw3945.c -index cc36b9c..0369876 100644 ---- a/ipw3945.c -+++ b/ipw3945.c -@@ -16597,7 +16597,6 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) - goto out_release_ucode; - } - -- SET_MODULE_OWNER(net_dev); - SET_NETDEV_DEV(net_dev, &pdev->dev); - mutex_lock(&priv->mutex); - priv->ieee->hard_start_xmit = ipw_net_hard_start_xmit; - From vmiklos at frugalware.org Mon Jun 2 16:13:15 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 2 16:13:16 2008 Subject: [Frugalware-git] frugalware-current: ipw3945-ucode-1.14.2-1-i686 Message-ID: <20080602141315.5EA191190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=41330e77d7535246dacda1b3ce46b9da5e99d002 commit 41330e77d7535246dacda1b3ce46b9da5e99d002 Author: Miklos Vajna Date: Mon Jun 2 16:13:03 2008 +0200 ipw3945-ucode-1.14.2-1-i686 - bin, replaced by iwlwifi-3945-ucode diff --git a/source/network-extra/ipw3945-ucode/FrugalBuild b/source/network-extra/ipw3945-ucode/FrugalBuild deleted file mode 100644 index 958af0a..0000000 --- a/source/network-extra/ipw3945-ucode/FrugalBuild +++ /dev/null @@ -1,20 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: VMiklos - -pkgname=ipw3945-ucode -pkgver=1.14.2 -pkgrel=1 -pkgdesc="Intel PRO/Wireless 3945ABG Network Connection Adapter Microcode" -url="http://www.bughost.org/ipw3945/" -depends=('udev') -groups=('network-extra') -archs=('i686' 'x86_64') -up2date="lynx -dump $url|grep ipw3945-ucode-|sed 's/.*-\(.*\)\.t.*/\1/;q'" -source=($url/ucode/ipw3945-ucode-$pkgver.tgz) - -build() -{ - Fcd - Ffilerel /lib/firmware/ipw3945.ucode -} -sha1sums=('738259d355c70c61f29f4fd4afab2173159c4747') diff --git a/source/network-extra/ipw3945-ucode/ipw3945-ucode.install b/source/network-extra/ipw3945-ucode/ipw3945-ucode.install deleted file mode 100644 index f1404c8..0000000 --- a/source/network-extra/ipw3945-ucode/ipw3945-ucode.install +++ /dev/null @@ -1,10 +0,0 @@ -post_install() -{ - echo "In order to use this firmware you have to agree to Intel's license located" - echo "in /usr/share/doc/ipw3945-ucode-${1/-*}/README.ipw3945-ucode" - echo "else please remove this package." -} - -op=$1 -shift -$op $* From vmiklos at frugalware.org Mon Jun 2 16:14:27 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 2 16:14:28 2008 Subject: [Frugalware-git] frugalware-current: ipw3945d-1.7.22-4-i686 Message-ID: <20080602141427.C8BDF1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=310d22607280bba8d7a1598b1d4b2b47a4f03db8 commit 310d22607280bba8d7a1598b1d4b2b47a4f03db8 Author: Miklos Vajna Date: Mon Jun 2 16:14:10 2008 +0200 ipw3945d-1.7.22-4-i686 - bin, the in-kernel iwl driver no longer requires a daemon diff --git a/source/network-extra/ipw3945d/FrugalBuild b/source/network-extra/ipw3945d/FrugalBuild deleted file mode 100644 index 65cf28a..0000000 --- a/source/network-extra/ipw3945d/FrugalBuild +++ /dev/null @@ -1,36 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: VMiklos - -pkgname=ipw3945d -pkgver=1.7.22 -pkgrel=4 -pkgdesc="Intel PRO/Wireless 3945ABG Network Connection Regulatory Daemon" -url="http://www.bughost.org/ipw3945/" -depends=('glibc') -groups=('network-extra') -archs=('i686' 'x86_64') -up2date="lynx -dump $url|grep ipw3945d-|sed 's/.*-\(.*\)\.t.*/\1/;q'" -source=($url/daemon/$pkgname-$pkgver.tgz rc.$pkgname rc.$pkgname-hu.po ipw3945-add ipw3945-rem) -sha1sums=('516affb782716847154d7387bc057e7644ff1dd2' \ - '26e2846c5e6c34cea54ec0d176f31f18de85e730' \ - '91cb6d5a6737fb5904d29675ce2a65d2ad49b127' \ - '4a3289ce645e3a0a2c37bbe5c1253fb0a5ad6540' \ - '091bf386d25404e284f77a2c232a6bb50b9fed7a') - -build() -{ - Fcd - if [ "$CARCH" == "i686" ]; then - cd x86 - elif [ "$CARCH" == "x86_64" ]; then - cd x86_64 - else - return 1 - fi - Fexerel /sbin/ipw3945d - Fmkdir /var/run/ipw3945d - Fmkdir /etc/modprobe.d - Ffile /etc/modprobe.d/ipw3945-add - Ffile /etc/modprobe.d/ipw3945-rem - Frcd2 $pkgname -} diff --git a/source/network-extra/ipw3945d/ipw3945-add b/source/network-extra/ipw3945d/ipw3945-add deleted file mode 100644 index ee70d28..0000000 --- a/source/network-extra/ipw3945d/ipw3945-add +++ /dev/null @@ -1,10 +0,0 @@ -install ipw3945 /sbin/modprobe -i ipw3945 && \ -{ \ - while [ ! -e /sys/bus/pci/drivers/ipw3945/*/cmd ]; do \ - sleep 1; \ - done; \ - while [ ! -d /var/run ]; do \ - sleep 1; \ - done; \ - /sbin/ipw3945d --pid-file=/var/run/ipw3945d/ipw3945d.pid --quiet; \ -} & diff --git a/source/network-extra/ipw3945d/ipw3945-rem b/source/network-extra/ipw3945d/ipw3945-rem deleted file mode 100644 index e739581..0000000 --- a/source/network-extra/ipw3945d/ipw3945-rem +++ /dev/null @@ -1 +0,0 @@ -remove ipw3945 /sbin/ipw3945d --pid-file=/var/run/ipw3945d/ipw3945d.pid --quiet --kill; /sbin/modprobe -i -r ipw3945 diff --git a/source/network-extra/ipw3945d/ipw3945d.install b/source/network-extra/ipw3945d/ipw3945d.install deleted file mode 100644 index b505c45..0000000 --- a/source/network-extra/ipw3945d/ipw3945d.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() -{ - echo "In order to use this daemon you have to agree to Intel's license located" - echo "in /usr/share/doc/ipw3945d-${1/-*}/README.ipw3945d" - echo "else please remove this package." - chkconfig --add rc.ipw3945d -} - -post_upgrade() -{ - chkconfig --del rc.ipw3945d - chkconfig --add rc.ipw3945d -} - -pre_remove() -{ - chkconfig --add rc.ipw3945d -} - -op=$1 -shift -$op $* diff --git a/source/network-extra/ipw3945d/rc.ipw3945d b/source/network-extra/ipw3945d/rc.ipw3945d deleted file mode 100644 index 4b843b8..0000000 --- a/source/network-extra/ipw3945d/rc.ipw3945d +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -# rc.ipw3945 for Frugalware -# distributed under GPL License - -# chkconfig: 2345 06 99 -# description: ipw3945 daemon - -source /lib/initscripts/functions -TEXTDOMAIN=ipw3945d -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(restart start stop) -daemon=$"ipw3945" -PID=`pidof -o %PPID /sbin/ipw3945d` - -rc_start() -{ - start_msg - /sbin/modprobe -C /etc/modprobe.d/ipw3945-add ipw3945 - ok $? -} - -rc_stop() -{ - stop_msg - /sbin/modprobe -C /etc/modprobe.d/ipw3945-rem -r ipw3945 - ok $? -} - -rc_exec $1 diff --git a/source/network-extra/ipw3945d/rc.ipw3945d-hu.po b/source/network-extra/ipw3945d/rc.ipw3945d-hu.po deleted file mode 100644 index d304477..0000000 --- a/source/network-extra/ipw3945d/rc.ipw3945d-hu.po +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2006 Frugalware Linux -# This file is distributed under the same license as the rc.ipw3945d package. -# Alex Smith , 2006. -# -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-21 18:50+0100\n" -"PO-Revision-Date: 2006-08-21 18:50+0100\n" -"Last-Translator: Alex Smith \n" -"Language-Team: Frugalware Linux \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.ipw3945d:14 -msgid "ipw3945d" -msgstr "ipw3945d" - From vmiklos at frugalware.org Mon Jun 2 16:17:43 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 2 16:17:44 2008 Subject: [Frugalware-git] pacman-tools: repoman: automatically clean all archs on clean Message-ID: <20080602141743.95A511190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=a6bc0822a707d6919804f2108fc5859c7a6b37eb commit a6bc0822a707d6919804f2108fc5859c7a6b37eb Author: Miklos Vajna Date: Mon Jun 2 16:16:07 2008 +0200 repoman: automatically clean all archs on clean - we regularly forgot to clean out old packages on x86_64, but there were no example of having to clean only one arch. so just clean each arch by default - yes, this is backwards compatible, we just drop the arch info if it's still submitted diff --git a/repoman b/repoman index 9f7d84c..8570625 100755 --- a/repoman +++ b/repoman @@ -220,13 +220,12 @@ server() clean) shift - if [ $# -lt 5 ]; then + if [ $# -lt 4 ]; then echo "Too few parameters!" - echo "usage: repoman server clean path fdb group pkg arch" + echo "usage: repoman server clean path fdb group pkg" return fi - local path="$1" fdb="$2" group="$3" pkg="$4" arch="$5" - shift 5 + local path="$1" fdb="$2" group="$3" pkg="$4" check_absolute_path cd $path if [ -e .git/lock ]; then @@ -235,31 +234,26 @@ server() else touch .git/lock fi - if ! cd source/$group/$pkg; then - echo "There is no package with this group!" - return - fi - if ! source FrugalBuild; then - echo "Failed to parse the FrugalBuid!" - return - fi - cd - >/dev/null - cd frugalware-$arch - if ! _check_nobuild; then - if [ ! -e $fdb ]; then - echo "No package database to clean from!" - return - else - if ! arch=$arch updatesync del $fdb $pkg; then - echo "updatesync failed!" + for i in frugalware-* + do + cd frugalware-$arch + if ! _check_nobuild; then + if [ ! -e $fdb ]; then + echo "No package database to clean from!" return + else + if ! arch=$arch updatesync del $fdb $pkg; then + echo "updatesync failed!" + return + fi fi fi - fi - rm ../.git/lock - arch=$arch genchangelog --clean $pkg - if [ -d ../source/$group/$pkg ]; then - rm -rfv ../source/$group/$pkg + genchangelog --clean $pkg + cd - >/dev/null + done + rm .git/lock + if [ -d source/$group/$pkg ]; then + rm -rfv source/$group/$pkg fi ;; @@ -388,7 +382,7 @@ clean() do msg "Cleaning up $i" split_group_pkg $i - ssh $host "$sudo_cmd repoman server clean '$path' '$fdb' '$group' '$pkg' '$arch'" + ssh $host "$sudo_cmd repoman server clean '$path' '$fdb' '$group' '$pkg'" done } From devil505linux at gmail.com Mon Jun 2 16:32:18 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 2 16:32:20 2008 Subject: [Frugalware-git] frugalware-current: playonlinux-3.0.1-2-i686 Message-ID: <20080602143218.5BB691190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c7f6815a7c5a17cb437b13bc56aacc09d885b8b3 commit c7f6815a7c5a17cb437b13bc56aacc09d885b8b3 Author: Devil505 Date: Mon Jun 2 16:32:06 2008 +0200 playonlinux-3.0.1-2-i686 * added gettext in depends() diff --git a/source/xapps-extra/playonlinux/FrugalBuild b/source/xapps-extra/playonlinux/FrugalBuild index 32f1dd8..8fba3fc 100644 --- a/source/xapps-extra/playonlinux/FrugalBuild +++ b/source/xapps-extra/playonlinux/FrugalBuild @@ -3,11 +3,11 @@ pkgname=playonlinux pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="GUI for managing Windows and DOS programs under linux" url="http://www.playonlinux.com" rodepends=('xterm') -depends=('libgcc' 'freeglut' 'libgl' 'libglx' 'libxext' 'libxdamage' 'wxpython' 'wine' 'lynx' 'cabextract' 'mesademos' 'lzma') +depends=('libgcc' 'freeglut' 'libgl' 'libglx' 'libxext' 'libxdamage' 'wxpython' 'wine' 'lynx' 'cabextract' 'mesademos' 'lzma' 'gettext') groups=('xapps-extra') archs=('i686' '!x86_64') _F_archive_name="PlayOnLinux" From devil505linux at gmail.com Mon Jun 2 17:08:11 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 2 17:08:14 2008 Subject: [Frugalware-git] frugalware-current: fortune-mod-calvin-0.1.1-1-i686 Message-ID: <20080602150811.C0D341190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=40595945d105e97d44e6e3b4df8de182935d35ee commit 40595945d105e97d44e6e3b4df8de182935d35ee Author: Devil505 Date: Mon Jun 2 17:08:02 2008 +0200 fortune-mod-calvin-0.1.1-1-i686 * new package diff --git a/source/games-extra/fortune-mod-calvin/FrugalBuild b/source/games-extra/fortune-mod-calvin/FrugalBuild new file mode 100644 index 0000000..b1bcfc9 --- /dev/null +++ b/source/games-extra/fortune-mod-calvin/FrugalBuild @@ -0,0 +1,21 @@ +# Compiling Time: 0.05 SBU +# Maintainer: Devil505 + +pkgname=fortune-mod-calvin +pkgver=0.1.1 +pkgrel=1 +pkgdesc="Calvin and Hobbes fortune cookie" +url="http://www.netmeister.org/misc.html" +depends=('fortune-mod') +groups=('games-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump $url | Flasttar" +source=(http://www.netmeister.org/apps/$pkgname-$pkgver.tar.gz) +sha1sums=('6d13833bed7b02829dfa250328dd37b9de16b5b5') + +build() { + Fcd + Fmkdir usr/share/fortune + Finstallrel 644 calvin usr/share/fortune + Finstallrel 644 calvin.dat usr/share/fortune +} From devil505linux at gmail.com Mon Jun 2 17:09:32 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 2 17:09:33 2008 Subject: [Frugalware-git] frugalware-current: fortune-mod-familyguy-0.2-1-i686 Message-ID: <20080602150932.28F101190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0550c87a4cd8de66b145630b362d872c5745ffd9 commit 0550c87a4cd8de66b145630b362d872c5745ffd9 Author: Devil505 Date: Mon Jun 2 17:09:25 2008 +0200 fortune-mod-familyguy-0.2-1-i686 * new package diff --git a/source/games-extra/fortune-mod-familyguy/FrugalBuild b/source/games-extra/fortune-mod-familyguy/FrugalBuild new file mode 100644 index 0000000..f35e2c1 --- /dev/null +++ b/source/games-extra/fortune-mod-familyguy/FrugalBuild @@ -0,0 +1,21 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=fortune-mod-familyguy +pkgver=0.2 +pkgrel=1 +pkgdesc="Family Guy fortune cookie files" +url="http://jon.oberheide.org/projects/familyguy/" +depends=('fortune-mod') +groups=('games-extra') +archs=('i686') +up2date="lynx -dump $url | Flasttar" +source=(http://jon.oberheide.org/projects/familyguy/$pkgname-$pkgver.tar.gz) +sha1sums=('f51d4f64746cc793d7edb607b4b435a6dddb9448') + +build() { + Fcd + Fmkdir usr/share/fortune + Finstallrel 644 familyguy usr/share/fortune + Finstallrel 644 familyguy.dat usr/share/fortune +} From devil505linux at gmail.com Mon Jun 2 17:10:42 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 2 17:10:43 2008 Subject: [Frugalware-git] frugalware-current: fortune-mod-futurama-0.2-1-i686 Message-ID: <20080602151042.65BD51190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5c006eeb344e09897bbcc7370ff911a4e5ab015e commit 5c006eeb344e09897bbcc7370ff911a4e5ab015e Author: Devil505 Date: Mon Jun 2 17:10:36 2008 +0200 fortune-mod-futurama-0.2-1-i686 * new package diff --git a/source/games-extra/fortune-mod-futurama/FrugalBuild b/source/games-extra/fortune-mod-futurama/FrugalBuild new file mode 100644 index 0000000..87f1877 --- /dev/null +++ b/source/games-extra/fortune-mod-futurama/FrugalBuild @@ -0,0 +1,21 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=fortune-mod-futurama +pkgver=0.2 +pkgrel=1 +pkgdesc="Futurama fortune cookie files" +url="http://www.netmeister.org/misc.html" +depends=('fortune-mod') +groups=('games-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump $url | Flasttar" +source=(http://www.netmeister.org/apps/$pkgname-$pkgver.tar.gz) +sha1sums=('ef4078f818142dd55befd75438a44daae7265b0b') + +build() { + Fcd + Fmkdir usr/share/fortune + Finstallrel 644 futurama usr/share/fortune + Finstallrel 644 futurama.dat usr/share/fortune +} From devil505linux at gmail.com Mon Jun 2 17:11:34 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 2 17:11:35 2008 Subject: [Frugalware-git] frugalware-current: fortune-mod-familyguy-0.2-1-i686 Message-ID: <20080602151134.94E301190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7ef62553346e1bb9b7fb3d6e6ca3ec8ea55a080e commit 7ef62553346e1bb9b7fb3d6e6ca3ec8ea55a080e Author: Devil505 Date: Mon Jun 2 17:11:28 2008 +0200 fortune-mod-familyguy-0.2-1-i686 * added x86_64 to archs() diff --git a/source/games-extra/fortune-mod-familyguy/FrugalBuild b/source/games-extra/fortune-mod-familyguy/FrugalBuild index f35e2c1..f93be6e 100644 --- a/source/games-extra/fortune-mod-familyguy/FrugalBuild +++ b/source/games-extra/fortune-mod-familyguy/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Family Guy fortune cookie files" url="http://jon.oberheide.org/projects/familyguy/" depends=('fortune-mod') groups=('games-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url | Flasttar" source=(http://jon.oberheide.org/projects/familyguy/$pkgname-$pkgver.tar.gz) sha1sums=('f51d4f64746cc793d7edb607b4b435a6dddb9448') From vmiklos at frugalware.org Mon Jun 2 17:12:46 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 2 17:12:48 2008 Subject: [Frugalware-git] frugalware-current: iwlwifi-3945-ucode-2.14.1.5-2-i686 Message-ID: <20080602151246.C7E3F1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=08dd7a4cc3d8f55e0561f8c9cab08c4c8949212d commit 08dd7a4cc3d8f55e0561f8c9cab08c4c8949212d Author: Miklos Vajna Date: Mon Jun 2 17:12:33 2008 +0200 iwlwifi-3945-ucode-2.14.1.5-2-i686 - added replaces() for ipw diff --git a/source/network-extra/iwlwifi-3945-ucode/FrugalBuild b/source/network-extra/iwlwifi-3945-ucode/FrugalBuild index 01fec96..dd6a074 100644 --- a/source/network-extra/iwlwifi-3945-ucode/FrugalBuild +++ b/source/network-extra/iwlwifi-3945-ucode/FrugalBuild @@ -3,10 +3,11 @@ pkgname=iwlwifi-3945-ucode pkgver=2.14.1.5 -pkgrel=1 +pkgrel=2 pkgdesc="Intel PRO/Wireless 3945ABG Network Connection Adapter Microcode" url="http://www.intellinuxwireless.org/" depends=('udev') +replaces=('ipw3945-ucode' 'ipw3945d') groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump ${url}?n=downloads|grep iwlwifi-3945-ucode|sed 's/.*-\(.*\)\.t.*/\1/;q'" From vmiklos at frugalware.org Mon Jun 2 17:15:03 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 2 17:15:05 2008 Subject: [Frugalware-git] frugalware-current: kernel-2.6.25-4-i686 Message-ID: <20080602151503.D1A8B1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a3a64467a2b691fc39e3ad76691dded25db4ac41 commit a3a64467a2b691fc39e3ad76691dded25db4ac41 Author: Miklos Vajna Date: Mon Jun 2 17:14:28 2008 +0200 kernel-2.6.25-4-i686 - add ipw3945 to replaces() diff --git a/source/include/kernel.sh b/source/include/kernel.sh index 357d658..5875fb1 100644 --- a/source/include/kernel.sh +++ b/source/include/kernel.sh @@ -136,6 +136,7 @@ fi # * rodepends # * makedepends # * groups +# * replaces # * archs # * options() # * up2date @@ -160,6 +161,8 @@ options=('nodocs' 'genscriptlet') up2date="lynx -dump $url/kdist/finger_banner |sed -n 's/.* \([0-9]*\.[0-9]*\.[0-9]*\).*/\1/;1 p'" 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) + # this can be removed after Frualware 0.9 is out + replaces=('ipw3945') else source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_F_kernel_ver.tar.bz2 config) fi From devil505linux at gmail.com Mon Jun 2 17:33:26 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 2 17:33:28 2008 Subject: [Frugalware-git] frugalware-current: fortune-mod-chalkboard-1-1-i686 Message-ID: <20080602153326.A26121190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8aa7d646e6e8c170782d88e639f8dd2e9fd330be commit 8aa7d646e6e8c170782d88e639f8dd2e9fd330be Author: Devil505 Date: Mon Jun 2 17:33:10 2008 +0200 fortune-mod-chalkboard-1-1-i686 * new package diff --git a/source/games-extra/fortune-mod-chalkboard/FrugalBuild b/source/games-extra/fortune-mod-chalkboard/FrugalBuild new file mode 100644 index 0000000..7919f57 --- /dev/null +++ b/source/games-extra/fortune-mod-chalkboard/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=fortune-mod-chalkboard +pkgver=1 +pkgrel=1 +pkgdesc="A collection fortune cookies of Bart Simpson's chalkboard-writings from the opening credits of episodes of the TV show The Simpsons." +url="http://www.splitbrain.org/projects/fortunes/simpsons" +depends=('fortune-mod') +groups=('games-extra') +archs=('i686' 'x86_64') +up2date=$pkgver +source=("http://www.splitbrain.org/_media/projects/fortunes/fortune-simpsons-chalkboard.tgz") +_F_cd_path="fortune-simpsons-chalkboard" +sha1sums=('a3effee140c457d22873e87144c79e4811badc78') + +build() { + Fcd + Fmkdir usr/share/fortune + Finstallrel 644 chalkboard usr/share/fortune + Finstallrel 644 chalkboard.dat usr/share/fortune +} From devil505linux at gmail.com Mon Jun 2 17:40:57 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 2 17:40:59 2008 Subject: [Frugalware-git] frugalware-current: fortune-mod-discworld-1-1-i686 Message-ID: <20080602154057.C34BD1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6e67d6eb530cc07c22ee498cfd48ae0af9ca38f4 commit 6e67d6eb530cc07c22ee498cfd48ae0af9ca38f4 Author: Devil505 Date: Mon Jun 2 17:40:43 2008 +0200 fortune-mod-discworld-1-1-i686 * new package diff --git a/source/games-extra/fortune-mod-discworld/FrugalBuild b/source/games-extra/fortune-mod-discworld/FrugalBuild new file mode 100644 index 0000000..892eaf1 --- /dev/null +++ b/source/games-extra/fortune-mod-discworld/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=fortune-mod-discworld +pkgver=1 +pkgrel=1 +pkgdesc="A collection of quotes from the "Discworld" novels by Terry Pratchett." +url="http://www.splitbrain.org/projects/fortunes/discworld" +depends=('fortune-mod') +groups=('games-extra') +archs=('i686' 'x86_64') +up2date=$pkgver +source=(http://www.splitbrain.org/_media/projects/fortunes/fortune-discworld.tgz) +_F_cd_path="fortune-discworld" +sha1sums=('5893b8b7a603f023a62782c291ac33aa4ccbf58e') + +build() { + Fcd + Fmkdir usr/share/fortune + Finstallrel 644 discworld usr/share/fortune + Finstallrel 644 discworld.dat usr/share/fortune +} From devil505linux at gmail.com Mon Jun 2 17:46:43 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 2 17:46:45 2008 Subject: [Frugalware-git] frugalware-current: fortune-mod-fgump-1-1-i686 Message-ID: <20080602154643.93D601190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b46b8e75c1ca8d37a904b8ed46682ef3e269d0b9 commit b46b8e75c1ca8d37a904b8ed46682ef3e269d0b9 Author: Devil505 Date: Mon Jun 2 17:46:35 2008 +0200 fortune-mod-fgump-1-1-i686 * new package diff --git a/source/games-extra/fortune-mod-fgump/FrugalBuild b/source/games-extra/fortune-mod-fgump/FrugalBuild new file mode 100644 index 0000000..cce07c9 --- /dev/null +++ b/source/games-extra/fortune-mod-fgump/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=fortune-mod-fgump +pkgver=1 +pkgrel=1 +pkgdesc="A collection of quotes from the film Forrest Gump." +url="http://www.splitbrain.org/projects/fortunes/fgump" +depends=('fortune-mod') +groups=('games-extra') +archs=('i686' 'x86_64') +up2date=$pkgver +source=(http://www.splitbrain.org/_media/projects/fortunes/fortune-fgump.tgz) +_F_cd_path="fortune-fgump" +sha1sums=('76f35a8438c1aaf2f84744f6be1570ae971f90f7') + +build() { + Fcd + Fmkdir usr/share/fortune + Finstallrel 644 fgump usr/share/fortune + Finstallrel 644 fgump.dat usr/share/fortune +} From devil505linux at gmail.com Mon Jun 2 17:56:09 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 2 17:56:12 2008 Subject: [Frugalware-git] frugalware-current: fortune-mod-hitchhiker-1-1-i686 Message-ID: <20080602155609.BD4C81190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7406b6e0d5e5a4587ea1daf061eb60b170d44ad8 commit 7406b6e0d5e5a4587ea1daf061eb60b170d44ad8 Author: Devil505 Date: Mon Jun 2 17:55:55 2008 +0200 fortune-mod-hitchhiker-1-1-i686 * new package diff --git a/source/games-extra/fortune-mod-hitchhiker/FrugalBuild b/source/games-extra/fortune-mod-hitchhiker/FrugalBuild new file mode 100644 index 0000000..ced1fe3 --- /dev/null +++ b/source/games-extra/fortune-mod-hitchhiker/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=fortune-mod-hitchhiker +pkgver=1 +pkgrel=1 +pkgdesc="This is a collection of quotes from Douglas Adams' famous Hitchhikers Guide to the Galaxy." +url="http://www.splitbrain.org/projects/fortunes/hg2g" +depends=('fortune-mod') +groups=('games-extra') +archs=('i686' 'x86_64') +up2date=$pkgver +source=(http://www.splitbrain.org/_media/projects/fortunes/fortune-hitchhiker.tgz) +_F_cd_path="fortune-hitchhiker" +sha1sums=('c6db6cfe3e9062fe6fb0dcc7723b4f10f63ba998') + +build() { + Fcd + Fmkdir usr/share/fortune + Finstallrel 644 hitchhiker usr/share/fortune + Finstallrel 644 hitchhiker.dat usr/share/fortune +} From devil505linux at gmail.com Mon Jun 2 18:02:16 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 2 18:02:17 2008 Subject: [Frugalware-git] frugalware-current: fortune-mod-starwars-1-1-i686 Message-ID: <20080602160216.E70CE1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4640be6a51b2a43b933e6212ec20237988a4a8bd commit 4640be6a51b2a43b933e6212ec20237988a4a8bd Author: Devil505 Date: Mon Jun 2 18:02:09 2008 +0200 fortune-mod-starwars-1-1-i686 * new package diff --git a/source/games-extra/fortune-mod-starwars/FrugalBuild b/source/games-extra/fortune-mod-starwars/FrugalBuild new file mode 100644 index 0000000..098d10b --- /dev/null +++ b/source/games-extra/fortune-mod-starwars/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=fortune-mod-starwars +pkgver=1 +pkgrel=1 +pkgdesc="A collection of fortune cookies from Starwars." +url="http://www.splitbrain.org/projects/fortunes/starwars" +depends=('fortune-mod') +groups=('games-extra') +archs=('i686' 'x86_64') +up2date=$pkgver +source=(http://www.splitbrain.org/_media/projects/fortunes/fortune-starwars.tgz) +_F_cd_path="fortune-starwars" +sha1sums=('8789528ac6787d32afc8451a17aefc88e015de41') + +build() { + Fcd + Fmkdir usr/share/fortune + Finstallrel 644 starwars usr/share/fortune + Finstallrel 644 starwars.dat usr/share/fortune +} From devil505linux at gmail.com Mon Jun 2 18:27:05 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 2 18:27:08 2008 Subject: [Frugalware-git] frugalware-current: fortune-mod-xfiles-1-1-i686 Message-ID: <20080602162705.DEE181190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8f23f464d1012703495d31365f75cc4474c8de57 commit 8f23f464d1012703495d31365f75cc4474c8de57 Author: Devil505 Date: Mon Jun 2 18:26:52 2008 +0200 fortune-mod-xfiles-1-1-i686 * new package diff --git a/source/games-extra/fortune-mod-xfiles/FrugalBuild b/source/games-extra/fortune-mod-xfiles/FrugalBuild new file mode 100644 index 0000000..3be786b --- /dev/null +++ b/source/games-extra/fortune-mod-xfiles/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=fortune-mod-xfiles +pkgver=1 +pkgrel=1 +pkgdesc="A collection of fortune cookies from X-Files." +url="http://www.splitbrain.org/projects/fortunes/xfiles" +depends=('fortune-mod') +groups=('games-extra') +archs=('i686' 'x86_64') +up2date=$pkgver +source=(http://www.splitbrain.org/_media/projects/fortunes/fortune-xfiles.tgz) +_F_cd_path="fortune-xfiles" +sha1sums=('ce24af336a80a71c89da83499c85b9b238ef6226') + +build() { + Fcd + Fmkdir usr/share/fortune + Finstallrel 644 xfiles usr/share/fortune + Finstallrel 644 xfiles.dat usr/share/fortune +} From devil505linux at gmail.com Mon Jun 2 18:58:09 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 2 18:58:11 2008 Subject: [Frugalware-git] frugalware-current: fortune-mod-tolkien-fr-1.14-1-i686 Message-ID: <20080602165809.043841190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bdeadadc02372bd3247af4d080a930447a6bbfd3 commit bdeadadc02372bd3247af4d080a930447a6bbfd3 Author: Devil505 Date: Mon Jun 2 18:57:55 2008 +0200 fortune-mod-tolkien-fr-1.14-1-i686 * new package diff --git a/source/games-extra/fortune-mod-tolkien-fr/FrugalBuild b/source/games-extra/fortune-mod-tolkien-fr/FrugalBuild new file mode 100644 index 0000000..b779520 --- /dev/null +++ b/source/games-extra/fortune-mod-tolkien-fr/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=fortune-mod-tolkien-fr +pkgver=1.14 +pkgrel=1 +pkgdesc="A collection of fortune cookies from J.R.R Tolkien's books (in french)." +url="http://vbeaud.free.fr/Tolkien/Univers/fortune.html" +depends=('fortune-mod') +groups=('games-extra') +archs=('i686' 'x86_64') +_F_archive_name="tolkien_fr" +up2date="lynx -dump $url | Flasttar" +source=(http://vbeaud.free.fr/Tolkien/Univers/$_F_archive_name-$pkgver.tgz) +_F_cd_path="$_F_archive_name-$pkgver" +sha1sums=('dac839d78d463137a09b23350fe97f56c5765733') + +build() { + Fcd + Fmkdir usr/share/fortune + Finstallrel 644 $_F_archive_name usr/share/fortune + Finstallrel 644 $_F_archive_name.dat usr/share/fortune +} + From devil505linux at gmail.com Mon Jun 2 19:06:50 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 2 19:06:51 2008 Subject: [Frugalware-git] frugalware-current: fortune-mod-powerpuff-0.3-1-i686 Message-ID: <20080602170650.8C63C1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eb1a8d1ccf4da1730e098daa375f319787226f7e commit eb1a8d1ccf4da1730e098daa375f319787226f7e Author: Devil505 Date: Mon Jun 2 19:06:40 2008 +0200 fortune-mod-powerpuff-0.3-1-i686 * new package diff --git a/source/games-extra/fortune-mod-powerpuff/FrugalBuild b/source/games-extra/fortune-mod-powerpuff/FrugalBuild new file mode 100644 index 0000000..019e2fa --- /dev/null +++ b/source/games-extra/fortune-mod-powerpuff/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=fortune-mod-powerpuff +pkgver=0.3 +pkgrel=1 +pkgdesc="Quotes taken from the Power Puff Girls series from Cartoon Network." +url="http://eol.init1.nl/content/view/43/54/" +depends=('fortune-mod') +groups=('games-extra') +archs=('i686' 'x86_64') +_F_archive_name="powerpuff" +up2date="lynx -dump $url | Flasttar" +source=(http://eelco.is.a.rootboy.net/fortunecookies/$_F_archive_name-$pkgver.tar.gz) +_F_cd_path="$_F_archive_name-$pkgver" +sha1sums=('1264f1535d48e28eb225f1f29232886d23bc4e55') + +build() { + Fcd + Fmkdir usr/share/fortune + Finstallrel 644 $_F_archive_name usr/share/fortune + Finstallrel 644 $_F_archive_name.dat usr/share/fortune +} + From devil505linux at gmail.com Mon Jun 2 19:13:20 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 2 19:13:20 2008 Subject: [Frugalware-git] frugalware-current: fortune-mod-southpark-0.2-1-i686 Message-ID: <20080602171320.485B11190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c36ab387e0ba38d78125bc2c72c939eb62c9557c commit c36ab387e0ba38d78125bc2c72c939eb62c9557c Author: Devil505 Date: Mon Jun 2 19:13:08 2008 +0200 fortune-mod-southpark-0.2-1-i686 * new package diff --git a/source/games-extra/fortune-mod-southpark/FrugalBuild b/source/games-extra/fortune-mod-southpark/FrugalBuild new file mode 100644 index 0000000..2967091 --- /dev/null +++ b/source/games-extra/fortune-mod-southpark/FrugalBuild @@ -0,0 +1,23 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=fortune-mod-southpark +pkgver=0.2 +pkgrel=1 +pkgdesc="Quotes taken from tv cartoon South park." +url="http://eol.init1.nl/content/view/44/54/" +depends=('fortune-mod') +groups=('games-extra') +archs=('i686' 'x86_64') +_F_archive_name="SP" +up2date="lynx -dump $url | Flasttar" +source=(http://eelco.is.a.rootboy.net/fortunecookies/$_F_archive_name-$pkgver.tar.gz) +_F_cd_path="$_F_archive_name-$pkgver" +sha1sums=('ae4718c8707eb19f6f5222674507bc7670f7dbbc') + +build() { + Fcd + Fmkdir usr/share/fortune + Finstallrel 644 $_F_archive_name usr/share/fortune + Finstallrel 644 $_F_archive_name.dat usr/share/fortune +} From devil505linux at gmail.com Mon Jun 2 19:17:52 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 2 19:17:54 2008 Subject: [Frugalware-git] frugalware-current: fortune-mod-oneliners-0.1-1-i686 Message-ID: <20080602171752.F2CAD1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=595844a7f33b77e82c9a99c161a0d81e1ac1ca2a commit 595844a7f33b77e82c9a99c161a0d81e1ac1ca2a Author: Devil505 Date: Mon Jun 2 19:17:44 2008 +0200 fortune-mod-oneliners-0.1-1-i686 * new package diff --git a/source/games-extra/fortune-mod-oneliners/FrugalBuild b/source/games-extra/fortune-mod-oneliners/FrugalBuild new file mode 100644 index 0000000..1c2668d --- /dev/null +++ b/source/games-extra/fortune-mod-oneliners/FrugalBuild @@ -0,0 +1,23 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=fortune-mod-oneliners +pkgver=0.1 +pkgrel=1 +pkgdesc="Lots of randomly chosen oneliners that can be quite funny." +url="http://eol.init1.nl/content/view/45/54/" +depends=('fortune-mod') +groups=('games-extra') +archs=('i686' 'x86_64') +_F_archive_name="oneliners" +up2date="lynx -dump $url | Flasttar" +source=(http://eelco.is.a.rootboy.net/fortunecookies/$_F_archive_name-$pkgver.tar.gz) +_F_cd_path="$_F_archive_name-$pkgver" +sha1sums=('5bf327d6791d3688a143186dbc15bc9cd9afc6d7') + +build() { + Fcd + Fmkdir usr/share/fortune + Finstallrel 644 $_F_archive_name usr/share/fortune + Finstallrel 644 $_F_archive_name.dat usr/share/fortune +} From devil505linux at gmail.com Mon Jun 2 19:20:21 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 2 19:20:23 2008 Subject: [Frugalware-git] frugalware-current: fortune-mod-southpark-0.2-2-i686 Message-ID: <20080602172021.D1A221190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=af8716f084421f43722da6e69cc716506a277c2b commit af8716f084421f43722da6e69cc716506a277c2b Author: Devil505 Date: Mon Jun 2 19:20:13 2008 +0200 fortune-mod-southpark-0.2-2-i686 * added a better description in pkgdesc diff --git a/source/games-extra/fortune-mod-southpark/FrugalBuild b/source/games-extra/fortune-mod-southpark/FrugalBuild index 2967091..291a42c 100644 --- a/source/games-extra/fortune-mod-southpark/FrugalBuild +++ b/source/games-extra/fortune-mod-southpark/FrugalBuild @@ -3,8 +3,8 @@ pkgname=fortune-mod-southpark pkgver=0.2 -pkgrel=1 -pkgdesc="Quotes taken from tv cartoon South park." +pkgrel=2 +pkgdesc="A whole set of quotes from South Park: Bigger, Longer & Uncut" url="http://eol.init1.nl/content/view/44/54/" depends=('fortune-mod') groups=('games-extra') From crazy at frugalware.org Mon Jun 2 20:33:38 2008 From: crazy at frugalware.org (crazy) Date: Mon Jun 2 20:33:39 2008 Subject: [Frugalware-git] frugalware-current: sdl_gfx-2.0.17-1-x86_64 Message-ID: <20080602183338.0C6D31190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ff0632a616fd64e69a8ecb9d1d2e450e5adbe5c9 commit ff0632a616fd64e69a8ecb9d1d2e450e5adbe5c9 Author: crazy Date: Mon Jun 2 20:32:49 2008 +0200 sdl_gfx-2.0.17-1-x86_64 * uhmm , kill MAKEFLAGS * for some reason it works on 64bit but 32bit * ( at least from build logs ) diff --git a/source/xlib/sdl_gfx/FrugalBuild b/source/xlib/sdl_gfx/FrugalBuild index d86baa5..fed9b77 100644 --- a/source/xlib/sdl_gfx/FrugalBuild +++ b/source/xlib/sdl_gfx/FrugalBuild @@ -16,6 +16,7 @@ sha1sums=('7be52033ca8f014ee7761f6f298feac8336bfa5a') build() { + unset MAKEFLAGS ## weird works on 64bit but on 32bit =) Fcd SDL_gfx-$pkgver Fautoreconf [ "${CARCH}" == "x86_64" ] && Fconfopts="$Fconfopts --disable-mmx" From bouleetbil at frogdev.info Mon Jun 2 21:17:29 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jun 2 21:17:31 2008 Subject: [Frugalware-git] frugalware-current: gvfs-0.2.4-1-i686 Message-ID: <20080602191729.E3AF51190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e5ab6b9d728fb7bc2d7081d7250ff573b5959511 commit e5ab6b9d728fb7bc2d7081d7250ff573b5959511 Author: bouleetbil Date: Mon Jun 2 21:07:38 2008 +0200 gvfs-0.2.4-1-i686 *version bump diff --git a/source/gnome/gvfs/FrugalBuild b/source/gnome/gvfs/FrugalBuild index 71b27d4..44de49a 100644 --- a/source/gnome/gvfs/FrugalBuild +++ b/source/gnome/gvfs/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gvfs -pkgver=0.2.3 +pkgver=0.2.4 pkgrel=1 pkgdesc="gvfs is a userspace virtual filesystem designed to work with the i/o abstractions of gio." url="http://www.gnome.org/" @@ -12,6 +12,6 @@ groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') Finclude gnome -sha1sums=('9b2a73b4d0edf77a623eeda001f634f11d8ea74b') +sha1sums=('ff6698c56ca28723d0cc42f1acb72e89bffe635e') # optimization OK From bouleetbil at frogdev.info Mon Jun 2 21:49:37 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jun 2 21:49:40 2008 Subject: [Frugalware-git] frugalware-current: libgweather-2.22.2-1-i686 Message-ID: <20080602194937.DF55E1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dd76db65aa6e1741a7646eea5b6d99c2ea23162d commit dd76db65aa6e1741a7646eea5b6d99c2ea23162d Author: bouleetbil Date: Mon Jun 2 21:43:51 2008 +0200 libgweather-2.22.2-1-i686 *version bump diff --git a/source/gnome/libgweather/FrugalBuild b/source/gnome/libgweather/FrugalBuild index 8deb76c..bace351 100644 --- a/source/gnome/libgweather/FrugalBuild +++ b/source/gnome/libgweather/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libgweather -pkgver=2.22.1.2 +pkgver=2.22.2 pkgrel=1 pkgdesc="libgweather is a library to access weather information from online services for numerous locations." url="http://www.gnome.org/" @@ -12,7 +12,7 @@ groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/gweather.schemas') Finclude gnome gnome-scriptlet -sha1sums=('90a25b5e21df640ef17130536e210a3049f25f57') +sha1sums=('d059557766d100d7f2a576419ae2ab4e212737fe') unset MAKEFLAGS # optimization OK From bouleetbil at frogdev.info Mon Jun 2 22:20:25 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jun 2 22:20:27 2008 Subject: [Frugalware-git] frugalware-current: gnome-panel-2.22.2-1 Message-ID: <20080602202025.7522C1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0efac6760d27d940c04ea88c74144684674feae6 commit 0efac6760d27d940c04ea88c74144684674feae6 Author: bouleetbil Date: Mon Jun 2 22:10:58 2008 +0200 gnome-panel-2.22.2-1 *version bump diff --git a/source/gnome/gnome-panel/FrugalBuild b/source/gnome/gnome-panel/FrugalBuild index 2ef491d..a56afd1 100644 --- a/source/gnome/gnome-panel/FrugalBuild +++ b/source/gnome/gnome-panel/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-panel -pkgver=2.22.1.3 +pkgver=2.22.2 pkgrel=1 pkgdesc="GNOME panel and core applets" rodepends=('alacarte>=0.11.1.1') -depends=('gnome-desktop>=2.22.0' 'gnome-menus>=2.22.0' 'libwnck>=2.22.0' \ - 'gnome-vfs>=2.20.0' 'evolution-data-server>=2.22.1.1' \ - 'rarian>=0.8.0' 'dbus-glib>=0.71' 'avahi-glib>=0.6.17' 'librsvg>=2.22.0' 'libgweather>=2.22.1.2') +depends=('gnome-desktop>=2.22.2' 'gnome-menus>=2.22.2' 'libwnck>=2.22.1' \ + 'gnome-vfs>=2.22.0' 'evolution-data-server>=2.22.2' \ + 'rarian>=0.8.0' 'dbus-glib>=0.71' 'avahi-glib>=0.6.17' 'librsvg>=2.22.0' 'libgweather>=2.22.2') makedepends=('intltool' 'gtk-doc>=1.9' 'gnome-doc-utils>=0.12.0') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') @@ -26,7 +26,7 @@ _F_gnome_scrollkeeper="y" _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -sha1sums=('28a81f4e59a32295d2dfdc52f4becb7ce539ee3c') +sha1sums=('73752c3ce6224886c2381b0b13111253008bc6f7') build() { Fcd From boobaa at frugalware.org Mon Jun 2 22:33:43 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Mon Jun 2 22:33:45 2008 Subject: [Frugalware-git] frugalware-current: gv-3.6.4-1-i686 Message-ID: <20080602203343.A594A1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9b6e755e7c4f14f89b53ed0cfe4dd51e2c626aaa commit 9b6e755e7c4f14f89b53ed0cfe4dd51e2c626aaa Author: CSCSY Lszl Date: Mon Jun 2 22:33:09 2008 +0200 gv-3.6.4-1-i686 version bump diff --git a/source/xapps-extra/gv/FrugalBuild b/source/xapps-extra/gv/FrugalBuild index ad69633..cf8e8bc 100644 --- a/source/xapps-extra/gv/FrugalBuild +++ b/source/xapps-extra/gv/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSCSY Lszl pkgname=gv -pkgver=3.6.3 -pkgrel=2 +pkgver=3.6.4 +pkgrel=1 pkgdesc="gv allows to view and navigate through PostScript and PDF documents on an X display" url="http://www.gnu.org/software/gv/" depends=('xaw3d') @@ -12,6 +12,6 @@ Fup2gnugz source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('1eb09482a1b77f6db957840ba691b42947aeb364') +sha1sums=('fe11736ba4a31c7d1f27e3829e6e6765eee6eb31') # optimization OK From bouleetbil at frogdev.info Mon Jun 2 22:35:30 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jun 2 22:35:31 2008 Subject: [Frugalware-git] frugalware-current: eel-2.22.2-1-i686 Message-ID: <20080602203530.7A38C1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e0dc09037a7df2304c57391efb00f082f83ffa18 commit e0dc09037a7df2304c57391efb00f082f83ffa18 Author: bouleetbil Date: Mon Jun 2 22:29:29 2008 +0200 eel-2.22.2-1-i686 *version bump diff --git a/source/gnome/eel/FrugalBuild b/source/gnome/eel/FrugalBuild index 9f7d940..a06c288 100644 --- a/source/gnome/eel/FrugalBuild +++ b/source/gnome/eel/FrugalBuild @@ -2,14 +2,14 @@ # Maintainer: Christian Hamar alias krix pkgname=eel -pkgver=2.22.1 +pkgver=2.22.2 pkgrel=1 pkgdesc="Eazel Extensions Library is a collection of widgets and extensions for GNOME" -depends=('gail>=1.22.1' 'gnome-menus>=2.22.0' 'gnome-desktop>=2.22.0') +depends=('gail>=1.22.1' 'gnome-menus>=2.22.2' 'gnome-desktop>=2.22.2') makedepends=('perl-xml-parser') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') Finclude gnome -sha1sums=('a0180db9f175d7a316fcdb054bec3ca098607bef') +sha1sums=('503af67ee6fe89491cc9214e1d726fa34cb355b4') # optimization OK From devil505linux at gmail.com Mon Jun 2 22:38:42 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 2 22:38:44 2008 Subject: [Frugalware-git] frugalware-current: gpodder-0.11.3-1-i686 Message-ID: <20080602203842.D443A1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f51d38c1ebf103c1447a8e34f8111d5f9c8ce96a commit f51d38c1ebf103c1447a8e34f8111d5f9c8ce96a Author: Devil505 Date: Mon Jun 2 22:33:22 2008 +0200 gpodder-0.11.3-1-i686 * version bump diff --git a/source/gnome-extra/gpodder/FrugalBuild b/source/gnome-extra/gpodder/FrugalBuild index e80898e..cfb4247 100644 --- a/source/gnome-extra/gpodder/FrugalBuild +++ b/source/gnome-extra/gpodder/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=gpodder -pkgver=0.11.2 +pkgver=0.11.3 pkgrel=1 pkgdesc="A podcast reciever/catcher." depends=('pygtk' 'pyxml' 'wget' 'python' 'libglade' 'imagemagick' 'feedparser') @@ -13,6 +13,5 @@ Finclude berlios _F_gnome_iconcache="y" options=('scriptlet') Finclude gnome-scriptlet -sha1sums=('f7322a39c086f6e8ceab246cc77babf31fe6979f') - +sha1sums=('d84a9bea2ebb4beb10196b9fa321ba0e613e4181') From bouleetbil at frogdev.info Mon Jun 2 23:09:06 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jun 2 23:09:07 2008 Subject: [Frugalware-git] frugalware-current: gnome-settings-daemon-2.22.2.1-1 Message-ID: <20080602210906.4B3561190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=316719abdc20cc218e6846e6c0033bdec13fbb1b commit 316719abdc20cc218e6846e6c0033bdec13fbb1b Author: bouleetbil Date: Mon Jun 2 22:52:14 2008 +0200 gnome-settings-daemon-2.22.2.1-1 *version bump diff --git a/source/gnome/gnome-settings-daemon/FrugalBuild b/source/gnome/gnome-settings-daemon/FrugalBuild index 5fccd22..c7ec550 100644 --- a/source/gnome/gnome-settings-daemon/FrugalBuild +++ b/source/gnome/gnome-settings-daemon/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-settings-daemon -pkgver=2.22.1 -pkgrel=2 +pkgver=2.22.2.1 +pkgrel=1 pkgdesc="Utility library for accessing gnome-settings-daemon over DBUS" depends=('libgnomekbd' 'esd' 'gst-plugins-base' 'libgnomeui' 'libxxf86misc' 'gnome-desktop' 'gconf' 'alsa-lib') -makedepends=('intltool' 'gtk-doc>=1.9' 'gnome-doc-utils>=0.12.0') +makedepends=('intltool' 'gtk-doc>=1.9' 'gnome-doc-utils>=0.12.2') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/gnome-settings-daemon.schemas' @@ -17,7 +17,7 @@ _F_gnome_entries=('/etc/gconf/schemas/panel-default-setup.entries') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet source=(${source[@]} default_dpi.patch) -sha1sums=('79ce2a93290e5425b10a714fb58c2bc3d7293496' \ +sha1sums=('0424486b6e53ab0d2dd676c375d02e35341b3a20' \ 'eb601b6406db7700c12d6b144eacbbdc7c4a780e') Fconfopts="$Fconfopts --enable-gstreamer" From devil505linux at gmail.com Mon Jun 2 23:35:24 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 2 23:35:26 2008 Subject: [Frugalware-git] frugalware-current: gbrainy-0.70-1-i686 Message-ID: <20080602213524.C76D91190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6bfcd50a583241fd1dfe4bdd28e5256c5a31da44 commit 6bfcd50a583241fd1dfe4bdd28e5256c5a31da44 Author: Devil505 Date: Mon Jun 2 23:34:54 2008 +0200 gbrainy-0.70-1-i686 * version bump diff --git a/source/gnome-extra/gbrainy/FrugalBuild b/source/gnome-extra/gbrainy/FrugalBuild index 67b6c37..9f5cbe0 100644 --- a/source/gnome-extra/gbrainy/FrugalBuild +++ b/source/gnome-extra/gbrainy/FrugalBuild @@ -1,11 +1,11 @@ -# Compiling Time: 0.06 SBU +# Compiling Time: 0.08 SBU # Maintainer: Devil505 pkgname=gbrainy -pkgver=0.61 -pkgrel=2 +pkgver=0.70 +pkgrel=1 pkgdesc="brain teaser game and trainer" -url="http://live.gnome.org/gbrainy" +url="http://live.gnome.org/$pkgname" depends=('mono>=1.1.7' 'gtk2-sharp>=2.8' 'libgnome>=2.2' 'cairo>=1.2' 'gnome-sharp') makedepends=('perl-xml-parser') options=('scriptlet') @@ -15,14 +15,15 @@ _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome-scriptlet groups=('gnome-extra') -up2date="lynx -dump http://www.softcatala.org/~jmas/gbrainy/ | Flasttar" +up2date="lynx -dump http://www.softcatala.org/~jmas/$pkgname/ | Flasttar" source=(http://www.softcatala.org/~jmas/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('34d12ee34c5e155c7b39c78ff9984e4f93c39898') +sha1sums=('fdfe824d0d8c0ebdfb432de12d64b43a0b2af60e') build() { Fcd Fmonoexport Fbuild + Fbuild_gnome_scriptlet Fmonocleanup } From bouleetbil at frogdev.info Mon Jun 2 23:43:18 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jun 2 23:43:20 2008 Subject: [Frugalware-git] frugalware-current: nautilus-2.22.3-1-i686 Message-ID: <20080602214318.6980F1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=825018040d6011f9fc0f17ac0f0aad360b3a92e0 commit 825018040d6011f9fc0f17ac0f0aad360b3a92e0 Author: bouleetbil Date: Mon Jun 2 23:36:50 2008 +0200 nautilus-2.22.3-1-i686 *version bump diff --git a/source/gnome/nautilus/FrugalBuild b/source/gnome/nautilus/FrugalBuild index 1f97513..da1e47e 100644 --- a/source/gnome/nautilus/FrugalBuild +++ b/source/gnome/nautilus/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix pkgname=nautilus -pkgver=2.22.2 -pkgrel=2 +pkgver=2.22.3 +pkgrel=1 pkgdesc="A file manager for GNOME" url="http://www.gnome.org/" -depends=('eel>=2.22.0' 'librsvg>=2.22.2' 'libexif' 'eject' 'desktop-file-utils' 'libgnome>=2.22.0' 'gnome-vfs>=2.22.0' \ +depends=('eel>=2.22.1' 'librsvg>=2.22.2' 'libexif' 'eject' 'desktop-file-utils' 'libgnome>=2.22.0' 'gnome-vfs>=2.22.0' \ 'exempi' 'gvfs') # Seems exempi needs as depend! makedepends=('intltool') @@ -20,6 +20,7 @@ Finclude gnome gnome-scriptlet source=(${source[@]} $pkgname-2.16.0-frugalware_defaults.patch) Fconfopts="$Fconfopts --disable-tracker --disable-beagle" -sha1sums=('fe20dfbfbd21e06dcb4fbb471cdb957c2d96f5cf' \ +sha1sums=('cc14a5201fe7357913a2a30c1c96aedc248a51b2' \ 'f328b08f6c92e2d2c5efb28fc6999d8f7ea60c5a') + # optimization OK From ryuo at frugalware.org Tue Jun 3 01:07:44 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 3 01:07:46 2008 Subject: [Frugalware-git] frugalware-current: bmpanel-0.9.20-1-i686 Message-ID: <20080602230744.5581A1190A45@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=47eb497b041dc340598eb85acca121a428045c32 commit 47eb497b041dc340598eb85acca121a428045c32 Author: James Buren Date: Mon Jun 2 18:02:44 2008 -0500 bmpanel-0.9.20-1-i686 * version bump diff --git a/source/x11-extra/bmpanel/FrugalBuild b/source/x11-extra/bmpanel/FrugalBuild index 6848c7c..a3a255f 100644 --- a/source/x11-extra/bmpanel/FrugalBuild +++ b/source/x11-extra/bmpanel/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: James Buren pkgname=bmpanel -pkgver=0.9.19 +pkgver=0.9.20 pkgrel=1 pkgdesc="A themeable reincarnation of fspanel" url="http://nsf.110mb.com/bmpanel/" @@ -12,7 +12,7 @@ groups=('x11-extra') archs=('i686') up2date="Flasttar $url" source=($url/$pkgname-$pkgver.tar.gz) -sha1sums=('1e9aeb899ca568046728d4b44d014097bcb0f2ac') +sha1sums=('6f51a4b0b5c2c3909823d228631c23c90243868f') build() { From ryuo at frugalware.org Tue Jun 3 01:39:08 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 3 01:39:10 2008 Subject: [Frugalware-git] frugalware-current: windowmaker-0.92.0-4-i686 Message-ID: <20080602233908.234E01778050@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=57fd01dfd92b4dfe236f9ed57e7dda9c41d15584 commit 57fd01dfd92b4dfe236f9ed57e7dda9c41d15584 Author: James Buren Date: Mon Jun 2 18:35:31 2008 -0500 windowmaker-0.92.0-4-i686 * moved to x11-extra * updated depends * converted return to Fdie * updated SBU * taking over from vmiklos diff --git a/source/x11-extra/windowmaker/FrugalBuild b/source/x11-extra/windowmaker/FrugalBuild new file mode 100644 index 0000000..445d4e6 --- /dev/null +++ b/source/x11-extra/windowmaker/FrugalBuild @@ -0,0 +1,51 @@ +# Compiling Time: 0.42 SBU +# Maintainer: James Buren + +pkgname=windowmaker +_F_archive_name=WindowMaker +pkgver=0.92.0 +pkgrel=4 +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 krnyezethez hasonl X11 ablakkezel.') +url="http://www.windowmaker.info/" +depends=('libxinerama' 'libxft' 'libxcb' 'libtiff' 'libxpm' 'libpng' 'libjpeg' 'libungif') +groups=('x11-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump http://windowmaker.info/pub/source/release/ | Flasttar" +source=(ftp://ftp.windowmaker.info/pub/source/release/$_F_archive_name-$pkgver.tar.bz2 xinitrc.$pkgname $pkgname.desktop \ + windowmaker-0.92.0-x86_64-fix.patch $pkgname.sh) +sha1sums=('4f7fea6f40b9ba9f870d2e2f0ce46274750edb2c' \ + '62d8e1d684057c4f40e6dc829380bd77a3b0dc6f' \ + '34613e910f7c3423b4e0bf759c6df14f6accc891' \ + 'ef66129f28c0d1b330011417f3386b19ff6646cc' \ + 'b603affdaaa7aef71c3f053590016b8c283281b5') + +build() +{ + Fcd + [ "$CARCH" == "x86_64" ] && Fpatchall + [ "$CARCH" == "x86_64" ] && Fautoconfize + source $Fsrcdir/$pkgname.sh || Fdie + export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" + Fconf --sysconfdir=/etc/X11 \ + --with-appspath=/usr/lib/GNUstep/Applications --enable-xinerama \ + --enable-usermenu --with-pixmapdir=/usr/share/pixmaps \ + --with-nlsdir=/usr/share/locale + Fsed '#define ASM_X86_MMX 1' '#undef ASM_X86_MMX' src/config.h + for file in WindowMaker/*menu*; do + if [ -r $file ]; then + Fsed "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs" "/usr/bin/WPrefs" $file + fi + done + make || Fdie + Fmakeinstall + Fln /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs /usr/bin/WPrefs + Fmkdir /etc/X11/{sessions,xinit} + Ffile /etc/X11/sessions/$pkgname.desktop + Fexe /etc/X11/xinit/xinitrc.$pkgname + Fexe /etc/profile.d/$pkgname.sh +} + + + +# optimization OK diff --git a/source/x11-extra/windowmaker/windowmaker-0.92.0-x86_64-fix.patch b/source/x11-extra/windowmaker/windowmaker-0.92.0-x86_64-fix.patch new file mode 100644 index 0000000..48107d1 --- /dev/null +++ b/source/x11-extra/windowmaker/windowmaker-0.92.0-x86_64-fix.patch @@ -0,0 +1,31 @@ +diff -Naur WindowMaker-0.92.0.orig/configure.ac WindowMaker-0.92.0/configure.ac +--- WindowMaker-0.92.0.orig/configure.ac 2005-07-04 14:23:20.000000000 +0200 ++++ WindowMaker-0.92.0/configure.ac 2005-07-04 14:27:21.000000000 +0200 +@@ -194,7 +194,19 @@ + + # gcc-3.3 or newer complains about some of our stuff without this + NOSTRICTALIASING="-fno-strict-aliasing" ++ ++ x86=0 ++ changequote(,)dnl ++ case "$host_cpu" in ++ i[3456]86) x86=1 ++ ;; ++ esac ++ changequote([,])dnl ++ if test "$host_os" != "linux" -a "$host_os" != "linux-gnu" ; then ++ x86=0 ++ fi + ++ if test $x86 = 1 ; then + AC_CACHE_CHECK(whether gcc supports x86 inline asm, + ac_cv_c_inline_asm, + [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n":: +@@ -218,6 +230,7 @@ + mmx_support=yes + fi + fi ++ fi + fi + AC_SUBST(NOSTRICTALIASING) + diff --git a/source/x11-extra/windowmaker/windowmaker.desktop b/source/x11-extra/windowmaker/windowmaker.desktop new file mode 100644 index 0000000..71c7629 --- /dev/null +++ b/source/x11-extra/windowmaker/windowmaker.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=WindowMaker +Comment=An X11 window manager originally designed to provide integration support for the GNUstep Desktop Environment. +Exec=wmaker +Icon= +Type=Application + diff --git a/source/x11-extra/windowmaker/windowmaker.sh b/source/x11-extra/windowmaker/windowmaker.sh new file mode 100644 index 0000000..9603fcb --- /dev/null +++ b/source/x11-extra/windowmaker/windowmaker.sh @@ -0,0 +1 @@ +export GNUSTEP_LOCAL_ROOT=/usr/lib/GNUstep diff --git a/source/x11-extra/windowmaker/xinitrc.windowmaker b/source/x11-extra/windowmaker/xinitrc.windowmaker new file mode 100644 index 0000000..edfe29f --- /dev/null +++ b/source/x11-extra/windowmaker/xinitrc.windowmaker @@ -0,0 +1,29 @@ +#!/bin/sh +# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/usr/X11R6/lib/X11/xinit/.Xresources +sysmodmap=/usr/X11R6/lib/X11/xinit/.Xmodmap + +# merge in defaults and keymaps + +if [ -f $sysresources ]; then + xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f $userresources ]; then + xrdb -merge $userresources +fi + +if [ -f $usermodmap ]; then + xmodmap $usermodmap +fi + +# start some nice programs + +wmaker From ryuo at frugalware.org Tue Jun 3 03:19:25 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 3 03:19:28 2008 Subject: [Frugalware-git] frugalware-current: termit-1.3.1-1-i686 Message-ID: <20080603011925.DAD9C1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7191422b04d56b96faeb9df6093720d38ac2fca4 commit 7191422b04d56b96faeb9df6093720d38ac2fca4 Author: James Buren Date: Mon Jun 2 20:15:45 2008 -0500 termit-1.3.1-1-i686 * (new package) - a vte based terminal diff --git a/source/xapps-extra/termit/FrugalBuild b/source/xapps-extra/termit/FrugalBuild new file mode 100644 index 0000000..c6a3d23 --- /dev/null +++ b/source/xapps-extra/termit/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=termit +pkgver=1.3.1 +pkgrel=1 +pkgdesc="A terminal emulator based on the vte library." +url="http://code.google.com/p/termit/wiki/TermIt" +depends=('libxau' 'libxdmcp' 'vte' 'libxft' 'libxdamage' 'libxml2' 'libice' 'ncurses') +groups=('xapps-extra') +archs=('i686') +up2date="Flasttar $url" +source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2) +Finclude cmake +sha1sums=('ec6dd7c71ec642ae90fdf107c191599734ec5e86') + +# optimization OK From ryuo at frugalware.org Tue Jun 3 03:34:23 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 3 03:34:24 2008 Subject: [Frugalware-git] frugalware-current: windowmaker-0.92.0-4-i686 Message-ID: <20080603013423.750421190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=42cda3f734a3df1c22726539acc6d346b6b2a1df commit 42cda3f734a3df1c22726539acc6d346b6b2a1df Author: James Buren Date: Mon Jun 2 20:32:26 2008 -0500 windowmaker-0.92.0-4-i686 * clean up, forgot to delete this during my last commit diff --git a/source/xlib/windowmaker/FrugalBuild b/source/xlib/windowmaker/FrugalBuild deleted file mode 100644 index fd9f637..0000000 --- a/source/xlib/windowmaker/FrugalBuild +++ /dev/null @@ -1,51 +0,0 @@ -# Compiling Time: 0.24 SBU -# Maintainer: VMiklos - -pkgname=windowmaker -_F_archive_name=WindowMaker -pkgver=0.92.0 -pkgrel=3 -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 krnyezethez hasonl X11 ablakkezel.') -url="http://www.windowmaker.info/" -depends=('libtiff' 'libjpeg' 'libungif') -groups=('xlib') -archs=('i686' 'x86_64') -up2date="lynx -dump http://windowmaker.info/pub/source/release/ | Flasttar" -source=(ftp://ftp.windowmaker.info/pub/source/release/$_F_archive_name-$pkgver.tar.bz2 xinitrc.$pkgname $pkgname.desktop \ - windowmaker-0.92.0-x86_64-fix.patch $pkgname.sh) -sha1sums=('4f7fea6f40b9ba9f870d2e2f0ce46274750edb2c' \ - '62d8e1d684057c4f40e6dc829380bd77a3b0dc6f' \ - '34613e910f7c3423b4e0bf759c6df14f6accc891' \ - 'ef66129f28c0d1b330011417f3386b19ff6646cc' \ - 'b603affdaaa7aef71c3f053590016b8c283281b5') - -build() -{ - Fcd - [ "$CARCH" == "x86_64" ] && Fpatchall - [ "$CARCH" == "x86_64" ] && Fautoconfize - source $Fsrcdir/$pkgname.sh || return 1 - export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" - Fconf --sysconfdir=/etc/X11 \ - --with-appspath=/usr/lib/GNUstep/Applications --enable-xinerama \ - --enable-usermenu --with-pixmapdir=/usr/share/pixmaps \ - --with-nlsdir=/usr/share/locale - Fsed '#define ASM_X86_MMX 1' '#undef ASM_X86_MMX' src/config.h - for file in WindowMaker/*menu*; do - if [ -r $file ]; then - Fsed "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs" "/usr/bin/WPrefs" $file - fi - done - make || return 1 - Fmakeinstall - Fln /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs /usr/bin/WPrefs - Fmkdir /etc/X11/{sessions,xinit} - Ffile /etc/X11/sessions/$pkgname.desktop - Fexe /etc/X11/xinit/xinitrc.$pkgname - Fexe /etc/profile.d/$pkgname.sh -} - - - -# optimization OK diff --git a/source/xlib/windowmaker/windowmaker-0.92.0-x86_64-fix.patch b/source/xlib/windowmaker/windowmaker-0.92.0-x86_64-fix.patch deleted file mode 100644 index 48107d1..0000000 --- a/source/xlib/windowmaker/windowmaker-0.92.0-x86_64-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Naur WindowMaker-0.92.0.orig/configure.ac WindowMaker-0.92.0/configure.ac ---- WindowMaker-0.92.0.orig/configure.ac 2005-07-04 14:23:20.000000000 +0200 -+++ WindowMaker-0.92.0/configure.ac 2005-07-04 14:27:21.000000000 +0200 -@@ -194,7 +194,19 @@ - - # gcc-3.3 or newer complains about some of our stuff without this - NOSTRICTALIASING="-fno-strict-aliasing" -+ -+ x86=0 -+ changequote(,)dnl -+ case "$host_cpu" in -+ i[3456]86) x86=1 -+ ;; -+ esac -+ changequote([,])dnl -+ if test "$host_os" != "linux" -a "$host_os" != "linux-gnu" ; then -+ x86=0 -+ fi - -+ if test $x86 = 1 ; then - AC_CACHE_CHECK(whether gcc supports x86 inline asm, - ac_cv_c_inline_asm, - [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n":: -@@ -218,6 +230,7 @@ - mmx_support=yes - fi - fi -+ fi - fi - AC_SUBST(NOSTRICTALIASING) - diff --git a/source/xlib/windowmaker/windowmaker.desktop b/source/xlib/windowmaker/windowmaker.desktop deleted file mode 100644 index 71c7629..0000000 --- a/source/xlib/windowmaker/windowmaker.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=WindowMaker -Comment=An X11 window manager originally designed to provide integration support for the GNUstep Desktop Environment. -Exec=wmaker -Icon= -Type=Application - diff --git a/source/xlib/windowmaker/windowmaker.sh b/source/xlib/windowmaker/windowmaker.sh deleted file mode 100644 index 9603fcb..0000000 --- a/source/xlib/windowmaker/windowmaker.sh +++ /dev/null @@ -1 +0,0 @@ -export GNUSTEP_LOCAL_ROOT=/usr/lib/GNUstep diff --git a/source/xlib/windowmaker/xinitrc.windowmaker b/source/xlib/windowmaker/xinitrc.windowmaker deleted file mode 100644 index edfe29f..0000000 --- a/source/xlib/windowmaker/xinitrc.windowmaker +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=/usr/X11R6/lib/X11/xinit/.Xresources -sysmodmap=/usr/X11R6/lib/X11/xinit/.Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f $userresources ]; then - xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - xmodmap $usermodmap -fi - -# start some nice programs - -wmaker From boobaa at frugalware.org Tue Jun 3 08:27:54 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Tue Jun 3 08:27:57 2008 Subject: [Frugalware-git] frugalware-current: nmap-4.65-1-i686 Message-ID: <20080603062754.EB9AA1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=79bcc0ef8f52da3957afd7f5fb301d3baa6183ea commit 79bcc0ef8f52da3957afd7f5fb301d3baa6183ea Author: CSCSY Lszl Date: Tue Jun 3 08:27:31 2008 +0200 nmap-4.65-1-i686 version bump diff --git a/source/network/nmap/FrugalBuild b/source/network/nmap/FrugalBuild index 2618b3c..6696f0d 100644 --- a/source/network/nmap/FrugalBuild +++ b/source/network/nmap/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CSCSY Lszl pkgname=nmap -pkgver=4.62 +pkgver=4.65 pkgrel=1 pkgdesc="A network exploration tool and security scanner" url="http://www.nmap.org" @@ -13,7 +13,7 @@ options=('scriptlet') archs=('i686' 'x86_64') up2date="lynx -dump 'http://download.insecure.org/nmap/dist/?M=D'|grep 'nmap-[0-9\.]*tgz$'|sed -n 's/.*-\(.*\)\.tgz/\1/;$ p'" source=(http://download.insecure.org/$pkgname/dist/$pkgname-$pkgver.tar.bz2 nmap-logo-64.png) -sha1sums=('8e789f7620b94aa00140aec933fdfead6225cda3' \ +sha1sums=('e40e794ca8330f377019edba8786b0d911f8ab9e' \ 'c36250c662ee9058974a2215c579c3f45ddaf2d0') subpkgs=('nmapfe') From boobaa at frugalware.org Tue Jun 3 08:33:46 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Tue Jun 3 08:33:48 2008 Subject: [Frugalware-git] frugalware-current: iso-codes-3.0-1-i686 Message-ID: <20080603063346.9918C1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=475e472edf2bd7fb546805dd3a8cf895c7276a22 commit 475e472edf2bd7fb546805dd3a8cf895c7276a22 Author: CSCSY Lszl Date: Tue Jun 3 08:33:27 2008 +0200 iso-codes-3.0-1-i686 version bump diff --git a/source/devel/iso-codes/FrugalBuild b/source/devel/iso-codes/FrugalBuild index 62f43fe..af1845a 100644 --- a/source/devel/iso-codes/FrugalBuild +++ b/source/devel/iso-codes/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: CSCSY Lszl pkgname=iso-codes -pkgver=2.1 +pkgver=3.0 pkgrel=1 debrel=1 pkgdesc="Provides the list of country and language names" @@ -17,5 +17,5 @@ source=(ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/$pkgname-$pkgver.t iso-codes-0.52-pkgconfig-fixes.patch) # optimization OK -sha1sums=('64c3a045f04fa0f031b6c95096226588ca7352fa' \ +sha1sums=('5c1d03fd0fac9e4f1dd1b2f308cdaca624a536d8' \ '44841e6019eea610bdba5ddfe52b8c393ba878ca') From boobaa at frugalware.org Tue Jun 3 08:41:52 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Tue Jun 3 08:41:54 2008 Subject: [Frugalware-git] frugalware-current: perl-glib-1.183-1-i686 Message-ID: <20080603064152.E5A241190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3bd86fb7c18dc01d9fcb83edf0a0e8464a9314a3 commit 3bd86fb7c18dc01d9fcb83edf0a0e8464a9314a3 Author: CSCSY Lszl Date: Tue Jun 3 08:41:43 2008 +0200 perl-glib-1.183-1-i686 version bump diff --git a/source/devel-extra/perl-glib/FrugalBuild b/source/devel-extra/perl-glib/FrugalBuild index 23bf06a..0f8b4ed 100644 --- a/source/devel-extra/perl-glib/FrugalBuild +++ b/source/devel-extra/perl-glib/FrugalBuild @@ -4,10 +4,10 @@ _F_perl_name=Glib _F_perl_author=T/TS/TSCH -pkgver=1.182 +pkgver=1.183 pkgdesc="Perl wrappers for the GLib utility and Object libraries" depends=('perl>=5.10.0-2' 'glib2') makedepends=('perl-extutils-depends>=0.300' 'perl-extutils-pkgconfig>=1.08') Finclude perl archs=('i686' 'x86_64') -sha1sums=('2eb77871038347291f387cbba535f4a845122ef1') +sha1sums=('c0cbe4212db75bb33d174a9499d39c3f0dad0559') From boobaa at frugalware.org Tue Jun 3 08:50:39 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Tue Jun 3 08:50:41 2008 Subject: [Frugalware-git] frugalware-current: perl-gtk2-1.183-1-i686 Message-ID: <20080603065039.97A7C1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1799775514034f8be1d822c622ac800f293622da commit 1799775514034f8be1d822c622ac800f293622da Author: CSCSY Lszl Date: Tue Jun 3 08:50:18 2008 +0200 perl-gtk2-1.183-1-i686 version bump diff --git a/source/xlib-extra/perl-gtk2/FrugalBuild b/source/xlib-extra/perl-gtk2/FrugalBuild index 537a81e..9e39fc9 100644 --- a/source/xlib-extra/perl-gtk2/FrugalBuild +++ b/source/xlib-extra/perl-gtk2/FrugalBuild @@ -5,15 +5,15 @@ pkgname=perl-gtk2 _F_perl_name=Gtk2 _F_perl_author=T/TS/TSCH -pkgver=1.182 +pkgver=1.183 pkgdesc="Perl interface to the 2.x series of the Gimp Toolkit library" -depends=('gtk+2>=2.10.3' 'perl-glib>=1.180' 'perl-cairo>=1.045-2') +depends=('gtk+2>=2.10.3' 'perl-glib>=1.183' 'perl-cairo>=1.045-2') makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig') Finclude perl pkgrel=1 groups=('xlib-extra') archs=('i686' 'x86_64') options=('scriptlet') -sha1sums=('9fd673886a11a6fe50dc51faefefe2ee66e7f1cb') +sha1sums=('f2d9293b7f59afa47692d43e9567783b82a81563') # optimization OK From devil505linux at gmail.com Tue Jun 3 09:14:27 2008 From: devil505linux at gmail.com (Devil505) Date: Tue Jun 3 09:14:30 2008 Subject: [Frugalware-git] frugalware-current: python-clientform-0.2.7-1-i686 Message-ID: <20080603071427.E27551190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e5c874c16ab07cc6af517fdd792930c737ad3054 commit e5c874c16ab07cc6af517fdd792930c737ad3054 Author: Devil505 Date: Tue Jun 3 09:12:29 2008 +0200 python-clientform-0.2.7-1-i686 * new package diff --git a/source/devel-extra/python-clientform/FrugalBuild b/source/devel-extra/python-clientform/FrugalBuild new file mode 100644 index 0000000..1f196e0 --- /dev/null +++ b/source/devel-extra/python-clientform/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.05 SBU +# Maintainer: Devil505 + +pkgname=python-clientform +pkgver=0.2.7 +pkgrel=1 +pkgdesc="Parse, fill out, and return HTML forms on the client side." +url="http://wwwsearch.sourceforge.net/ClientForm" +depends=('python') +makedepends=('setuptools') +groups=('devel-extra') +archs=('i686') +_F_archive_name="ClientForm" +up2date="lynx -dump $url | Flasttar" +source=($url/src/$_F_archive_name-$pkgver.tar.gz) +sha1sums=('1b3328ec0907d2a7be930492bac4c14b3f1d4a80') From devil505linux at gmail.com Tue Jun 3 09:26:00 2008 From: devil505linux at gmail.com (Devil505) Date: Tue Jun 3 09:26:02 2008 Subject: [Frugalware-git] frugalware-current: python-mechanize-0.1.7b-1-i686 Message-ID: <20080603072600.51A1A1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bbbdbe17a4ef6ea0c4271ff5f75ab19a3d621195 commit bbbdbe17a4ef6ea0c4271ff5f75ab19a3d621195 Author: Devil505 Date: Tue Jun 3 09:17:06 2008 +0200 python-mechanize-0.1.7b-1-i686 * new package diff --git a/source/devel-extra/python-mechanize/FrugalBuild b/source/devel-extra/python-mechanize/FrugalBuild new file mode 100644 index 0000000..4688122 --- /dev/null +++ b/source/devel-extra/python-mechanize/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.05 SBU +# Maintainer: Devil505 + +pkgname=python-mechanize +pkgver=0.1.7b +pkgrel=1 +pkgdesc="Stateful programmatic web browsing in Python." +url="http://wwwsearch.sourceforge.net/$pkgname" +depends=('python-clientform') +makedepends=('setuptools') +groups=('devel-extra') +archs=('i686') +up2date="lynx -dump $url | Flasttar" +source=($url/src/$pkgname-$pkgver.tar.gz) +sha1sums=('10bd41a31cb90630a69013a626bd47d43b09d6c8') From devil505linux at gmail.com Tue Jun 3 09:26:00 2008 From: devil505linux at gmail.com (Devil505) Date: Tue Jun 3 09:26:03 2008 Subject: [Frugalware-git] frugalware-current: python-mechanize-0.1.7b-1-i686 Message-ID: <20080603072600.6BB3B1190ACA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=96386d964aaf978f3f91542462f76a26492b1fcf commit 96386d964aaf978f3f91542462f76a26492b1fcf Author: Devil505 Date: Tue Jun 3 09:20:01 2008 +0200 python-mechanize-0.1.7b-1-i686 * fixed url diff --git a/source/devel-extra/python-mechanize/FrugalBuild b/source/devel-extra/python-mechanize/FrugalBuild index 4688122..4fc6df0 100644 --- a/source/devel-extra/python-mechanize/FrugalBuild +++ b/source/devel-extra/python-mechanize/FrugalBuild @@ -5,7 +5,7 @@ pkgname=python-mechanize pkgver=0.1.7b pkgrel=1 pkgdesc="Stateful programmatic web browsing in Python." -url="http://wwwsearch.sourceforge.net/$pkgname" +url="http://wwwsearch.sourceforge.net/mechanize" depends=('python-clientform') makedepends=('setuptools') groups=('devel-extra') From devil505linux at gmail.com Tue Jun 3 09:26:00 2008 From: devil505linux at gmail.com (Devil505) Date: Tue Jun 3 09:26:03 2008 Subject: [Frugalware-git] frugalware-current: python-mechanize-0.1.7b-1-i686 Message-ID: <20080603072600.770661190ACB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=094d52b2aababc02390c7369d2d502e7e4ef7f81 commit 094d52b2aababc02390c7369d2d502e7e4ef7f81 Author: Devil505 Date: Tue Jun 3 09:24:46 2008 +0200 python-mechanize-0.1.7b-1-i686 * improved FB by using _F_archive_name diff --git a/source/devel-extra/python-mechanize/FrugalBuild b/source/devel-extra/python-mechanize/FrugalBuild index 4fc6df0..5e733a3 100644 --- a/source/devel-extra/python-mechanize/FrugalBuild +++ b/source/devel-extra/python-mechanize/FrugalBuild @@ -4,12 +4,13 @@ pkgname=python-mechanize pkgver=0.1.7b pkgrel=1 +_F_archive_name="mechanize" pkgdesc="Stateful programmatic web browsing in Python." -url="http://wwwsearch.sourceforge.net/mechanize" +url="http://wwwsearch.sourceforge.net/$_F_archive_name" depends=('python-clientform') makedepends=('setuptools') groups=('devel-extra') archs=('i686') up2date="lynx -dump $url | Flasttar" -source=($url/src/$pkgname-$pkgver.tar.gz) +source=($url/src/$_F_archive_name-$pkgver.tar.gz) sha1sums=('10bd41a31cb90630a69013a626bd47d43b09d6c8') From voroskoi at frugalware.org Tue Jun 3 09:48:30 2008 From: voroskoi at frugalware.org (voroskoi) Date: Tue Jun 3 09:48:31 2008 Subject: [Frugalware-git] frugalware-current: wmii-3.6-3-x86_64 Message-ID: <20080603074830.31A8F1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1a28b428cc77a090ef4c39dc98362456f437ea6b commit 1a28b428cc77a090ef4c39dc98362456f437ea6b Author: voroskoi Date: Tue Jun 3 09:46:51 2008 +0200 wmii-3.6-3-x86_64 put config files under /etc closes #3128 diff --git a/source/x11-extra/wmii/FrugalBuild b/source/x11-extra/wmii/FrugalBuild index f836462..d112e29 100644 --- a/source/x11-extra/wmii/FrugalBuild +++ b/source/x11-extra/wmii/FrugalBuild @@ -3,7 +3,7 @@ pkgname=wmii pkgver=3.6 -pkgrel=2 +pkgrel=3 pkgdesc="Window Manager Improved is a lightweight window manager, which attempts to combine the best features of LarsWM, Ion, evilwm, and ratpoison." url="http://wmii.suckless.org/" makedepends=('libxt') @@ -16,7 +16,7 @@ source=(http://suckless.org/download/wmii-$pkgver.tar.gz xinitrc.$pkgname $pkgna sha1sums=('48e24f84f60b9c6ce37f715a46bc32e35d2086f3' \ 'da124e7b1689cfc5b62af14b41bab778a90e4381' \ 'bcbe4a43e60e2aebcdf86ddf57125a84dde78337' \ - 'd9cc9966fe270256f6fe4f36aaed4bdb32fff7f9') + '8248ee7d60bff8e49e2f56a82064de9348994a4b') build() { Fpatchall diff --git a/source/x11-extra/wmii/destdir.diff b/source/x11-extra/wmii/destdir.diff index 58999e4..1f4808c 100644 --- a/source/x11-extra/wmii/destdir.diff +++ b/source/x11-extra/wmii/destdir.diff @@ -14,7 +14,7 @@ diff -aur wmii-3.6/config.mk fw_wmii-3.6/config.mk +PREFIX = /usr +BIN = ${DESTDIR}/${PREFIX}/bin +MAN = ${DESTDIR}/${PREFIX}/share/man -+ETC = ${DESTDIR}/${PREFIX}/etc ++ETC = ${DESTDIR}/etc +LIBDIR = ${DESTDIR}/${PREFIX}/lib +INCLUDE = ${DESTDIR}/${PREFIX}/include From devil505linux at gmail.com Tue Jun 3 11:24:28 2008 From: devil505linux at gmail.com (Devil505) Date: Tue Jun 3 11:24:29 2008 Subject: [Frugalware-git] frugalware-current: gnome-mplayer-0.6.2-1-i686 Message-ID: <20080603092428.F09B41190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c2c303aeb8264b628cec4c52b89a260389c45d60 commit c2c303aeb8264b628cec4c52b89a260389c45d60 Author: Devil505 Date: Tue Jun 3 11:24:03 2008 +0200 gnome-mplayer-0.6.2-1-i686 * version bump * now using Finclude googlecode * fixed depends diff --git a/source/gnome-extra/gnome-mplayer/FrugalBuild b/source/gnome-extra/gnome-mplayer/FrugalBuild index 35e6afa..25546b6 100644 --- a/source/gnome-extra/gnome-mplayer/FrugalBuild +++ b/source/gnome-extra/gnome-mplayer/FrugalBuild @@ -3,19 +3,19 @@ # Contributor: detto pkgname=gnome-mplayer -pkgver=0.6.0 +pkgver=0.6.2 pkgrel=1 pkgdesc="A media player for GNOME that uses MPlayer." url="http://dekorte.homeip.net/download/gnome-mplayer" archs=('i686' 'x86_64') groups=('gnome-extra') options=('scriptlet') -depends=('libgnomeui' 'mplayer') -up2date="lynx -dump http://dekorte.homeip.net/download/download.php#gnome-mplayer | grep $pkgname | grep -m1 tar.gz | Flasttar" -source=($url/$pkgname-$pkgver.tar.gz) +depends=('atk' 'pango' 'freetype2' 'libxau' 'libxdmcp' 'dbus-glib' 'glibc' 'gconf' 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' 'libxcursor' 'mplayer') +Finclude googlecode _F_gnome_schemas=('/etc/gconf/schemas/gnome-mplayer.schemas') +_F_gnome_desktop="y" Finclude gnome-scriptlet -sha1sums=('48ddf50d02f956a0b6258973897ab66861ca9285') +sha1sums=('fb3498dc6619f1d0de885b1d6a5ee0f9007218a4') build () { From ryuo at frugalware.org Tue Jun 3 12:33:46 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 3 12:33:48 2008 Subject: [Frugalware-git] frugalware-current: uips-1.0-1-i686 Message-ID: <20080603103346.E53C61190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b22edebcb93231e951055c9cf5331f1e02b3b171 commit b22edebcb93231e951055c9cf5331f1e02b3b171 Author: James Buren Date: Tue Jun 3 05:29:47 2008 -0500 uips-1.0-1-i686 * (new package) - a command line utility for messing with IPS patches diff --git a/source/apps-extra/uips/FrugalBuild b/source/apps-extra/uips/FrugalBuild new file mode 100644 index 0000000..362a4ad --- /dev/null +++ b/source/apps-extra/uips/FrugalBuild @@ -0,0 +1,25 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=uips +pkgver=1.0 +pkgrel=1 +pkgdesc="A command-line based utility for creating and applying IPS patches." +url="http://www.neillcorlett.com/uips/" +depends=('glibc') +groups=('apps-extra') +archs=('i686') +# there is no package version, since there is only one release for this, ever. +up2date="echo $pkgver" +source=(http://www.neillcorlett.com/downloads/$pkgname.c \ + http://www.neillcorlett.com/downloads/$pkgname.txt) +sha1sums=('ef0acd30549d815a997cf1a7501c072e061fc79a' \ + '15219af5719d75747911c6fe2a60be08a44bf672') + +build() +{ + gcc $CFLAGS $pkgname.c -o $pkgname || Fdie + Fexerel /usr/bin/$pkgname + Fdocrel $pkgname.txt +} + From vmiklos at frugalware.org Tue Jun 3 13:27:46 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 13:27:47 2008 Subject: [Frugalware-git] pacman-tools: repoman: typo fix in server clean Message-ID: <20080603112746.644DF1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=4fa47f875c261e6fb1a43a7dc5fc2cf86d9106bf commit 4fa47f875c261e6fb1a43a7dc5fc2cf86d9106bf Author: Miklos Vajna Date: Tue Jun 3 13:27:41 2008 +0200 repoman: typo fix in server clean diff --git a/repoman b/repoman index 8570625..a555586 100755 --- a/repoman +++ b/repoman @@ -234,7 +234,7 @@ server() else touch .git/lock fi - for i in frugalware-* + for i in $i do cd frugalware-$arch if ! _check_nobuild; then From vmiklos at frugalware.org Tue Jun 3 13:43:44 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 13:43:46 2008 Subject: [Frugalware-git] frugalware-current: autoconf-archive-2008_06_03-1-i686 Message-ID: <20080603114344.E66C11190ACB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e796f576ae69f4d01f240b8ec96ade7c88016a14 commit e796f576ae69f4d01f240b8ec96ade7c88016a14 Author: Miklos Vajna Date: Tue Jun 3 13:34:01 2008 +0200 autoconf-archive-2008_06_03-1-i686 - version bump diff --git a/source/devel-extra/autoconf-archive/FrugalBuild b/source/devel-extra/autoconf-archive/FrugalBuild index 09cf39d..8d81ead 100644 --- a/source/devel-extra/autoconf-archive/FrugalBuild +++ b/source/devel-extra/autoconf-archive/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=autoconf-archive -pkgver=2008_05_16 +pkgver=2008_06_03 pkgrel=1 pkgdesc="Aims to provide a collection of reusable Autoconf macros." url="http://autoconf-archive.cryp.to/" @@ -11,5 +11,5 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep tar.bz2$|sed 's/.*archive-\(.*\).t.*/\1/;s/-/_/g;q'" source=(http://autoconf-archive.cryp.to/autoconf-archive-${pkgver//_/-}.tar.bz2) -sha1sums=('60624c6930ec87a3cd5a089d22095087b1687e21') +sha1sums=('2da52fb39503c6981229545358240d9153566f0b') _F_cd_path="autoconf-archive-${pkgver//_/-}" From vmiklos at frugalware.org Tue Jun 3 13:43:44 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 13:43:47 2008 Subject: [Frugalware-git] frugalware-current: pyro-3.7-1-i686 Message-ID: <20080603114344.F0BEF1190ACC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=29fb2fdf3c4ff7d212f752614c6a4293a3d08c3e commit 29fb2fdf3c4ff7d212f752614c6a4293a3d08c3e Author: Miklos Vajna Date: Tue Jun 3 13:39:00 2008 +0200 pyro-3.7-1-i686 - up2date fix diff --git a/source/devel-extra/pyro/FrugalBuild b/source/devel-extra/pyro/FrugalBuild index b6f1e76..4cb3711 100644 --- a/source/devel-extra/pyro/FrugalBuild +++ b/source/devel-extra/pyro/FrugalBuild @@ -10,6 +10,8 @@ depends=('python>=2.5') groups=('devel-extra') archs=('i686' 'x86_64') Finclude sourceforge python +# sourceforge.sh's up2date won't filter out betas +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=18837|grep [0-9].tar.gz$|sed 's/.*-\(.*\)\.t.*/\1/;q'" source=(${source/pyro-/Pyro-} \ setup.cfg \ README.Frugalware \ From vmiklos at frugalware.org Tue Jun 3 13:43:44 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 13:43:47 2008 Subject: [Frugalware-git] frugalware-current: tailor-0.9.35-1-i686 Message-ID: <20080603114344.C93231190ACA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=08b87214638292c5bf8bbecad905c9d96f658476 commit 08b87214638292c5bf8bbecad905c9d96f658476 Author: Miklos Vajna Date: Tue Jun 3 13:32:27 2008 +0200 tailor-0.9.35-1-i686 - version bump diff --git a/source/devel-extra/tailor/FrugalBuild b/source/devel-extra/tailor/FrugalBuild index 0827382..d6502d9 100644 --- a/source/devel-extra/tailor/FrugalBuild +++ b/source/devel-extra/tailor/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=tailor -pkgver=0.9.34 +pkgver=0.9.35 pkgrel=1 pkgdesc="Tailor is a tool to migrate changesets between various repository formats." url="http://progetti.arstecnica.it/tailor" @@ -11,4 +11,4 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="Flasttar http://darcs.arstecnica.it/" source=(http://darcs.arstecnica.it/tailor-$pkgver.tar.gz) -sha1sums=('a1d02afeec3a9510e4a5ffe95a2a2bae68d56414') +sha1sums=('442d1d11bf4ba5d54684f78783f94f753a02292e') From vmiklos at frugalware.org Tue Jun 3 13:43:45 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 13:43:47 2008 Subject: [Frugalware-git] frugalware-current: docbook2x-0.8.3-2-i686 Message-ID: <20080603114345.072531190ACE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e7a708371698ce58e3b34e3a8209d773ef6c1dfe commit e7a708371698ce58e3b34e3a8209d773ef6c1dfe Author: Miklos Vajna Date: Tue Jun 3 13:40:28 2008 +0200 docbook2x-0.8.3-2-i686 - up2date fix diff --git a/source/apps-extra/docbook2x/FrugalBuild b/source/apps-extra/docbook2x/FrugalBuild index 6cc70c4..c3cfea8 100644 --- a/source/apps-extra/docbook2x/FrugalBuild +++ b/source/apps-extra/docbook2x/FrugalBuild @@ -8,7 +8,9 @@ pkgdesc="Converts DocBook documents to man and Texinfo format." _F_sourceforge_dirname="$pkgname" _F_sourceforge_name="docbook2X" Finclude sourceforge -up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=7856|grep docbook2X-|sed 's/.*-\(.*\)\.t.*/\1/;q'" +# this pkg is mainly a makedepend for git, 0.8.8 does not work with git, +# so blacklist it for now. +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=7856|grep docbook2X-|sed 's/.*-\(.*\)\.t.*/\1/;s/0.8.8/0.8.3/;q'" depends=('perl-xml-writer' 'perl-xml-xslt' 'perl-sgmlspm' 'perl-xml-sax' 'libxslt') groups=('apps-extra') archs=('i686' 'x86_64') From vmiklos at frugalware.org Tue Jun 3 13:43:45 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 13:43:48 2008 Subject: [Frugalware-git] frugalware-current: hdparm-8.7-1-i686 Message-ID: <20080603114345.1119C1190ACF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=83669aa00688e3ad18cf87f74df3e9cc96de8d02 commit 83669aa00688e3ad18cf87f74df3e9cc96de8d02 Author: Miklos Vajna Date: Tue Jun 3 13:41:16 2008 +0200 hdparm-8.7-1-i686 - version bump diff --git a/source/apps/hdparm/FrugalBuild b/source/apps/hdparm/FrugalBuild index a8e4de1..41c98cb 100644 --- a/source/apps/hdparm/FrugalBuild +++ b/source/apps/hdparm/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: VMiklos pkgname=hdparm -pkgver=8.6 +pkgver=8.7 pkgrel=1 pkgdesc="Read/set hard drive parameters" depends=('glibc') groups=('apps') archs=('i686' 'x86_64' 'ppc') Finclude sourceforge -sha1sums=('eeb4888aad985731448cd1d1bc2110dbbea4a30f') +sha1sums=('d8dea10b55c4c7032b7f0866f516be26874bfcdc') # optimization OK From devil505linux at gmail.com Tue Jun 3 14:14:52 2008 From: devil505linux at gmail.com (Devil505) Date: Tue Jun 3 14:14:54 2008 Subject: [Frugalware-git] frugalware-current: vavoom-1.27.1-1-i686 Message-ID: <20080603121452.D8FC31190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=215398b302dafcfba720896db43be1aafb65610f commit 215398b302dafcfba720896db43be1aafb65610f Author: Devil505 Date: Tue Jun 3 14:06:57 2008 +0200 vavoom-1.27.1-1-i686 * new package from jedifox diff --git a/source/games-extra/vavoom/FrugalBuild b/source/games-extra/vavoom/FrugalBuild new file mode 100644 index 0000000..60fa434 --- /dev/null +++ b/source/games-extra/vavoom/FrugalBuild @@ -0,0 +1,33 @@ +# Compiling Time: 1.42 SBU +# Maintainer: Devil505 +# Contributor: jedifox + +pkgname=vavoom +pkgver=1.27.1 +pkgrel=1 +pkgdesc="Vavoom is Doom/Heretic/Hexen/Strife source port" +_F_sourceforge_broken_up2date="1" +_F_sourceforge_dirname="$pkgname" +Finclude sourceforge cmake +makedepends=('cmake') +depends=('libstdc++' 'flac' 'libmad' 'openal' 'sdl_mixer' 'libxext' 'libxdamage' 'libxau' 'libxdmcp' 'wxgtk' 'expat' 'libxml2' 'libice') +groups=(games-extra) +archs=('i686') +source=($source README.Frugalware) +sha1sums=('ebb1550015d4f8965e7b7216f8fd15cca3f951df' \ + 'bd055774c64b04814b6b7f2f90bf40f9e5b7b98a') + +_F_desktop_name="Vavoom" +_F_desktop_desc="Game Launcher for Doom/Heretic/Hexen/Strife" +_F_desktop_exec="vlaunch" +_F_desktop_categories="Game;" +_F_desktop_icon="/usr/share/$pkgname/$pkgname.png" + +build() +{ + Fcd + CMake_build + Fdesktop2 + Fdoc README.Frugalware +} +# optimization OK diff --git a/source/games-extra/vavoom/README.Frugalware b/source/games-extra/vavoom/README.Frugalware new file mode 100644 index 0000000..8fdfdeb --- /dev/null +++ b/source/games-extra/vavoom/README.Frugalware @@ -0,0 +1,6 @@ +=== Before you play + +To be able to play, you must have the IWAD files of the original games +and copy it in ~/.vavoom or in /usr/share/vavoom. You can find this IWAD +file on the original game CD or in the net. You can use shareware game's +IWAD, too. From vmiklos at frugalware.org Tue Jun 3 14:20:09 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 14:20:11 2008 Subject: [Frugalware-git] frugalware-current: kernel-2.6.25-5-i686 Message-ID: <20080603122009.E7E351190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a902e8aa8887ebf464272a6f56b2b176c2c5efde commit a902e8aa8887ebf464272a6f56b2b176c2c5efde Author: Miklos Vajna Date: Tue Jun 3 14:19:16 2008 +0200 kernel-2.6.25-5-i686 - up to 2.6.25.4 - closes #3123 diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index 21dca62..204ffdb 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -16,5 +16,5 @@ # * _F_kernelver_stable: the number of the -stable patch to use (if any) ### _F_kernelver_ver=2.6.25 -_F_kernelver_rel=4 -_F_kernelver_stable=3 +_F_kernelver_rel=5 +_F_kernelver_stable=4 From devil505linux at gmail.com Tue Jun 3 15:59:33 2008 From: devil505linux at gmail.com (Devil505) Date: Tue Jun 3 15:59:36 2008 Subject: [Frugalware-git] frugalware-current: xcfa-3.3.29-1-i686 Message-ID: <20080603135933.2126E1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cb5e132b40ad4783002e17daade067d4b5a3e4ab commit cb5e132b40ad4783002e17daade067d4b5a3e4ab Author: Devil505 Date: Tue Jun 3 15:54:23 2008 +0200 xcfa-3.3.29-1-i686 * version bump * fixed up2date & source diff --git a/source/xapps-extra/xcfa/FrugalBuild b/source/xapps-extra/xcfa/FrugalBuild index b2ec37c..aecc4e3 100644 --- a/source/xapps-extra/xcfa/FrugalBuild +++ b/source/xapps-extra/xcfa/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: jedifox pkgname=xcfa -pkgver=3.2.57 +pkgver=3.3.29 pkgrel=1 pkgdesc="Frontend which use miscellaneous external programs to extract and convert music files" url="http://www.xcfa.tuxfamily.org/" @@ -12,7 +12,7 @@ depends=('gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'taglib' 'curl' 'libxdamage' 'l options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://download.tuxfamily.org/xcfaudio/download/Etch/Src/ | Flasttar" +up2date="lynx -dump http://download.tuxfamily.org/xcfaudio/download/Src/ | Flasttar" Fconfopts="${Fconfopts[@]} --disable-ansi" -source=(http://download.tuxfamily.org/xcfaudio/download/Etch/Src/$pkgname-$pkgver.tar.gz) -sha1sums=('807351f88f2bd243d64cf2efe22d8ecde59ddbf5') +source=(http://download.tuxfamily.org/xcfaudio/download/Src/$pkgname-$pkgver.tar.gz) +sha1sums=('d7292238ad29655420073253979824d977d773ac') From vmiklos at frugalware.org Tue Jun 3 17:43:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 17:43:06 2008 Subject: [Frugalware-git] frugalware-current: qc-usb-0.6.6-38-i686 Message-ID: <20080603154304.353E31190ACA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e94d75d1db8b8288d4a681e1284ccacdf66055ce commit e94d75d1db8b8288d4a681e1284ccacdf66055ce Author: Miklos Vajna Date: Tue Jun 3 17:42:15 2008 +0200 qc-usb-0.6.6-38-i686 rebuilt with kernel-2.6.25-5 diff --git a/source/multimedia-extra/qc-usb/FrugalBuild b/source/multimedia-extra/qc-usb/FrugalBuild index f06d0ab..49cacf7 100644 --- a/source/multimedia-extra/qc-usb/FrugalBuild +++ b/source/multimedia-extra/qc-usb/FrugalBuild @@ -3,7 +3,7 @@ pkgname=qc-usb pkgver=0.6.6 -pkgrel=37 +pkgrel=38 pkgdesc="Quickcam kernel driver." groups=('multimedia-extra') archs=('i686' 'x86_64') From vmiklos at frugalware.org Tue Jun 3 17:43:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 17:43:07 2008 Subject: [Frugalware-git] frugalware-current: madwifi-0.9.4-9-i686 Message-ID: <20080603154304.40EAE1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=196cb9dd85808e119a8c9c99c381eee02a79a836 commit 196cb9dd85808e119a8c9c99c381eee02a79a836 Author: Miklos Vajna Date: Tue Jun 3 17:42:15 2008 +0200 madwifi-0.9.4-9-i686 rebuilt with kernel-2.6.25-5 diff --git a/source/network/madwifi/FrugalBuild b/source/network/madwifi/FrugalBuild index 741ec26..85cee4f 100644 --- a/source/network/madwifi/FrugalBuild +++ b/source/network/madwifi/FrugalBuild @@ -3,7 +3,7 @@ pkgname=madwifi pkgver=0.9.4 -pkgrel=8 +pkgrel=9 pkgdesc="Madwifi drivers for Atheros wireless chipsets" Finclude kernel-module depends=(${depends[@]} 'wireless_tools') From vmiklos at frugalware.org Tue Jun 3 17:43:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 17:43:08 2008 Subject: [Frugalware-git] frugalware-current: acx100-20080210-5-i686 Message-ID: <20080603154304.4F6BF1788047@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f6c22d8e6679bdf620b610fe1f718245fc532e61 commit f6c22d8e6679bdf620b610fe1f718245fc532e61 Author: Miklos Vajna Date: Tue Jun 3 17:42:16 2008 +0200 acx100-20080210-5-i686 rebuilt with kernel-2.6.25-5 diff --git a/source/network-extra/acx100/FrugalBuild b/source/network-extra/acx100/FrugalBuild index 3916de9..a7f0679 100644 --- a/source/network-extra/acx100/FrugalBuild +++ b/source/network-extra/acx100/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acx100 origname=acx-mac80211 pkgver=20080210 -pkgrel=4 +pkgrel=5 pkgdesc="The ACX100/ACX111 wireless network driver." _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname=${pkgname} From vmiklos at frugalware.org Tue Jun 3 17:43:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 17:43:12 2008 Subject: [Frugalware-git] frugalware-current: gspcav1-1.00.20-13-i686 Message-ID: <20080603154304.5A36A17880A4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f3be765891d55b1c07aa027c3a40d77e9827e691 commit f3be765891d55b1c07aa027c3a40d77e9827e691 Author: Miklos Vajna Date: Tue Jun 3 17:42:16 2008 +0200 gspcav1-1.00.20-13-i686 rebuilt with kernel-2.6.25-5 diff --git a/source/multimedia-extra/gspcav1/FrugalBuild b/source/multimedia-extra/gspcav1/FrugalBuild index e4ac0f1..63fe341 100644 --- a/source/multimedia-extra/gspcav1/FrugalBuild +++ b/source/multimedia-extra/gspcav1/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gspcav1 pkgver=1.00.20 -pkgrel=12 +pkgrel=13 pkgdate=20071224 pkgdesc="One driver Upto 220 Webcams supported" url="http://mxhaard.free.fr" From vmiklos at frugalware.org Tue Jun 3 17:43:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 17:43:12 2008 Subject: [Frugalware-git] frugalware-current: wlan-ng-0.2.8-25-i686 Message-ID: <20080603154304.641CB17880AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=669ef181cca6f2bafab9bd49db1ae89cd4f8dad8 commit 669ef181cca6f2bafab9bd49db1ae89cd4f8dad8 Author: Miklos Vajna Date: Tue Jun 3 17:42:16 2008 +0200 wlan-ng-0.2.8-25-i686 rebuilt with kernel-2.6.25-5 diff --git a/source/network-extra/wlan-ng/FrugalBuild b/source/network-extra/wlan-ng/FrugalBuild index 392326b..c57c5bb 100644 --- a/source/network-extra/wlan-ng/FrugalBuild +++ b/source/network-extra/wlan-ng/FrugalBuild @@ -3,7 +3,7 @@ pkgname=wlan-ng pkgver=0.2.8 -pkgrel=24 +pkgrel=25 pkgdesc="Wireless Lan modules" url="http://www.linux-wlan.org/" Finclude kernel-module From vmiklos at frugalware.org Tue Jun 3 17:43:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 17:43:12 2008 Subject: [Frugalware-git] frugalware-current: acerhk-0.5.35-16-i686 Message-ID: <20080603154304.1CC9F1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=49baf6df03d9af4d46c4d9ffa1aba6e0557fff36 commit 49baf6df03d9af4d46c4d9ffa1aba6e0557fff36 Author: Miklos Vajna Date: Tue Jun 3 17:42:14 2008 +0200 acerhk-0.5.35-16-i686 rebuilt with kernel-2.6.25-5 diff --git a/source/apps-extra/acerhk/FrugalBuild b/source/apps-extra/acerhk/FrugalBuild index 9a8b0cc..0d21b25 100644 --- a/source/apps-extra/acerhk/FrugalBuild +++ b/source/apps-extra/acerhk/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acerhk pkgver=0.5.35 -pkgrel=15 +pkgrel=16 pkgdesc="Acer Hotkey driver for Linux" url="http://www.cakey.de/acerhk/" Finclude kernel-module From vmiklos at frugalware.org Tue Jun 3 17:43:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 17:43:13 2008 Subject: [Frugalware-git] frugalware-current: lirc-0.8.3-2-i686 Message-ID: <20080603154304.6E21817880AF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b35c48270f3e0150d8ae09c498c6460adeed5769 commit b35c48270f3e0150d8ae09c498c6460adeed5769 Author: Miklos Vajna Date: Tue Jun 3 17:42:17 2008 +0200 lirc-0.8.3-2-i686 rebuilt with kernel-2.6.25-5 diff --git a/source/apps-extra/lirc/FrugalBuild b/source/apps-extra/lirc/FrugalBuild index 7ceece0..2f3d938 100644 --- a/source/apps-extra/lirc/FrugalBuild +++ b/source/apps-extra/lirc/FrugalBuild @@ -3,7 +3,7 @@ pkgname=lirc pkgver=0.8.3 -pkgrel=1 +pkgrel=2 pkgdesc="LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls." url="http://www.lirc.org/" Finclude kernel-module sourceforge From vmiklos at frugalware.org Tue Jun 3 17:43:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 17:43:13 2008 Subject: [Frugalware-git] frugalware-current: ndiswrapper-1.52-7-i686 Message-ID: <20080603154304.78D231190ACA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=81c6f952cff5da6c0b153ae768082578de02376c commit 81c6f952cff5da6c0b153ae768082578de02376c Author: Miklos Vajna Date: Tue Jun 3 17:42:17 2008 +0200 ndiswrapper-1.52-7-i686 rebuilt with kernel-2.6.25-5 diff --git a/source/network-extra/ndiswrapper/FrugalBuild b/source/network-extra/ndiswrapper/FrugalBuild index c7046b4..d294ca8 100644 --- a/source/network-extra/ndiswrapper/FrugalBuild +++ b/source/network-extra/ndiswrapper/FrugalBuild @@ -4,7 +4,7 @@ pkgname=ndiswrapper pkgver=1.52 -pkgrel=6 +pkgrel=7 pkgdesc="Wrapper for using Windows drivers for some wireless cards" _F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module sourceforge From vmiklos at frugalware.org Tue Jun 3 17:43:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 17:43:14 2008 Subject: [Frugalware-git] frugalware-current: kqemu-1.3.0pre11-31-i686 Message-ID: <20080603154304.82A441190ACB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bb7515bedf90c20ae9400016330c5bf5b6ebb7c7 commit bb7515bedf90c20ae9400016330c5bf5b6ebb7c7 Author: Miklos Vajna Date: Tue Jun 3 17:42:17 2008 +0200 kqemu-1.3.0pre11-31-i686 rebuilt with kernel-2.6.25-5 diff --git a/source/xapps-extra/kqemu/FrugalBuild b/source/xapps-extra/kqemu/FrugalBuild index 7bba5bd..c074d05 100644 --- a/source/xapps-extra/kqemu/FrugalBuild +++ b/source/xapps-extra/kqemu/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kqemu pkgver=1.3.0pre11 -pkgrel=30 +pkgrel=31 pkgdesc="QEMU Accelerator Module" url="http://fabrice.bellard.free.fr/qemu/" depends=('qemu') From vmiklos at frugalware.org Tue Jun 3 17:43:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 17:43:14 2008 Subject: [Frugalware-git] frugalware-current: redirfs-0.2-10-i686 Message-ID: <20080603154304.8C64B17880B0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e5d41e8222cedc87cbbcb26bb04d8242ce50c912 commit e5d41e8222cedc87cbbcb26bb04d8242ce50c912 Author: Miklos Vajna Date: Tue Jun 3 17:42:18 2008 +0200 redirfs-0.2-10-i686 rebuilt with kernel-2.6.25-5 diff --git a/source/apps-extra/redirfs/FrugalBuild b/source/apps-extra/redirfs/FrugalBuild index 347020b..b587abe 100644 --- a/source/apps-extra/redirfs/FrugalBuild +++ b/source/apps-extra/redirfs/FrugalBuild @@ -3,7 +3,7 @@ pkgname=redirfs pkgver=0.2 -pkgrel=9 +pkgrel=10 pkgdesc="Redirecting FileSystem" url="http://redirfs.org/" _F_kernelmod_scriptlet=$pkgname.install From vmiklos at frugalware.org Tue Jun 3 17:43:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 17:43:15 2008 Subject: [Frugalware-git] frugalware-current: r8169-6.006.00-4-i686 Message-ID: <20080603154304.9633E17880B2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5581e349b009022331fdd41f274febe59d13dae1 commit 5581e349b009022331fdd41f274febe59d13dae1 Author: Miklos Vajna Date: Tue Jun 3 17:42:18 2008 +0200 r8169-6.006.00-4-i686 rebuilt with kernel-2.6.25-5 diff --git a/source/network-extra/r8169/FrugalBuild b/source/network-extra/r8169/FrugalBuild index 4c7a2c8..a0cceca 100644 --- a/source/network-extra/r8169/FrugalBuild +++ b/source/network-extra/r8169/FrugalBuild @@ -3,7 +3,7 @@ pkgname=r8169 pkgver=6.006.00 -pkgrel=3 +pkgrel=4 Finclude sourceforge kernel-module pkgdesc="Realtek driver for RTL8169/8110 cards." url="http://www.realtek.com.tw" From vmiklos at frugalware.org Tue Jun 3 17:43:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 17:43:15 2008 Subject: [Frugalware-git] frugalware-current: virtualbox-1.5.6_1-9-i686 Message-ID: <20080603154304.A0B3B17880B3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=643f2a919bb83d37c8acc3d8f07b1f70f2a8677b commit 643f2a919bb83d37c8acc3d8f07b1f70f2a8677b Author: Miklos Vajna Date: Tue Jun 3 17:42:18 2008 +0200 virtualbox-1.5.6_1-9-i686 rebuilt with kernel-2.6.25-5 diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index 1f7f57d..ae9ddb7 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -5,7 +5,7 @@ pkgname=virtualbox realname=VirtualBox pkgver=1.5.6_1 -pkgrel=8 +pkgrel=9 pkgdesc="InnoTek VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use." url="http://www.virtualbox.org" _F_kernelmod_scriptlet=$pkgname.install From vmiklos at frugalware.org Tue Jun 3 17:43:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 17:43:15 2008 Subject: [Frugalware-git] frugalware-current: nvidia-96xx-96.43.05-11-i686 Message-ID: <20080603154304.AA2A21778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8ffd6467129b2ffb64fc370dd63f31114d590b45 commit 8ffd6467129b2ffb64fc370dd63f31114d590b45 Author: Miklos Vajna Date: Tue Jun 3 17:42:19 2008 +0200 nvidia-96xx-96.43.05-11-i686 rebuilt with kernel-2.6.25-5 diff --git a/source/x11-extra/nvidia-96xx/FrugalBuild b/source/x11-extra/nvidia-96xx/FrugalBuild index 63bb422..c28da27 100644 --- a/source/x11-extra/nvidia-96xx/FrugalBuild +++ b/source/x11-extra/nvidia-96xx/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia-96xx pkgver=96.43.05 -pkgrel=10 +pkgrel=11 pkgdesc="3d accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx' 'nvidia') From vmiklos at frugalware.org Tue Jun 3 17:43:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 17:43:16 2008 Subject: [Frugalware-git] frugalware-current: fglrx-8.493-3-i686 Message-ID: <20080603154304.B55C517780AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3012573954283cbe847cec769b9a1ec26995b828 commit 3012573954283cbe847cec769b9a1ec26995b828 Author: Miklos Vajna Date: Tue Jun 3 17:42:19 2008 +0200 fglrx-8.493-3-i686 rebuilt with kernel-2.6.25-5 diff --git a/source/x11-extra/fglrx/FrugalBuild b/source/x11-extra/fglrx/FrugalBuild index 7d55bd8..b13e1ed 100644 --- a/source/x11-extra/fglrx/FrugalBuild +++ b/source/x11-extra/fglrx/FrugalBuild @@ -5,7 +5,7 @@ pkgname=fglrx pkgver=8.493 _shortver=8-5 -pkgrel=2 +pkgrel=3 pkgdesc="Hardware Accelerated ATi driver for xorg" url="http://www.ati.com/" # libstdc++5: no hardware acceleration without it From vmiklos at frugalware.org Tue Jun 3 17:43:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 17:43:16 2008 Subject: [Frugalware-git] frugalware-current: nvidia-173.14.05-2-i686 Message-ID: <20080603154304.BDE8817880B4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6da137b2a7987ad8067f1cd81e23d8b0d7c9a194 commit 6da137b2a7987ad8067f1cd81e23d8b0d7c9a194 Author: Miklos Vajna Date: Tue Jun 3 17:42:20 2008 +0200 nvidia-173.14.05-2-i686 rebuilt with kernel-2.6.25-5 diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild index 8836800..438a77a 100644 --- a/source/x11-extra/nvidia/FrugalBuild +++ b/source/x11-extra/nvidia/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia pkgver=173.14.05 -pkgrel=1 +pkgrel=2 pkgdesc="3D accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx') From vmiklos at frugalware.org Tue Jun 3 17:43:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 17:43:16 2008 Subject: [Frugalware-git] frugalware-current: dazuko-2.3.4-17-i686 Message-ID: <20080603154304.C8D4D17880B5@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e495872d7955848d476a3fc7297441262d384d5c commit e495872d7955848d476a3fc7297441262d384d5c Author: Miklos Vajna Date: Tue Jun 3 17:42:20 2008 +0200 dazuko-2.3.4-17-i686 rebuilt with kernel-2.6.25-5 diff --git a/source/apps-extra/dazuko/FrugalBuild b/source/apps-extra/dazuko/FrugalBuild index 5421582..7424c52 100644 --- a/source/apps-extra/dazuko/FrugalBuild +++ b/source/apps-extra/dazuko/FrugalBuild @@ -4,7 +4,7 @@ pkgname=dazuko pkgver=2.3.4 redirver=0.2 -pkgrel=16 +pkgrel=17 pkgdesc="On-access virus scanning kernel interface" url="http://www.dazuko.org" license="GPL-2 BSD" From vmiklos at frugalware.org Tue Jun 3 17:43:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 3 17:43:17 2008 Subject: [Frugalware-git] frugalware-current: atl2-2.0.4-7-i686 Message-ID: <20080603154304.D17FC17880B6@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5c29d067d1017233fc30b6d157e329d667f4f449 commit 5c29d067d1017233fc30b6d157e329d667f4f449 Author: Miklos Vajna Date: Tue Jun 3 17:42:20 2008 +0200 atl2-2.0.4-7-i686 rebuilt with kernel-2.6.25-5 diff --git a/source/network-extra/atl2/FrugalBuild b/source/network-extra/atl2/FrugalBuild index 4cf2ffd..962eded 100644 --- a/source/network-extra/atl2/FrugalBuild +++ b/source/network-extra/atl2/FrugalBuild @@ -3,7 +3,7 @@ pkgname=atl2 pkgver=2.0.4 -pkgrel=6 +pkgrel=7 pkgdesc="Driver for the Attansic/Atheros L2 Fast Ethernet Adapter" url="http://people.redhat.com/csnook/${pkgname}" license="GPL" From bouleetbil at frogdev.info Tue Jun 3 21:24:47 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jun 3 21:24:49 2008 Subject: [Frugalware-git] frugalware-current: gnome-control-center-2.22.2.1-1 Message-ID: <20080603192447.7C99C1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9c09a29f34ac27c1d0ae3f34222db22b447ea5e3 commit 9c09a29f34ac27c1d0ae3f34222db22b447ea5e3 Author: bouleetbil Date: Tue Jun 3 20:47:50 2008 +0200 gnome-control-center-2.22.2.1-1 *version bump diff --git a/source/gnome/gnome-control-center/FrugalBuild b/source/gnome/gnome-control-center/FrugalBuild index 445fa3f..8e1df76 100644 --- a/source/gnome/gnome-control-center/FrugalBuild +++ b/source/gnome/gnome-control-center/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-control-center -pkgver=2.22.1 +pkgver=2.22.2.1 pkgrel=1 pkgdesc="GNOME Control Center" -depends=('gnome-desktop>=2.22.0' 'gnome-menus>=2.22.0' 'metacity>=2.22.0' 'libgnomekbd>=2.18.1' \ - 'nautilus>=2.22.0' 'gst-plugins-base>=0.10.10-2' 'desktop-file-utils' \ - 'evolution-data-server>=2.22.0' 'libxxf86misc' 'libxscrnsaver' 'xrdb' \ - 'gnome-vfs>=2.22.0' 'gnome-panel>=2.22.0' 'heimdal>=1.1' 'db>=4.6.18' \ +depends=('gnome-desktop>=2.22.2' 'gnome-menus>=2.22.2' 'metacity>=2.22.0' 'libgnomekbd>=2.22.0' \ + 'nautilus>=2.22.3' 'gst-plugins-base>=0.10.19-2' 'desktop-file-utils' \ + 'evolution-data-server>=2.22.2' 'libxxf86misc' 'libxscrnsaver' 'xrdb' \ + 'gnome-vfs>=2.22.0' 'gnome-panel>=2.22.2' 'heimdal>=1.1' 'db>=4.6.21' \ 'gnome-settings-daemon') -makedepends=('intltool' 'gnome-doc-utils>=0.12.0' 'gnome-common>=2.20.0') -rodepends=('gst-plugins-base-alsa>=0.10.10-2' 'gst-plugins-base-gnomevfs>=0.10.10-2') +makedepends=('intltool' 'gnome-doc-utils>=0.12.2' 'gnome-common>=2.20.0') +rodepends=('gst-plugins-base-alsa>=0.10.19-2' 'gst-plugins-base-gnomevfs>=0.10.19-2') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/fontilus.schemas' \ @@ -24,7 +24,7 @@ _F_gnome_iconcache="y" options=('scriptlet') Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-gstreamer --disable-schemas-install --enable-aboutme" -sha1sums=('d62a7cc6ce09e15e0040747a1c6eb9287d323562') +sha1sums=('686151d59b99fb311481ba365b0dd3fd3680cac6') build() { export CFLAGS="$CFLAGS -fno-strict-aliasing" From bouleetbil at frogdev.info Tue Jun 3 21:58:39 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jun 3 21:58:41 2008 Subject: [Frugalware-git] frugalware-current: gnome-terminal-2.22.2-1 Message-ID: <20080603195839.53F9F1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=16c135db81c232eba11210ef16fba7a0950e790c commit 16c135db81c232eba11210ef16fba7a0950e790c Author: bouleetbil Date: Tue Jun 3 21:51:46 2008 +0200 gnome-terminal-2.22.2-1 *version bump diff --git a/source/gnome/gnome-terminal/FrugalBuild b/source/gnome/gnome-terminal/FrugalBuild index 319bba1..734deba 100644 --- a/source/gnome/gnome-terminal/FrugalBuild +++ b/source/gnome/gnome-terminal/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-terminal -pkgver=2.22.1 +pkgver=2.22.2 pkgrel=1 pkgdesc="GNOME terminal emulator" url="http://www.gnome.org/" -depends=('libgnomeui>=2.22.0' 'startup-notification' 'vte>=0.16.13' 'rarian' 'gnome-vfs>=2.22.0' \ - 'avahi-glib>=0.6.17' 'dbus-glib>=0.71') -makedepends=('intltool' 'gnome-doc-utils>=0.9.2') +depends=('libgnomeui>=2.22.1' 'startup-notification' 'vte>=0.16.13' 'rarian' 'gnome-vfs>=2.22.0' \ + 'avahi-glib>=0.6.22' 'dbus-glib>=0.74') +makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') _F_gnome_scrollkeeper="y" @@ -16,7 +16,7 @@ _F_gnome_schemas=('/etc/gconf/schemas/gnome-terminal.schemas') Finclude gnome gnome-scriptlet source=(${source[@]} 00-$pkgname-2.12.0-prompt.patch \ 01-$pkgname-2.12.0-bindings.patch) -sha1sums=('87fca1f6bbb7dcbc5f9d6ad4397bacf0cca7e42a' \ +sha1sums=('c8948f815c5d3ac76354aa8ae25840c2fbe19912' \ 'e368d21c96edac918a1a7cd22c0e65d803f5784f' \ '0146084932430786185eaacafc06852a87cfe632') From bouleetbil at frogdev.info Tue Jun 3 22:24:47 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jun 3 22:24:49 2008 Subject: [Frugalware-git] frugalware-current: gnome-session-2.22.2-1-i686 Message-ID: <20080603202447.3C0E81190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dc5647db27577bda6a43adaa972f492eceb20ee3 commit dc5647db27577bda6a43adaa972f492eceb20ee3 Author: bouleetbil Date: Tue Jun 3 22:18:04 2008 +0200 gnome-session-2.22.2-1-i686 *version bump diff --git a/source/gnome/gnome-session/FrugalBuild b/source/gnome/gnome-session/FrugalBuild index 1a993c3..4cf05c0 100644 --- a/source/gnome/gnome-session/FrugalBuild +++ b/source/gnome/gnome-session/FrugalBuild @@ -4,11 +4,11 @@ # kill_g_debug.patch should be disabled for stable releases of gnome pkgname=gnome-session -pkgver=2.22.1.1 +pkgver=2.22.2 pkgrel=1 pkgdesc="GNOME session manager" -depends=('libgnomeui>=2.22.0' 'gnome-desktop>=2.22.0' \ - 'dbus-glib>=0.74' 'gnome-control-center>=2.22.0' 'gnome-vfs>=2.22.0' 'libnotify' 'gnome-keyring>=2.22.0') +depends=('libgnomeui>=2.22.1' 'gnome-desktop>=2.22.2' \ + 'dbus-glib>=0.74' 'gnome-control-center>=2.22.1' 'gnome-vfs>=2.22.0' 'libnotify' 'gnome-keyring>=2.22.2') makedepends=('intltool') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') @@ -19,7 +19,7 @@ Finclude gnome gnome-scriptlet source=(${source[@]} 02-splash-disappear.patch \ $pkgname http://ftp.frugalware.org/pub/other/artwork/gnome-theme/GNOME-Splash-0.7.png \ 09_splash_hide.patch 19_gnome-wm-tweaking.patch) -sha1sums=('54ba733ec8c8530a1f9c03b9f11d66bf3e666163' \ +sha1sums=('7b3fa9e614f9c97943dfbc251b0ca1115cad2b56' \ 'd45d51203dc7ad290b12bc70281d59844a79be75' \ '047ac00bb24d52986aac94e232b4b40fa122f582' \ 'c6a9e03d9622b9d1b81ae4bedda950bea25de962' \ From bouleetbil at frogdev.info Tue Jun 3 23:36:28 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jun 3 23:36:30 2008 Subject: [Frugalware-git] frugalware-current: assogiate-0.2.1-1-i686 Message-ID: <20080603213628.350311190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b1549ba5c158c48d53a8b82afce87c7570ed82bc commit b1549ba5c158c48d53a8b82afce87c7570ed82bc Author: bouleetbil Date: Tue Jun 3 23:29:57 2008 +0200 assogiate-0.2.1-1-i686 *new package *closed #2601 diff --git a/source/gnome-extra/assogiate/FrugalBuild b/source/gnome-extra/assogiate/FrugalBuild new file mode 100644 index 0000000..e3223dc --- /dev/null +++ b/source/gnome-extra/assogiate/FrugalBuild @@ -0,0 +1,23 @@ +# Compiling Time: 0.19 SBU +# Maintainer: bouleetbil + +pkgname=assogiate +pkgver=0.2.1 +pkgrel=1 +pkgdesc="assoGiate is an editor of the file types database for GNOME" +url="http://www.kdau.com/projects/assogiate" +depends=('gtkmm' 'atk' 'pango' 'freetype2' 'libxau' 'libxdmcp' 'libxml++' \ + 'gnome-vfsmm' 'openssl' 'libstdc++' 'libxdamage' 'libxinerama' \ + 'libxi' 'libxrandr' 'libxcursor') +makedepends=('gnome-doc-utils' 'intltool') +groups=('gnome-extra') +options=('scriptlet') +archs=('i686') +up2date="lynx -dump http://www.kdau.com/files/ | Flasttarbz2" +source=(http://www.kdau.com/files/$pkgname-$pkgver.tar.bz2) +_F_gnome_iconcache="y" +_F_gnome_desktop="y" +Finclude gnome-scriptlet +sha1sums=('89c23847d6efd96194b2a35723eb811e7226de03') + +# optimization OK From vmiklos at frugalware.org Wed Jun 4 01:28:57 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 4 01:28:59 2008 Subject: [Frugalware-git] frugalware-current: kqemu-1.3.0pre11-31-i686 Message-ID: <20080603232857.469F51190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5a27a076167200789097f36c525eccf1c1bc9380 commit 5a27a076167200789097f36c525eccf1c1bc9380 Author: Miklos Vajna Date: Wed Jun 4 01:28:44 2008 +0200 kqemu-1.3.0pre11-31-i686 - url fix diff --git a/source/xapps-extra/kqemu/FrugalBuild b/source/xapps-extra/kqemu/FrugalBuild index c074d05..07dc607 100644 --- a/source/xapps-extra/kqemu/FrugalBuild +++ b/source/xapps-extra/kqemu/FrugalBuild @@ -5,7 +5,7 @@ pkgname=kqemu pkgver=1.3.0pre11 pkgrel=31 pkgdesc="QEMU Accelerator Module" -url="http://fabrice.bellard.free.fr/qemu/" +url="http://bellard.org/qemu/" depends=('qemu') _F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module From vmiklos at frugalware.org Wed Jun 4 01:33:31 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 4 01:33:33 2008 Subject: [Frugalware-git] frugalware-current: fglrx-8.493-3-i686 Message-ID: <20080603233331.0EE4A1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=042bbc0073548da6fd33b79f91feb6dd88997039 commit 042bbc0073548da6fd33b79f91feb6dd88997039 Author: Miklos Vajna Date: Wed Jun 4 01:33:22 2008 +0200 fglrx-8.493-3-i686 - sha1sums() fix diff --git a/source/x11-extra/fglrx/FrugalBuild b/source/x11-extra/fglrx/FrugalBuild index b13e1ed..afe3652 100644 --- a/source/x11-extra/fglrx/FrugalBuild +++ b/source/x11-extra/fglrx/FrugalBuild @@ -30,7 +30,7 @@ up2date=$pkgver source=(https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-${_shortver}-x86.x86_64.run \ README.Frugalware libGL.la license.diff) options=(${options[@]} 'nodocs') -sha1sums=('6c0633da3be8e9700d01f086e9876ba34ef0a588' \ +sha1sums=('37210979c6e5fd24e7eda283233e2c0acdf3d3c7' \ 'b64a2303c77f84f5e5db13c9c8fd55f43fa9699b' \ '650973d708466f5c4c21e70c1f1f6c118b27e614' \ 'bfbcbc939ca2d0cbe20eb306ed59ef49c2bea06a') From ryuo at frugalware.org Wed Jun 4 01:58:12 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 01:58:15 2008 Subject: [Frugalware-git] frugalware-current: libev-3.41-1-x86_64 Message-ID: <20080603235812.F1DDD1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d40b7d39f086f3b0adf471b31b13c22ad2f2829f commit d40b7d39f086f3b0adf471b31b13c22ad2f2829f Author: James Buren Date: Tue Jun 3 18:45:13 2008 -0500 libev-3.41-1-x86_64 * added x86_64 to archs diff --git a/source/lib-extra/libev/FrugalBuild b/source/lib-extra/libev/FrugalBuild index 51486ce..741d1fe 100644 --- a/source/lib-extra/libev/FrugalBuild +++ b/source/lib-extra/libev/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="A full-featured and high-performance event loop" url="http://software.schmorp.de/pkg/libev.html" depends=() groups=('lib-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="Flasttar http://dist.schmorp.de/libev/Attic/" source=(http://dist.schmorp.de/libev/Attic/$pkgname-$pkgver.tar.gz) sha1sums=('7685655eb420ca14f792dc8cb5e13701aa1e9763') From ryuo at frugalware.org Wed Jun 4 02:19:17 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 02:19:19 2008 Subject: [Frugalware-git] frugalware-current: snes9x-1.51-1-x86_64 Message-ID: <20080604001917.E33621190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=481aece1f33bf87b14d26e597c99d1b631b1221d commit 481aece1f33bf87b14d26e597c99d1b631b1221d Author: James Buren Date: Tue Jun 3 19:11:26 2008 -0500 snes9x-1.51-1-x86_64 * added x86_64 to archs diff --git a/source/games-extra/snes9x/FrugalBuild b/source/games-extra/snes9x/FrugalBuild index 5d20a00..1531fdc 100644 --- a/source/games-extra/snes9x/FrugalBuild +++ b/source/games-extra/snes9x/FrugalBuild @@ -8,7 +8,7 @@ pkgrel=1 pkgdesc="A portable, freeware Super Nintendo Entertainment System (SNES) emulator." url="http://www.snes9x.com" srcurl="http://files.ipherswipsite.com" -archs=('i686') +archs=('i686' 'x86_64') groups=('games-extra') depends=('libpng' 'libxxf86dga') makedepends=('nasm') From ryuo at frugalware.org Wed Jun 4 03:13:01 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 03:13:03 2008 Subject: [Frugalware-git] frugalware-current: xmix-2.1-4-x86_64 Message-ID: <20080604011301.AE93C1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f0aa2df67c6cbd78adb1104b3793c38e278352a7 commit f0aa2df67c6cbd78adb1104b3793c38e278352a7 Author: James Buren Date: Tue Jun 3 20:07:23 2008 -0500 xmix-2.1-4-x86_64 * added x86_64 to archs * moved to xmultimedia-extra (last move, I swear) diff --git a/source/xmultimedia-extra/xmix/FrugalBuild b/source/xmultimedia-extra/xmix/FrugalBuild new file mode 100644 index 0000000..a4a801f --- /dev/null +++ b/source/xmultimedia-extra/xmix/FrugalBuild @@ -0,0 +1,25 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=xmix +pkgver=2.1 +pkgrel=4 +pkgdesc="xaw program for configuring ALSA/OSS" +url="http://freshmeat.net/projects/xmix/" +depends=('libxaw' 'libxext' 'glibc' 'libsm') +groups=('xmultimedia-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url" +source=(http://freshmeat.net/redir/$pkgname/47834/url_bz2/$pkgname-$pkgver.tar.bz2) +sha1sums=('10b2afce4969d8887f3a5d6fa107e4820aa0309c') + +build() +{ + Fcd $pkgname + make clean || Fdie + make CCOPTIONS="-DNO_ASM $CFLAGS" || Fdie + Fexerel /usr/bin/xmix + Ffilerel /usr/share/xmix/XMix +} + +# optimization OK From ryuo at frugalware.org Wed Jun 4 03:18:29 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 03:18:30 2008 Subject: [Frugalware-git] frugalware-current: termit-1.3.1-1-x86_64 Message-ID: <20080604011829.BECC31190ACA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5d0770ee8f78a85a3cd3ed07f8f26e5057490fd4 commit 5d0770ee8f78a85a3cd3ed07f8f26e5057490fd4 Author: James Buren Date: Tue Jun 3 20:15:45 2008 -0500 termit-1.3.1-1-x86_64 * added x86_64 to archs diff --git a/source/xapps-extra/termit/FrugalBuild b/source/xapps-extra/termit/FrugalBuild index c6a3d23..e7c81d8 100644 --- a/source/xapps-extra/termit/FrugalBuild +++ b/source/xapps-extra/termit/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="A terminal emulator based on the vte library." url="http://code.google.com/p/termit/wiki/TermIt" depends=('libxau' 'libxdmcp' 'vte' 'libxft' 'libxdamage' 'libxml2' 'libice' 'ncurses') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="Flasttar $url" source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2) Finclude cmake From ryuo at frugalware.org Wed Jun 4 03:28:46 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 03:28:47 2008 Subject: [Frugalware-git] frugalware-current: tunapie-2.1.6-1-x86_64 Message-ID: <20080604012846.82CB71190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7a564a27a76dd65fab8335b5d5ae6a8fbb110f56 commit 7a564a27a76dd65fab8335b5d5ae6a8fbb110f56 Author: James Buren Date: Tue Jun 3 20:26:41 2008 -0500 tunapie-2.1.6-1-x86_64 * added x86_64 to archs * corrected mode of FrugalBuild to 644 diff --git a/source/xapps-extra/tunapie/FrugalBuild b/source/xapps-extra/tunapie/FrugalBuild index 15fc83d..b87246d 100755 --- a/source/xapps-extra/tunapie/FrugalBuild +++ b/source/xapps-extra/tunapie/FrugalBuild @@ -9,7 +9,7 @@ _F_sourceforge_broken_up2date=1 Finclude sourceforge depends=('python>=2.3' 'wxpython>=2.6') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('6deb303c03b3fad432162adec4efae1338d9de4b') _F_cd_path="$pkgname-$pkgver/src" From ryuo at frugalware.org Wed Jun 4 03:38:25 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 03:38:27 2008 Subject: [Frugalware-git] frugalware-current: slock-0.8-1-x86_64 Message-ID: <20080604013825.B07A91190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a09b7a83d4015b58e4de7f513116df5412ebb3af commit a09b7a83d4015b58e4de7f513116df5412ebb3af Author: James Buren Date: Tue Jun 3 20:36:24 2008 -0500 slock-0.8-1-x86_64 * added x86_64 to archs diff --git a/source/x11-extra/slock/FrugalBuild b/source/x11-extra/slock/FrugalBuild index f4544d3..edc80f0 100644 --- a/source/x11-extra/slock/FrugalBuild +++ b/source/x11-extra/slock/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="a simple screen locker for your X session" url="http://www.suckless.org/wiki/tools/xlib" depends=('libxext') groups=('x11-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="Flasttar $url" source=(http://www.suckless.org/download/$pkgname-$pkgver.tar.gz) sha1sums=('2e62e71ea2f1eff564272bbe3099438cee6753e2') From ryuo at frugalware.org Wed Jun 4 03:45:27 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 03:45:28 2008 Subject: [Frugalware-git] frugalware-current: rubyripper-0.5.0-1-x86_64 Message-ID: <20080604014527.448641190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=06225ad16d35cee1fd195d53925e2d6ec9bef158 commit 06225ad16d35cee1fd195d53925e2d6ec9bef158 Author: James Buren Date: Tue Jun 3 20:43:23 2008 -0500 rubyripper-0.5.0-1-x86_64 * added x86_64 to archs diff --git a/source/xapps-extra/rubyripper/FrugalBuild b/source/xapps-extra/rubyripper/FrugalBuild index d9f7ff6..33ff250 100644 --- a/source/xapps-extra/rubyripper/FrugalBuild +++ b/source/xapps-extra/rubyripper/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc=" A secure audiodisc ripper for Linux" depends=('cdparanoia' 'ruby-gettext' 'ruby-gtk2' 'cd-discid' 'flac' \ 'ogmtools' 'lame' 'vorbisgain' 'mp3gain' 'normalize' ) groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') _F_googlecode_ext=".tar.bz2" Finclude googlecode _F_gnome_desktop="y" From ryuo at frugalware.org Wed Jun 4 03:51:37 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 03:51:38 2008 Subject: [Frugalware-git] frugalware-current: icets-1.4-1-x86_64 Message-ID: <20080604015137.5D4C51190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5f3aad45fde6f68e30ad743f0d0520dca4cb4fdd commit 5f3aad45fde6f68e30ad743f0d0520dca4cb4fdd Author: James Buren Date: Tue Jun 3 20:49:35 2008 -0500 icets-1.4-1-x86_64 * added x86_64 to archs diff --git a/source/xapps-extra/icets/FrugalBuild b/source/xapps-extra/icets/FrugalBuild index 27cba7e..610405d 100644 --- a/source/xapps-extra/icets/FrugalBuild +++ b/source/xapps-extra/icets/FrugalBuild @@ -11,7 +11,7 @@ Finclude sourceforge depends=('qt' 'libstdc++' 'zlib' 'libgl' 'libglx' 'libxmu' 'libxi') rodepends=('icewm') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('20dfa71993de7f0c9c00ba8313ea78ada1cfd2ce') build() From ryuo at frugalware.org Wed Jun 4 03:53:46 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 03:53:48 2008 Subject: [Frugalware-git] frugalware-current: icemc-2.1-1-x86_64 Message-ID: <20080604015346.DDC101190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f945fcf30a545cc3a17015f0b5fd0487726320c1 commit f945fcf30a545cc3a17015f0b5fd0487726320c1 Author: James Buren Date: Tue Jun 3 20:51:49 2008 -0500 icemc-2.1-1-x86_64 * added x86_64 to archs diff --git a/source/xapps-extra/icemc/FrugalBuild b/source/xapps-extra/icemc/FrugalBuild index 0aee2d9..02d5325 100644 --- a/source/xapps-extra/icemc/FrugalBuild +++ b/source/xapps-extra/icemc/FrugalBuild @@ -11,7 +11,7 @@ Finclude sourceforge depends=('qt' 'libstdc++' 'zlib' 'libgl' 'libglx' 'libxmu' 'libxi') rodepends=('icewm') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('a014039121050ebf684efeb80456301bf5a5e45c') build() { From ryuo at frugalware.org Wed Jun 4 03:56:04 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 03:56:06 2008 Subject: [Frugalware-git] frugalware-current: iceked-1.5-1-x86_64 Message-ID: <20080604015604.A66D61190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=03fb621263400582d524c97d263080d886227196 commit 03fb621263400582d524c97d263080d886227196 Author: James Buren Date: Tue Jun 3 20:54:02 2008 -0500 iceked-1.5-1-x86_64 * added x86_64 to archs diff --git a/source/xapps-extra/iceked/FrugalBuild b/source/xapps-extra/iceked/FrugalBuild index 81459dc..eb5a34e 100644 --- a/source/xapps-extra/iceked/FrugalBuild +++ b/source/xapps-extra/iceked/FrugalBuild @@ -11,7 +11,7 @@ Finclude sourceforge depends=('qt' 'libstdc++' 'zlib' 'libgl' 'libglx' 'libxmu' 'libxi') rodepends=('icewm') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('d3d321f0675428d67ec553c2da06492663caae79') build() From ryuo at frugalware.org Wed Jun 4 03:58:09 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 03:58:11 2008 Subject: [Frugalware-git] frugalware-current: icewoed-1.8-1-x86_64 Message-ID: <20080604015809.8C0B11190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1e9cf780d93efda5aff066cc320f7e765eedc9c8 commit 1e9cf780d93efda5aff066cc320f7e765eedc9c8 Author: James Buren Date: Tue Jun 3 20:56:12 2008 -0500 icewoed-1.8-1-x86_64 * added x86_64 to archs diff --git a/source/xapps-extra/icewoed/FrugalBuild b/source/xapps-extra/icewoed/FrugalBuild index ce66f4b..1171d1c 100644 --- a/source/xapps-extra/icewoed/FrugalBuild +++ b/source/xapps-extra/icewoed/FrugalBuild @@ -12,7 +12,7 @@ url="http://icecc.sourceforge.net/" depends=('qt' 'libstdc++' 'zlib' 'libgl' 'libglx' 'libxmu' 'libxi') rodepends=('icewm') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('ca58b5769c27ee587458c12c285e231b990c3da9') build() From ryuo at frugalware.org Wed Jun 4 04:00:11 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 04:00:12 2008 Subject: [Frugalware-git] frugalware-current: icemergeprefs-0.5-1-x86_64 Message-ID: <20080604020011.40F661190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3ebc24aa62e2029682f0a278c7a66c9ab05a02cb commit 3ebc24aa62e2029682f0a278c7a66c9ab05a02cb Author: James Buren Date: Tue Jun 3 20:58:09 2008 -0500 icemergeprefs-0.5-1-x86_64 * added x86_64 to archs diff --git a/source/xapps-extra/icemergeprefs/FrugalBuild b/source/xapps-extra/icemergeprefs/FrugalBuild index 99ece79..9d29eb0 100644 --- a/source/xapps-extra/icemergeprefs/FrugalBuild +++ b/source/xapps-extra/icemergeprefs/FrugalBuild @@ -11,7 +11,7 @@ Finclude sourceforge up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=80316&package_id=81964' | grep '$pkgname' | head -n1 | sed 's|$_F_sourceforge_ext.*$||' | sed 's|^.*-||'" rodepends=('icewm' 'pyqt') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('9f163b835069ba27f278434efa444b3d7699b30b') build() From ryuo at frugalware.org Wed Jun 4 04:02:20 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 04:02:21 2008 Subject: [Frugalware-git] frugalware-current: icesndcfg-1.3-1-x86_64 Message-ID: <20080604020220.A7EFD1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c02061ef4656bcc301a6fdecf95e31172c0d6db2 commit c02061ef4656bcc301a6fdecf95e31172c0d6db2 Author: James Buren Date: Tue Jun 3 21:00:24 2008 -0500 icesndcfg-1.3-1-x86_64 * added x86_64 to archs diff --git a/source/xapps-extra/icesndcfg/FrugalBuild b/source/xapps-extra/icesndcfg/FrugalBuild index 9ba2e56..ca1589d 100644 --- a/source/xapps-extra/icesndcfg/FrugalBuild +++ b/source/xapps-extra/icesndcfg/FrugalBuild @@ -12,7 +12,7 @@ url="http://icecc.sourceforge.net/" depends=('qt' 'libstdc++' 'zlib' 'libgl' 'libglx' 'libxmu' 'libxi') rodepends=('icewm') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('a8611f36167625b7771c262601fd7ddd51ec2b4a') build() From ryuo at frugalware.org Wed Jun 4 04:04:07 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 04:04:09 2008 Subject: [Frugalware-git] frugalware-current: iceiconcvt-1.0-1-x86_64 Message-ID: <20080604020407.7EB3A1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a666fb451dd82715a5ba003710afae2392543c34 commit a666fb451dd82715a5ba003710afae2392543c34 Author: James Buren Date: Tue Jun 3 21:02:10 2008 -0500 iceiconcvt-1.0-1-x86_64 * added x86_64 to archs diff --git a/source/xapps-extra/iceiconcvt/FrugalBuild b/source/xapps-extra/iceiconcvt/FrugalBuild index 5f483c5..b70a273 100644 --- a/source/xapps-extra/iceiconcvt/FrugalBuild +++ b/source/xapps-extra/iceiconcvt/FrugalBuild @@ -11,7 +11,7 @@ Finclude sourceforge up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=80316&package_id=81964' | grep '$pkgname' | head -n1 | sed 's|$_F_sourceforge_ext.*$||' | sed 's|^.*-||'" rodepends=('icewm' 'pyqt') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('c1f21bf78d8668c7a63ad3d99e5e838bfb52842a') build() { From ryuo at frugalware.org Wed Jun 4 04:06:06 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 04:06:07 2008 Subject: [Frugalware-git] frugalware-current: icebgset-1.3-1-x86_64 Message-ID: <20080604020606.89B921190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5fb41b75ab0692672fc676deeb48a6305f25d0fb commit 5fb41b75ab0692672fc676deeb48a6305f25d0fb Author: James Buren Date: Tue Jun 3 21:04:10 2008 -0500 icebgset-1.3-1-x86_64 * added x86_64 to archs diff --git a/source/xapps-extra/icebgset/FrugalBuild b/source/xapps-extra/icebgset/FrugalBuild index 54b4356..880c569 100644 --- a/source/xapps-extra/icebgset/FrugalBuild +++ b/source/xapps-extra/icebgset/FrugalBuild @@ -11,7 +11,7 @@ Finclude sourceforge depends=('qt' 'libstdc++' 'zlib' 'libgl' 'libglx' 'libxmu' 'libxi') rodepends=('icewm') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('89f7beda8a507fece845461fb8a2b40b1cfe29ea') build() From ryuo at frugalware.org Wed Jun 4 04:16:11 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 04:16:13 2008 Subject: [Frugalware-git] frugalware-current: xmix-2.1-1-x86_64 Message-ID: <20080604021611.7BD271190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0df91fd2280e12c4d0adb79d488238832f22929e commit 0df91fd2280e12c4d0adb79d488238832f22929e Author: James Buren Date: Tue Jun 3 21:14:19 2008 -0500 xmix-2.1-1-x86_64 * clean up diff --git a/source/xapps-extra/xmix/FrugalBuild b/source/xapps-extra/xmix/FrugalBuild deleted file mode 100644 index 6055bdc..0000000 --- a/source/xapps-extra/xmix/FrugalBuild +++ /dev/null @@ -1,25 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: James Buren - -pkgname=xmix -pkgver=2.1 -pkgrel=3 -pkgdesc="xaw program for configuring ALSA/OSS" -url="http://freshmeat.net/projects/xmix/" -depends=('libxaw' 'libxext' 'glibc' 'libsm') -groups=('xapps-extra' 'multimedia-extra') -archs=('i686') -up2date="Flasttar $url" -source=(http://freshmeat.net/redir/$pkgname/47834/url_bz2/$pkgname-$pkgver.tar.bz2) -sha1sums=('10b2afce4969d8887f3a5d6fa107e4820aa0309c') - -build() -{ - Fcd $pkgname - make clean || Fdie - make CCOPTIONS="-DNO_ASM $CFLAGS" || Fdie - Fexerel /usr/bin/xmix - Ffilerel /usr/share/xmix/XMix -} - -# optimization OK From ryuo at frugalware.org Wed Jun 4 04:18:51 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 04:18:53 2008 Subject: [Frugalware-git] frugalware-current: icecursorscfg-0.6-1-x86_64 Message-ID: <20080604021851.5BE781190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3c41ec59f7607e48eb551794c053106619e74d27 commit 3c41ec59f7607e48eb551794c053106619e74d27 Author: James Buren Date: Tue Jun 3 21:16:54 2008 -0500 icecursorscfg-0.6-1-x86_64 * added x86_64 to archs diff --git a/source/xapps-extra/icecursorscfg/FrugalBuild b/source/xapps-extra/icecursorscfg/FrugalBuild index f8a608a..cca5be9 100644 --- a/source/xapps-extra/icecursorscfg/FrugalBuild +++ b/source/xapps-extra/icecursorscfg/FrugalBuild @@ -11,7 +11,7 @@ Finclude sourceforge up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=80316&package_id=81964' | grep '$pkgname' | head -n1 | sed 's|$_F_sourceforge_ext.*$||' | sed 's|^.*-||'" rodepends=('icewm' 'pyqt') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('62bfd08d57e19df59a25191f50fa4427e2f80679') build() From ryuo at frugalware.org Wed Jun 4 04:21:05 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 04:21:06 2008 Subject: [Frugalware-git] frugalware-current: icecc-2.9-1-x86_64 Message-ID: <20080604022105.654601190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b96c58214bcb0eac48cb43b84ec034434e6088eb commit b96c58214bcb0eac48cb43b84ec034434e6088eb Author: James Buren Date: Tue Jun 3 21:19:06 2008 -0500 icecc-2.9-1-x86_64 * added x86_64 to archs diff --git a/source/xapps-extra/icecc/FrugalBuild b/source/xapps-extra/icecc/FrugalBuild index 37f3131..c7b9cf7 100644 --- a/source/xapps-extra/icecc/FrugalBuild +++ b/source/xapps-extra/icecc/FrugalBuild @@ -11,7 +11,7 @@ Finclude sourceforge depends=('qt' 'libstdc++' 'zlib' 'libgl' 'libglx' 'libxmu' 'libxi') rodepends=('icewm' 'icebgset' 'iceked' 'icemc' 'icets' 'icesndcfg' 'icecursorscfg' 'iceiconcvt' 'icemergeprefs' 'icewoed' 'gvim') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('acfdf16a71833e80ad2f1267cadf31297050e41d') build() From ryuo at frugalware.org Wed Jun 4 04:35:04 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 04:35:06 2008 Subject: [Frugalware-git] frugalware-current: glfw-2.6-1-x86_64 Message-ID: <20080604023504.4A9F31190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=08b84d3fe013584b4e60024ecf3c9155b9497580 commit 08b84d3fe013584b4e60024ecf3c9155b9497580 Author: James Buren Date: Tue Jun 3 21:33:05 2008 -0500 glfw-2.6-1-x86_64 * added x86_64 to archs diff --git a/source/x11-extra/glfw/FrugalBuild b/source/x11-extra/glfw/FrugalBuild index 9464fe2..045871a 100644 --- a/source/x11-extra/glfw/FrugalBuild +++ b/source/x11-extra/glfw/FrugalBuild @@ -9,7 +9,7 @@ depends=('libgl' 'libxrandr' 'glibc' 'libxdamage' 'mesa') _F_sourceforge_ext=".tar.bz2" Finclude sourceforge groups=('x11-extra') -archs=('i686') +archs=('i686' 'x86_64') _F_cd_path="$pkgname" sha1sums=('7b11e5a9d923c9826d4cc6eeeb441dc6940109c8') From ryuo at frugalware.org Wed Jun 4 04:41:30 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 04:41:41 2008 Subject: [Frugalware-git] frugalware-current: uips-1.0-1-x86_64 Message-ID: <20080604024130.6B4FF1190ACA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0f4c097d52a1d2801c8dfbd6925cc7ee9042477a commit 0f4c097d52a1d2801c8dfbd6925cc7ee9042477a Author: James Buren Date: Tue Jun 3 21:39:30 2008 -0500 uips-1.0-1-x86_64 * added x86_64 to archs diff --git a/source/apps-extra/uips/FrugalBuild b/source/apps-extra/uips/FrugalBuild index 362a4ad..0c03141 100644 --- a/source/apps-extra/uips/FrugalBuild +++ b/source/apps-extra/uips/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="A command-line based utility for creating and applying IPS patches." url="http://www.neillcorlett.com/uips/" depends=('glibc') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') # there is no package version, since there is only one release for this, ever. up2date="echo $pkgver" source=(http://www.neillcorlett.com/downloads/$pkgname.c \ From vmiklos at frugalware.org Wed Jun 4 09:47:19 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 4 09:47:22 2008 Subject: [Frugalware-git] frugalware-current: mako-0.2.0-1-i686 Message-ID: <20080604074719.76E881190ACA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2b2feaa9c62d0f9886122f16d24ab5415b9555c1 commit 2b2feaa9c62d0f9886122f16d24ab5415b9555c1 Author: Miklos Vajna Date: Wed Jun 4 09:40:00 2008 +0200 mako-0.2.0-1-i686 - version bump diff --git a/source/devel-extra/mako/FrugalBuild b/source/devel-extra/mako/FrugalBuild index de6d302..6654d8f 100644 --- a/source/devel-extra/mako/FrugalBuild +++ b/source/devel-extra/mako/FrugalBuild @@ -4,7 +4,7 @@ pkgname=mako _F_archive_name="Mako" -pkgver=0.1.10 +pkgver=0.2.0 pkgrel=1 pkgdesc="Mako is a template library written in Python." url="http://www.makotemplates.org" @@ -14,5 +14,5 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://pypi.python.org/packages/source/M/Mako/ |Flasttar" source=(http://pypi.python.org/packages/source/M/Mako/$_F_archive_name-$pkgver.tar.gz) -sha1sums=('d50ab35540a8df85853cb34be32b39a25f84786c') +sha1sums=('179a121a0142d0c98624e28a4f9d75696a299fa0') _F_makepkg_chkdep="python" From vmiklos at frugalware.org Wed Jun 4 09:47:19 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 4 09:47:24 2008 Subject: [Frugalware-git] frugalware-current: flowplayer-2.2.1-1-i686 Message-ID: <20080604074719.8419E1778001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2d9f3bfcd2a08a588ffd3831f14eaf1818346236 commit 2d9f3bfcd2a08a588ffd3831f14eaf1818346236 Author: Miklos Vajna Date: Wed Jun 4 09:44:00 2008 +0200 flowplayer-2.2.1-1-i686 - version bump diff --git a/source/network-extra/flowplayer/FrugalBuild b/source/network-extra/flowplayer/FrugalBuild index 49492b9..833f16d 100644 --- a/source/network-extra/flowplayer/FrugalBuild +++ b/source/network-extra/flowplayer/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=flowplayer -pkgver=2.2 +pkgver=2.2.1 pkgrel=1 pkgdesc="A video player for Flash Video in FLV format." _F_sourceforge_ext=".zip" @@ -12,14 +12,15 @@ depends=() groups=('network-extra') archs=('i686') source=($source README.Frugalware) -sha1sums=('eb05c11a86c4b9eeb70167c9888f4aa81daa6bea' \ +sha1sums=('b2065b9805157a8c01b5f2c582edbcf195af6f0c' \ '86374caf83972a7e93b1ce86ac29e94096a518ed') build() { Fcd flowplayer - Fmkdir /usr/share/$pkgname - # don't copy the html dir, it's unnecessary - cp * $Fdestdir/usr/share/$pkgname + Fmkdir /usr/share/ + Fcprel . /usr/share/$pkgname + # remove duplicated documentation + Frm usr/share/$pkgname/README.txt Fdoc README.Frugalware } From vmiklos at frugalware.org Wed Jun 4 09:47:19 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 4 09:47:25 2008 Subject: [Frugalware-git] frugalware-current: os-prober-1.26-1-i686 Message-ID: <20080604074719.9325E1788047@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0563cd96e239a8dcdfcabd838f30457f1a8e8516 commit 0563cd96e239a8dcdfcabd838f30457f1a8e8516 Author: Miklos Vajna Date: Wed Jun 4 09:45:25 2008 +0200 os-prober-1.26-1-i686 - version bump diff --git a/source/base/os-prober/FrugalBuild b/source/base/os-prober/FrugalBuild index f9ec512..7641007 100644 --- a/source/base/os-prober/FrugalBuild +++ b/source/base/os-prober/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=os-prober -pkgver=1.25 +pkgver=1.26 pkgrel=1 pkgdesc="Utility to detect other OSes on a set of drives." url="http://packages.debian.org/os-prober" @@ -13,7 +13,7 @@ Fpkgversep="_" up2date="lynx -dump http://ftp.debian.org/debian/pool/main/o/os-prober/|Flasttar" source=(http://ftp.debian.org/debian/pool/main/o/os-prober/os-prober_$pkgver.tar.gz \ os-prober-frugalware.diff) -sha1sums=('fdfedbb4d03fc669b9329fe990d72f0c9317d82c' \ +sha1sums=('b88cd955e8eca13be09b472a0ecdbbf051215ee6' \ 'f32a69a86bf8c03478a14f74d69d46d05e909615') build() From vmiklos at frugalware.org Wed Jun 4 09:47:19 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 4 09:47:25 2008 Subject: [Frugalware-git] frugalware-current: intltool-0.40.0-1-i686 Message-ID: <20080604074719.5E6391190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e3479eebdc88d725bfdb0f42c30e1d6ee9e12a68 commit e3479eebdc88d725bfdb0f42c30e1d6ee9e12a68 Author: Miklos Vajna Date: Wed Jun 4 09:39:10 2008 +0200 intltool-0.40.0-1-i686 - version bump diff --git a/source/devel/intltool/FrugalBuild b/source/devel/intltool/FrugalBuild index 80aca0f..d30845e 100644 --- a/source/devel/intltool/FrugalBuild +++ b/source/devel/intltool/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=intltool -pkgver=0.37.1 -pkgrel=2 +pkgver=0.40.0 +pkgrel=1 pkgdesc="Contains scripts and autoconf magic for internationalizing various kinds of data files." url="http://www.gnome.org/" depends=('perl' 'popt' 'expat' 'perl-xml-parser') @@ -11,4 +11,4 @@ groups=('devel') archs=('i686' 'x86_64') _F_gnome_devel=y Finclude gnome -sha1sums=('7aaa684177589fe321ceb863c3f6fc716e01dff2') +sha1sums=('493513b66d9006e7a6a6d2fafd1e0b6560db50cc') From vmiklos at frugalware.org Wed Jun 4 09:47:19 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 4 09:47:27 2008 Subject: [Frugalware-git] frugalware-current: qemu-0.9.1-4-i686 Message-ID: <20080604074719.A4B5B17880A4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bc4867d3f8f9ac0bc225ccfe1264ee03142663a6 commit bc4867d3f8f9ac0bc225ccfe1264ee03142663a6 Author: Miklos Vajna Date: Wed Jun 4 09:45:59 2008 +0200 qemu-0.9.1-4-i686 - url fix diff --git a/source/xapps-extra/qemu/FrugalBuild b/source/xapps-extra/qemu/FrugalBuild index 61cf279..ec93b1c 100644 --- a/source/xapps-extra/qemu/FrugalBuild +++ b/source/xapps-extra/qemu/FrugalBuild @@ -5,7 +5,7 @@ pkgname=qemu pkgver=0.9.1 pkgrel=4 pkgdesc="QEMU is a FAST! processor emulator" -url="http://fabrice.bellard.free.fr/qemu/" +url="http://bellard.org/qemu/" depends=('sdl' 'zlib' 'alsa-lib') makedepends=('gcc-3.3' 'texi2html') groups=('xapps-extra') From crazy at frugalware.org Wed Jun 4 11:24:29 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 4 11:24:30 2008 Subject: [Frugalware-git] frugalware-current: strigi-0.5.10-1-x86_64 Message-ID: <20080604092429.2257F1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5c3d5fb82498981f620bd0d8cfe588c6696a416e commit 5c3d5fb82498981f620bd0d8cfe588c6696a416e Author: crazy Date: Wed Jun 4 11:23:05 2008 +0200 strigi-0.5.10-1-x86_64 * Version bump diff --git a/source/apps-extra/strigi/FrugalBuild b/source/apps-extra/strigi/FrugalBuild index b28eea8..0a8b79b 100644 --- a/source/apps-extra/strigi/FrugalBuild +++ b/source/apps-extra/strigi/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=strigi -pkgver=0.5.8 +pkgver=0.5.10 pkgrel=1 pkgdesc="An advanced, desktop independent search daemon" depends=('bzip2' 'dbus' 'clucene' 'exiv2>=0.16' 'gamin') @@ -15,7 +15,7 @@ _F_cmake_confopts="-DENABLE_INOTIFY:BOOL=ON -DENABLE_FAM:BOOL=ON -DLIB_DESTINATI options=('scriptlet') Finclude sourceforge cmake source=(http://www.vandenoever.info/software/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('7505527bd6724e054602b8ab6d1417f2d9bc1a6e') +sha1sums=('02efd6bd7c815148fa9c9134287175b8aec0409b') ## TODO : Add missing optional depends subpkgs=("$pkgname-qt4-gui" "libstrigiqtdbusclient") From crazy at frugalware.org Wed Jun 4 11:33:59 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 4 11:34:00 2008 Subject: [Frugalware-git] frugalware-current: kpogre-1.6.6-1-x86_64 Message-ID: <20080604093359.0E0201190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=55f23b525ac8690823381e15d0330dda820b5aa0 commit 55f23b525ac8690823381e15d0330dda820b5aa0 Author: crazy Date: Wed Jun 4 11:31:01 2008 +0200 kpogre-1.6.6-1-x86_64 * Version bump diff --git a/source/kde-extra/kpogre/FrugalBuild b/source/kde-extra/kpogre/FrugalBuild index edd939f..b96231c 100644 --- a/source/kde-extra/kpogre/FrugalBuild +++ b/source/kde-extra/kpogre/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=kpogre -pkgver=1.6.4 +pkgver=1.6.6 pkgrel=1 pkgdesc="A grafical client for PostgreSQL database system for KDE." depends=('kdelibs>=3.5.9' 'libpqxx=2.6.9') @@ -11,7 +11,7 @@ archs=('i686' 'x86_64') _F_kde_defaults=0 Finclude sourceforge kde source=(${source[@]} desktop_file.patch) -sha1sums=('2e73743858244edb7a8864c57da687d2f61235cf' \ +sha1sums=('51a2c9303ff13d5552a639d63b8271c7da25a300' \ '7e714b084a7a1db28c9935070a0d5c8d7ccb95e3') # optimization OK From crazy at frugalware.org Wed Jun 4 11:34:50 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 4 11:34:52 2008 Subject: [Frugalware-git] frugalware-current: dnsmasq-2.42-1-x86_64 Message-ID: <20080604093450.C49E91190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b3c4293d74934b73d5a8bae1b591439274d101a5 commit b3c4293d74934b73d5a8bae1b591439274d101a5 Author: crazy Date: Wed Jun 4 11:34:08 2008 +0200 dnsmasq-2.42-1-x86_64 * Version bump diff --git a/source/network-extra/dnsmasq/FrugalBuild b/source/network-extra/dnsmasq/FrugalBuild index 453b717..d187729 100644 --- a/source/network-extra/dnsmasq/FrugalBuild +++ b/source/network-extra/dnsmasq/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: DNAku pkgname=dnsmasq -pkgver=2.41 +pkgver=2.42 pkgrel=1 pkgdesc="Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP server." url="http://thekelleys.org.uk/dnsmasq/doc.html" @@ -14,7 +14,7 @@ groups=('network-extra') up2date="lynx -dump http://www.thekelleys.org.uk/dnsmasq |grep 'LATEST'|sed 's/ //g'|sed 's/.].*//g'|sed 's/.*_//g'|sed -e '/^$/d'" source=(http://thekelleys.org.uk/dnsmasq/$pkgname-$pkgver.tar.gz \ rc.dnsmasq dnsmasq.conf makefile.patch) -sha1sums=('18ab4f28a3b9300a04f9a4db9cfc3a5d9bc46c55' \ +sha1sums=('85c371ab8951715fbdab01e337e5649705f0b221' \ '6d3cb198ff8aec2b5b7f1b51d4cb3cfd44c9d8fd' \ 'fd09fa99f453cf81e905e2de4da2137e8c3be3d4' \ 'b1e390905416f9f055ed28d2e5bbef7cfc6f38eb') From crazy at frugalware.org Wed Jun 4 11:36:38 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 4 11:36:38 2008 Subject: [Frugalware-git] frugalware-current: mutagen-1.14-1-x86_64 Message-ID: <20080604093638.15B581190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=579ce7dee68326acd0a075f823aca21485ed031a commit 579ce7dee68326acd0a075f823aca21485ed031a Author: crazy Date: Wed Jun 4 11:36:00 2008 +0200 mutagen-1.14-1-x86_64 * Version bump diff --git a/source/apps/mutagen/FrugalBuild b/source/apps/mutagen/FrugalBuild index d1f0b08..5f86763 100644 --- a/source/apps/mutagen/FrugalBuild +++ b/source/apps/mutagen/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=mutagen -pkgver=1.13 +pkgver=1.14 pkgrel=1 pkgdesc="Mutagen is an audio metadata tag reader and writer." url="http://www.sacredchao.net/quodlibet/wiki" @@ -11,4 +11,4 @@ groups=('apps') archs=('i686' 'x86_64') up2date="lynx -dump http://www.sacredchao.net/~piman/software|grep 'mutagen.*\.tar\.gz$'|sort -r -n|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" source=(http://www.sacredchao.net/~piman/software/$pkgname-$pkgver.tar.gz) -sha1sums=('e638edfa7251593171fac7b24be2b0602d17116c') +sha1sums=('0746b97468f8e8442329dc4fa162e0d4583e5ab6') From crazy at frugalware.org Wed Jun 4 11:39:47 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 4 11:39:48 2008 Subject: [Frugalware-git] frugalware-current: telepathy-glib-0.7.9-1-x86_64 Message-ID: <20080604093947.21E911190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3229375918b8ad9213e7041fab14f8d7bb50223b commit 3229375918b8ad9213e7041fab14f8d7bb50223b Author: crazy Date: Wed Jun 4 11:38:55 2008 +0200 telepathy-glib-0.7.9-1-x86_64 * Version bump diff --git a/source/lib-extra/telepathy-glib/FrugalBuild b/source/lib-extra/telepathy-glib/FrugalBuild index 74e942e..0561183 100644 --- a/source/lib-extra/telepathy-glib/FrugalBuild +++ b/source/lib-extra/telepathy-glib/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=telepathy-glib -pkgver=0.7.8 +pkgver=0.7.9 pkgrel=1 pkgdesc="A glib library to ease writing telepathy clients in glib." url="http://telepathy.freedesktop.org/wiki/" @@ -13,7 +13,6 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://telepathy.freedesktop.org/releases/telepathy-glib/ | Flasttar" source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -#signatures=(${source[0]}.asc) # no .asc for .12,.13 :s -sha1sums=('6aeea8821559142e58b8a27077156c3b3baffa5c') +sha1sums=('059cfdf7faae08f7b52a0615b4fbf7959e6cb467') # optimization OK From crazy at frugalware.org Wed Jun 4 11:43:18 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 4 11:43:19 2008 Subject: [Frugalware-git] frugalware-current: kiwi-1.9.22-1-x86_64 Message-ID: <20080604094318.4D3A51190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=07b3a86ff94848256257db26576196f24274b237 commit 07b3a86ff94848256257db26576196f24274b237 Author: crazy Date: Wed Jun 4 11:42:26 2008 +0200 kiwi-1.9.22-1-x86_64 * Version bump diff --git a/source/xlib-extra/kiwi/FrugalBuild b/source/xlib-extra/kiwi/FrugalBuild index 2634435..5511867 100644 --- a/source/xlib-extra/kiwi/FrugalBuild +++ b/source/xlib-extra/kiwi/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: BMH1980 pkgname=kiwi -pkgver=1.9.21 +pkgver=1.9.22 pkgrel=1 pkgdesc="A framework for Python applications with graphical user interfaces" url="http://www.async.com.br/projects/kiwi/" @@ -13,4 +13,4 @@ up2date="lynx -dump http://www.async.com.br/projects/kiwi/getit.html|grep -m1 'k groups=('xlib-extra') archs=('i686' 'x86_64') depends=('pygtk') -sha1sums=('49c7a45eac7e3f3ff9d77f7c6e9d79b6cc0e6326') +sha1sums=('b532854058167d6cca8ba8a89f646b114c608ecc') From crazy at frugalware.org Wed Jun 4 11:49:58 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 4 11:50:00 2008 Subject: [Frugalware-git] frugalware-current: pango-1.20.3-1-x86_64 Message-ID: <20080604094958.D11341190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=edfe00c4cb01f13baf9d94614503925a0c487e2d commit edfe00c4cb01f13baf9d94614503925a0c487e2d Author: crazy Date: Wed Jun 4 11:49:00 2008 +0200 pango-1.20.3-1-x86_64 * Version bump diff --git a/source/xlib/pango/FrugalBuild b/source/xlib/pango/FrugalBuild index 4f0ce3b..9553466 100644 --- a/source/xlib/pango/FrugalBuild +++ b/source/xlib/pango/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=pango -pkgver=1.20.2 +pkgver=1.20.3 pkgrel=1 pkgdesc="A library for layout and rendering of text" url="http://www.gtk.org/" @@ -12,7 +12,6 @@ makedepends=('gtk-doc' 'perl') archs=('i686' 'x86_64') Finclude gnome Fconfopts="$Fconfopts --enable-gtk-doc --enable-debug=minimum" -sha1sums=('269390ec18f0323d712c2b50cfc030d15236d4d2') -export CFLAGS="$CFLAGS -fno-strict-aliasing" +sha1sums=('bc4b12dd9cc8a963d796098a3708357237f3101f') # optimization OK From crazy at frugalware.org Wed Jun 4 12:08:59 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 4 12:09:01 2008 Subject: [Frugalware-git] frugalware-current: sdl_gfx-2.0.17-2-x86_64 Message-ID: <20080604100859.6E4231190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=325cf341745bdcc6d1dc6db45b400e1d4776bb99 commit 325cf341745bdcc6d1dc6db45b400e1d4776bb99 Author: crazy Date: Wed Jun 4 12:08:29 2008 +0200 sdl_gfx-2.0.17-2-x86_64 * disabled mmx for both archs , seems broken diff --git a/source/xlib/sdl_gfx/FrugalBuild b/source/xlib/sdl_gfx/FrugalBuild index fed9b77..3279a37 100644 --- a/source/xlib/sdl_gfx/FrugalBuild +++ b/source/xlib/sdl_gfx/FrugalBuild @@ -3,7 +3,7 @@ pkgname=sdl_gfx pkgver=2.0.17 -pkgrel=1 +pkgrel=2 pkgdesc="SDL library for graphics drawing primitives and other support functions." url="http://www.ferzkopp.net/mambo/index.php?option=com_content&task=view&id=14&Itemid=29" depends=('sdl') @@ -16,11 +16,9 @@ sha1sums=('7be52033ca8f014ee7761f6f298feac8336bfa5a') build() { - unset MAKEFLAGS ## weird works on 64bit but on 32bit =) Fcd SDL_gfx-$pkgver Fautoreconf - [ "${CARCH}" == "x86_64" ] && Fconfopts="$Fconfopts --disable-mmx" - Fbuild --libdir=/usr/lib --with-gnu-ld + Fbuild --libdir=/usr/lib --with-gnu-ld --disable-mmx } # optimization OK From crazy at frugalware.org Wed Jun 4 12:16:23 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 4 12:16:25 2008 Subject: [Frugalware-git] frugalware-current: gtk+2-2.12.10-1-x86_64 Message-ID: <20080604101623.C84A61190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=68d6dfd054448d080746c2b0701874f8e420d90d commit 68d6dfd054448d080746c2b0701874f8e420d90d Author: crazy Date: Wed Jun 4 12:12:50 2008 +0200 gtk+2-2.12.10-1-x86_64 * Version bump diff --git a/source/xlib/gtk+2/FrugalBuild b/source/xlib/gtk+2/FrugalBuild index 9902a77..4d38bfa 100644 --- a/source/xlib/gtk+2/FrugalBuild +++ b/source/xlib/gtk+2/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gtk+2 _F_gnome_name=gtk+ -pkgver=2.12.9 -pkgrel=2 +pkgver=2.12.10 +pkgrel=1 pkgdesc="The GTK+ Toolkit (2.x series)" depends=('libtiff' 'atk>=1.22.0' 'libxi' 'libxinerama' 'fontconfig' 'libjpeg' \ - 'pango>=1.20.2' 'cairo>=1.6.4' 'libxcursor' 'libxrandr' 'libsm' 'glib2>=2.16.3' \ + 'pango>=1.20.3' 'cairo>=1.6.4' 'libxcursor' 'libxrandr' 'libsm' 'glib2>=2.16.3' \ 'libcups' 'libx11' 'libtiff' 'libpng') rodepends=('gnome-icon-theme') groups=('xlib') @@ -18,8 +18,7 @@ url="http://www.gtk.org/" _F_cd_path="gtk+-$pkgver" source=($source \ gtk+-2.12.0-flash-workaround.patch \ - gtk+-2.12.0-openoffice-freeze-workaround.patch \ - gtk+-2.12.0-fix-tracker-issues.patch) + gtk+-2.12.0-openoffice-freeze-workaround.patch) subpkgs=("$pkgname-docs") subdescs=("GTK+2 Documentation") @@ -29,7 +28,7 @@ subarchs=('i686 x86_64') build() { - export CFLAGS="$CFLAGS -fno-strict-aliasing" + Fbuild \ --with-xinput=yes \ --enable-gtk-doc \ @@ -42,8 +41,7 @@ build() { Fsplit $pkgname-docs usr/share/gtk-doc } -sha1sums=('95e375f8478940a5b096845a9bff76004f265eba' \ +sha1sums=('03ba66925d3ef8509c2aa227cdb7b11c194055ee' \ '7db980e782a5b04d27bffb55e3dc0190ad22e118' \ - '783920d179ba0755ccab9186b6bff9f293828a96' \ - '3fb0332becafa55ce2daa14e4c15c3eb6c8ddc44') + '783920d179ba0755ccab9186b6bff9f293828a96') # optimization OK diff --git a/source/xlib/gtk+2/gtk+-2.12.0-fix-tracker-issues.patch b/source/xlib/gtk+2/gtk+-2.12.0-fix-tracker-issues.patch deleted file mode 100644 index c3c5065..0000000 --- a/source/xlib/gtk+2/gtk+-2.12.0-fix-tracker-issues.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- gtk/gtksearchenginetracker.c.orig 2007-09-22 09:48:10.580987152 +0200 -+++ gtk/gtksearchenginetracker.c 2007-09-22 18:32:27.693625839 +0200 -@@ -35,6 +35,7 @@ - - static TrackerClient * (*tracker_connect) (gboolean enable_warnings) = NULL; - static void (*tracker_disconnect) (TrackerClient *client) = NULL; -+static int (*tracker_get_version) (TrackerClient *client, GError **error) = NULL; - static void (*tracker_cancel_last_call) (TrackerClient *client) = NULL; - - static void (*tracker_search_metadata_by_text_async) (TrackerClient *client, -@@ -56,6 +57,7 @@ - #define MAP(a) { #a, (gpointer *)&a } - MAP (tracker_connect), - MAP (tracker_disconnect), -+ MAP (tracker_get_version), - MAP (tracker_cancel_last_call), - MAP (tracker_search_metadata_by_text_async), - MAP (tracker_search_metadata_by_text_and_location_async), -@@ -285,6 +287,7 @@ - { - GtkSearchEngineTracker *engine; - TrackerClient *tracker_client; -+ GError *err = NULL; - - open_libtracker (); - -@@ -296,6 +299,18 @@ - if (!tracker_client) - return NULL; - -+ if (!tracker_get_version) -+ return NULL; -+ -+ tracker_get_version (tracker_client, &err); -+ -+ if (err != NULL) -+ { -+ g_error_free (err); -+ tracker_disconnect (tracker_client); -+ return NULL; -+ } -+ - engine = g_object_new (GTK_TYPE_SEARCH_ENGINE_TRACKER, NULL); - - engine->priv->client = tracker_client; From ryuo at frugalware.org Wed Jun 4 12:23:45 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 12:23:48 2008 Subject: [Frugalware-git] frugalware-current: icewm-1.2.35-1-i686 Message-ID: <20080604102345.ED49A1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8e1c41efd0ed73745e0b6fd8045b6958a1c004ae commit 8e1c41efd0ed73745e0b6fd8045b6958a1c004ae Author: James Buren Date: Wed Jun 4 05:20:46 2008 -0500 icewm-1.2.35-1-i686 * taking over from vmiklos * moved to x11-extra diff --git a/source/x11-extra/icewm/FrugalBuild b/source/x11-extra/icewm/FrugalBuild new file mode 100644 index 0000000..8ec09df --- /dev/null +++ b/source/x11-extra/icewm/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 0.36 SBU +# Maintainer: James Buren + +pkgname=icewm +pkgver=1.2.35 +pkgrel=1 +pkgdesc="A window manager, whose goal is speed and simplicity." +pkgdesc_localized=('hu_HU Egy ablakkezel, melynek clja a sebessg s az egyszersg.') +depends=('libsm' 'libxinerama' 'libstdc++' 'imlib' 'libxft' 'libpng' 'libxrandr') +groups=('x11-extra') +archs=('i686' 'x86_64') +Finclude sourceforge +source=(${source[@]} xinitrc.icewm icewm.desktop) +sha1sums=('a0174901ca89aa091a58efedfec1536c5e477210' \ + '6149ed5fae01115186d6e55adedf5bfa0fde839a' \ + '39e0879b896572c1c448a243876857f89f946c24') + +build() +{ + Fmake --enable-shaped-decorations --enable-gradients --with-imlib + Fmakeinstall install-docs + Ffile /etc/X11/sessions/icewm.desktop + Fexe /etc/X11/xinit/xinitrc.icewm +} diff --git a/source/x11-extra/icewm/icewm.desktop b/source/x11-extra/icewm/icewm.desktop new file mode 100644 index 0000000..518a468 --- /dev/null +++ b/source/x11-extra/icewm/icewm.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=IceWM +Comment=A window manager, whose goal is speed and simplicity. +Exec=icewm-session +Icon= +Type=Application + diff --git a/source/x11-extra/icewm/xinitrc.icewm b/source/x11-extra/icewm/xinitrc.icewm new file mode 100644 index 0000000..5715560 --- /dev/null +++ b/source/x11-extra/icewm/xinitrc.icewm @@ -0,0 +1,29 @@ +#!/bin/sh +# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/usr/X11R6/lib/X11/xinit/.Xresources +sysmodmap=/usr/X11R6/lib/X11/xinit/.Xmodmap + +# merge in defaults and keymaps + +if [ -f $sysresources ]; then + xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f $userresources ]; then + xrdb -merge $userresources +fi + +if [ -f $usermodmap ]; then + xmodmap $usermodmap +fi + +# start some nice programs + +icewm-session From ryuo at frugalware.org Wed Jun 4 13:36:13 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 13:36:16 2008 Subject: [Frugalware-git] frugalware-current: optipng-0.5.5-1-i686 Message-ID: <20080604113613.C90B81190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1ee5e822e0fca0975e4a6bb2cff31cf6ef288177 commit 1ee5e822e0fca0975e4a6bb2cff31cf6ef288177 Author: James Buren Date: Wed Jun 4 06:33:58 2008 -0500 optipng-0.5.5-1-i686 * new package diff --git a/source/multimedia-extra/optipng/FrugalBuild b/source/multimedia-extra/optipng/FrugalBuild new file mode 100644 index 0000000..b50f962 --- /dev/null +++ b/source/multimedia-extra/optipng/FrugalBuild @@ -0,0 +1,31 @@ +# Compiling Time: 0.05 SBU +# Maintainer: James Buren + +pkgname=optipng +pkgver=0.5.5 +pkgrel=1 +pkgdesc="A PNG optimizer that tries to reduce the file size even further." +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +depends=('glibc') +makedepends=('groff') +groups=('multimedia-extra') +archs=('i686') +sha1sums=('670da3b01da903fa04886e4b6e625648570b3d9c') + +build() +{ + Fcd $pkgname-$pkgver/src + make -f scripts/gcc.mak CC="gcc $CFLAGS" || Fdie + Fexerel /usr/bin/optipng + cd .. || Fdie + Fdocrel LICENSE.txt + Fdocrel README.txt + Fdocrel doc/* + cd man || Fdie + make || Fdie + Fdocrel $pkgname.html + Ffilerel /usr/share/man/man1/$pkgname.1 +} + +# optimization OK From ryuo at frugalware.org Wed Jun 4 13:41:03 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 13:41:04 2008 Subject: [Frugalware-git] frugalware-current: icewm-1.2.35-1-i686 Message-ID: <20080604114103.73B0F1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b2cb29d78d74186fe17e0a30cf43f0ed3964fd6f commit b2cb29d78d74186fe17e0a30cf43f0ed3964fd6f Author: James Buren Date: Wed Jun 4 06:39:13 2008 -0500 icewm-1.2.35-1-i686 * clean up, delete old entry diff --git a/source/xlib/icewm/FrugalBuild b/source/xlib/icewm/FrugalBuild deleted file mode 100644 index 64df1dd..0000000 --- a/source/xlib/icewm/FrugalBuild +++ /dev/null @@ -1,24 +0,0 @@ -# Compiling Time: 0.36 SBU -# Maintainer: VMiklos - -pkgname=icewm -pkgver=1.2.35 -pkgrel=1 -pkgdesc="A window manager, whose goal is speed and simplicity." -pkgdesc_localized=('hu_HU Egy ablakkezel, melynek clja a sebessg s az egyszersg.') -depends=('libsm' 'libxinerama' 'libstdc++' 'imlib' 'libxft' 'libpng' 'libxrandr') -groups=('xlib') -archs=('i686' 'x86_64') -Finclude sourceforge -source=(${source[@]} xinitrc.icewm icewm.desktop) -sha1sums=('a0174901ca89aa091a58efedfec1536c5e477210' \ - '6149ed5fae01115186d6e55adedf5bfa0fde839a' \ - '39e0879b896572c1c448a243876857f89f946c24') - -build() -{ - Fmake --enable-shaped-decorations --enable-gradients --with-imlib - Fmakeinstall install-docs - Ffile /etc/X11/sessions/icewm.desktop - Fexe /etc/X11/xinit/xinitrc.icewm -} diff --git a/source/xlib/icewm/icewm.desktop b/source/xlib/icewm/icewm.desktop deleted file mode 100644 index 518a468..0000000 --- a/source/xlib/icewm/icewm.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=IceWM -Comment=A window manager, whose goal is speed and simplicity. -Exec=icewm-session -Icon= -Type=Application - diff --git a/source/xlib/icewm/xinitrc.icewm b/source/xlib/icewm/xinitrc.icewm deleted file mode 100644 index 5715560..0000000 --- a/source/xlib/icewm/xinitrc.icewm +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=/usr/X11R6/lib/X11/xinit/.Xresources -sysmodmap=/usr/X11R6/lib/X11/xinit/.Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f $userresources ]; then - xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - xmodmap $usermodmap -fi - -# start some nice programs - -icewm-session From ryuo at frugalware.org Wed Jun 4 13:46:48 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 13:46:49 2008 Subject: [Frugalware-git] frugalware-current: optipng-0.5.5-1-i686 Message-ID: <20080604114648.AA22B1778001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=da64f46a9da08d1835d129f17c4c5313d9cf9e76 commit da64f46a9da08d1835d129f17c4c5313d9cf9e76 Author: James Buren Date: Wed Jun 4 06:44:48 2008 -0500 optipng-0.5.5-1-i686 * added x86_64 to archs (I know it compiles) diff --git a/source/multimedia-extra/optipng/FrugalBuild b/source/multimedia-extra/optipng/FrugalBuild index b50f962..844a7f4 100644 --- a/source/multimedia-extra/optipng/FrugalBuild +++ b/source/multimedia-extra/optipng/FrugalBuild @@ -10,7 +10,7 @@ Finclude sourceforge depends=('glibc') makedepends=('groff') groups=('multimedia-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('670da3b01da903fa04886e4b6e625648570b3d9c') build() From ryuo at frugalware.org Wed Jun 4 13:57:47 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 13:57:48 2008 Subject: [Frugalware-git] frugalware-current: optipng-0.5.5-2-i686 Message-ID: <20080604115747.588A91190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5d958ca32db7dfc425999b54393013dd90c7f108 commit 5d958ca32db7dfc425999b54393013dd90c7f108 Author: James Buren Date: Wed Jun 4 06:55:32 2008 -0500 optipng-0.5.5-2-i686 * moved to apps-extra * some corrections to build diff --git a/source/apps-extra/optipng/FrugalBuild b/source/apps-extra/optipng/FrugalBuild new file mode 100644 index 0000000..af0c78f --- /dev/null +++ b/source/apps-extra/optipng/FrugalBuild @@ -0,0 +1,30 @@ +# Compiling Time: 0.05 SBU +# Maintainer: James Buren + +pkgname=optipng +pkgver=0.5.5 +pkgrel=2 +pkgdesc="A PNG optimizer that tries to reduce the file size even further." +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +depends=('glibc') +makedepends=('groff') +groups=('apps-extra') +archs=('i686' 'x86_64') +sha1sums=('670da3b01da903fa04886e4b6e625648570b3d9c') + +build() +{ + Fcd + make -C src -f scripts/gcc.mak CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || Fdie + Fexerel src/optipng /usr/bin/optipng + Fdocrel LICENSE.txt + Fdocrel README.txt + Fdocrel doc/* + cd man || Fdie + make || Fdie + Fdocrel $pkgname.html + Ffilerel /usr/share/man/man1/$pkgname.1 +} + +# optimization OK From ryuo at frugalware.org Wed Jun 4 14:00:22 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 14:00:25 2008 Subject: [Frugalware-git] frugalware-current: optipng-0.5.5-1-i686 Message-ID: <20080604120023.024AD1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=65996e8c2d0202c4b4def92dee4bb23cc66f9cf4 commit 65996e8c2d0202c4b4def92dee4bb23cc66f9cf4 Author: James Buren Date: Wed Jun 4 06:58:20 2008 -0500 optipng-0.5.5-1-i686 * clean up, gits acting wierd or i'm doing something wrong... diff --git a/source/multimedia-extra/optipng/FrugalBuild b/source/multimedia-extra/optipng/FrugalBuild deleted file mode 100644 index 844a7f4..0000000 --- a/source/multimedia-extra/optipng/FrugalBuild +++ /dev/null @@ -1,31 +0,0 @@ -# Compiling Time: 0.05 SBU -# Maintainer: James Buren - -pkgname=optipng -pkgver=0.5.5 -pkgrel=1 -pkgdesc="A PNG optimizer that tries to reduce the file size even further." -_F_sourceforge_broken_up2date=1 -Finclude sourceforge -depends=('glibc') -makedepends=('groff') -groups=('multimedia-extra') -archs=('i686' 'x86_64') -sha1sums=('670da3b01da903fa04886e4b6e625648570b3d9c') - -build() -{ - Fcd $pkgname-$pkgver/src - make -f scripts/gcc.mak CC="gcc $CFLAGS" || Fdie - Fexerel /usr/bin/optipng - cd .. || Fdie - Fdocrel LICENSE.txt - Fdocrel README.txt - Fdocrel doc/* - cd man || Fdie - make || Fdie - Fdocrel $pkgname.html - Ffilerel /usr/share/man/man1/$pkgname.1 -} - -# optimization OK From ryuo at frugalware.org Wed Jun 4 14:36:57 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 14:36:59 2008 Subject: [Frugalware-git] frugalware-current: wesnoth-1.4.2-1-i686 Message-ID: <20080604123657.553EB1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f05f9d7e3c3e86d87485c50fa946a3aaefdb96b commit 1f05f9d7e3c3e86d87485c50fa946a3aaefdb96b Author: James Buren Date: Wed Jun 4 07:31:46 2008 -0500 wesnoth-1.4.2-1-i686 * version bump * corrected some errors * added optipng to reduce PNG size some diff --git a/source/games-extra/wesnoth/FrugalBuild b/source/games-extra/wesnoth/FrugalBuild index 0271bf6..295e30f 100644 --- a/source/games-extra/wesnoth/FrugalBuild +++ b/source/games-extra/wesnoth/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix pkgname=wesnoth -pkgver=1.4.1 +pkgver=1.4.2 pkgrel=1 pkgdesc="Wesnoth is a turn based strategy game played in the fantasy world" depends=('sdl' 'sdlimage' 'sdl_net' 'sdl_mixer>=1.2.8' 'libpng' 'libjpeg' 'libogg' \ 'vorbis-tools' 'freetype2' 'python-tools' 'fribidi' 'libboost-mt>=1.35.0') -makedepends=('boost>=1.35.0') +makedepends=('boost>=1.35.0' 'optipng') groups=('games-extra') archs=('i686' 'x86_64') _F_sourceforge_ext=".tar.bz2" @@ -15,8 +15,8 @@ Finclude sourceforge url="http://www.wesnoth.org/" up2date="lynx -dump $url |grep 'Download Wesnoth' |grep stable|sed 's/.* \([^ ]*\) (.*/\1/;q'" Fconfopts="$Fconfopts --enable-server --enable-editor --enable-tools \ - --enable-campaing-server --with-kde --with-gnome \ - --with-fifodir=/var/run/wesnothd" -sha1sums=('41999a9ff01bc307952b29620733ec943404cf14') + --enable-campaign-server --with-kde --with-gnome \ + --with-fifodir=/var/run/wesnothd --enable-optipng" +sha1sums=('8dca4b1cb06ccc87a2bfbe6deeb632e2bcfe5740') # optimization OK From ryuo at frugalware.org Wed Jun 4 15:33:38 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 15:33:40 2008 Subject: [Frugalware-git] frugalware-current: barpanel-0.3.1-1-i686 Message-ID: <20080604133338.68A7B1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1d0276f1a967465a4bda351a753129bbb1967b60 commit 1d0276f1a967465a4bda351a753129bbb1967b60 Author: James Buren Date: Wed Jun 4 08:30:38 2008 -0500 barpanel-0.3.1-1-i686 * new package diff --git a/source/x11-extra/barpanel/FrugalBuild b/source/x11-extra/barpanel/FrugalBuild new file mode 100644 index 0000000..69ed2d8 --- /dev/null +++ b/source/x11-extra/barpanel/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=barpanel +pkgver=0.3.1 +pkgrel=1 +pkgdesc="A continuation of foopanel." +url="http://www.ossproject.org/projects/barpanel" +rodepends=('pygtk' 'pyxdg' 'gnome-python-desktop-wnck') +depends=('python') +groups=('x11-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url/download" +source=(http://www.ossproject.org/files/$pkgname/$pkgname-$pkgver.tar.gz) +sha1sums=('38cc3d8ab211d07d40d7fba2f145950e25571afd') From ryuo at frugalware.org Wed Jun 4 15:42:52 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 15:42:54 2008 Subject: [Frugalware-git] frugalware-current: barpanel-0.3.1-2-i686 Message-ID: <20080604134252.401AD1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aa7ba11ab994bdcfc0d8cc4cfa31e9802ca4368c commit aa7ba11ab994bdcfc0d8cc4cfa31e9802ca4368c Author: James Buren Date: Wed Jun 4 08:40:17 2008 -0500 barpanel-0.3.1-2-i686 * moved to gnome-extra diff --git a/source/gnome-extra/barpanel/FrugalBuild b/source/gnome-extra/barpanel/FrugalBuild new file mode 100644 index 0000000..bc34c26 --- /dev/null +++ b/source/gnome-extra/barpanel/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=barpanel +pkgver=0.3.1 +pkgrel=2 +pkgdesc="A continuation of foopanel." +url="http://www.ossproject.org/projects/barpanel" +rodepends=('pygtk' 'pyxdg' 'gnome-python-desktop-wnck') +depends=('python') +groups=('gnome-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url/download" +source=(http://www.ossproject.org/files/$pkgname/$pkgname-$pkgver.tar.gz) +sha1sums=('38cc3d8ab211d07d40d7fba2f145950e25571afd') From ryuo at frugalware.org Wed Jun 4 15:44:37 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 15:44:39 2008 Subject: [Frugalware-git] frugalware-current: barpanel-0.3.1-2-i686 Message-ID: <20080604134437.767DF1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4b23f522715ec2c01e2d3b1a872e36df9a574799 commit 4b23f522715ec2c01e2d3b1a872e36df9a574799 Author: James Buren Date: Wed Jun 4 08:42:41 2008 -0500 barpanel-0.3.1-2-i686 * clean up (the usual) diff --git a/source/x11-extra/barpanel/FrugalBuild b/source/x11-extra/barpanel/FrugalBuild deleted file mode 100644 index 69ed2d8..0000000 --- a/source/x11-extra/barpanel/FrugalBuild +++ /dev/null @@ -1,15 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: James Buren - -pkgname=barpanel -pkgver=0.3.1 -pkgrel=1 -pkgdesc="A continuation of foopanel." -url="http://www.ossproject.org/projects/barpanel" -rodepends=('pygtk' 'pyxdg' 'gnome-python-desktop-wnck') -depends=('python') -groups=('x11-extra') -archs=('i686' 'x86_64') -up2date="Flasttar $url/download" -source=(http://www.ossproject.org/files/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('38cc3d8ab211d07d40d7fba2f145950e25571afd') From devil505linux at gmail.com Wed Jun 4 19:59:33 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Jun 4 19:59:35 2008 Subject: [Frugalware-git] frugalware-current: guake-0.2.2-1-i686 Message-ID: <20080604175933.BB0EF1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d3f4c76b31b83eb902df2939613006a2c44ba347 commit d3f4c76b31b83eb902df2939613006a2c44ba347 Author: Devil505 Date: Wed Jun 4 19:14:36 2008 +0200 guake-0.2.2-1-i686 * version bump diff --git a/source/gnome-extra/guake/FrugalBuild b/source/gnome-extra/guake/FrugalBuild index 947b8e5..796cad2 100644 --- a/source/gnome-extra/guake/FrugalBuild +++ b/source/gnome-extra/guake/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Devil505 pkgname=guake -pkgver=0.1 -pkgrel=6 +pkgver=0.2.2 +pkgrel=1 pkgdesc="Guake is a drop-down terminal for Gnome Desktop Environment" url='http://guake-terminal.org' -depends=('python' 'gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' 'libxext' 'libxml2' 'notify-python' 'gnome-python') -rodepends=('vte-python' 'notification-daemon') +depends=('python' 'gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' 'libxext' 'libxml2' 'notify-python' 'gnome-python' 'vte-python') +rodepends=('notification-daemon') makedepends=('perl-xml-parser' 'gconf') options=('scriptlet') _F_gnome_desktop="y" @@ -16,6 +16,6 @@ Finclude gnome-scriptlet groups=('gnome-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download | Flasttar" -source=($url/releases/0.1-alpha/$pkgname-$pkgver.tar.gz) -sha1sums=('0e76695fe4c6f3da77e49a730e72b21979235540') +source=($url/releases/$pkgname-$pkgver.tar.gz) +sha1sums=('0b5d5321cd6abb6b2d24e7a9002e115f11fd4410') # optimization OK From boobaa at frugalware.org Wed Jun 4 20:16:58 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Wed Jun 4 20:17:01 2008 Subject: [Frugalware-git] frugalware-current: perl-mail-dkim-0.32-1-i686 Message-ID: <20080604181658.C941D1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=67bf53450d3a7349492923d6fd8e1ac498b20091 commit 67bf53450d3a7349492923d6fd8e1ac498b20091 Author: CSCSY Lszl Date: Wed Jun 4 20:16:00 2008 +0200 perl-mail-dkim-0.32-1-i686 version bump diff --git a/source/devel-extra/perl-mail-dkim/FrugalBuild b/source/devel-extra/perl-mail-dkim/FrugalBuild index bbf7ff9..15f62c9 100644 --- a/source/devel-extra/perl-mail-dkim/FrugalBuild +++ b/source/devel-extra/perl-mail-dkim/FrugalBuild @@ -3,10 +3,10 @@ _F_perl_name=Mail-DKIM _F_perl_author=J/JA/JASLONG -pkgver=0.31 +pkgver=0.32 pkgrel=1 pkgdesc="Signs/verifies Internet mail with DKIM/DomainKey signatures" depends=('perl-crypt-openssl-rsa>=0.24' 'perl-digest-sha1' 'perl-mailtools' 'perl-net-dns') Finclude perl archs=('i686' 'x86_64') -sha1sums=('7439dcefb184c93ee25747ac76cbb192745a29e4') +sha1sums=('5c9220754823f4aa7ab219732073f2bcfbb884e8') From boobaa at frugalware.org Wed Jun 4 20:20:42 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Wed Jun 4 20:20:48 2008 Subject: [Frugalware-git] frugalware-current: drupal-filefield-5.x_2.3-1-i686 Message-ID: <20080604182042.40EAB1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4e893ffb88e7e06f5ed9dacd3bc683b9009d12a0 commit 4e893ffb88e7e06f5ed9dacd3bc683b9009d12a0 Author: CSCSY Lszl Date: Wed Jun 4 20:20:33 2008 +0200 drupal-filefield-5.x_2.3-1-i686 version bump diff --git a/source/network-extra/drupal-filefield/FrugalBuild b/source/network-extra/drupal-filefield/FrugalBuild index ab3104e..e9fc163 100644 --- a/source/network-extra/drupal-filefield/FrugalBuild +++ b/source/network-extra/drupal-filefield/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: CSCSY Lszl _F_drupal_module=filefield -pkgver=5.x_2.3_rc3 +pkgver=5.x_2.3 pkgrel=1 pkgdesc="Provides a generic file upload field for Drupal's content.module (CCK)." rodepends=('drupal-cck' 'drupal-mimedetect') Finclude drupal -sha1sums=('7a948c14f853b358ba2fc0ff7d4341a65e9b2f1c') +sha1sums=('815e640765679e904616db6548ee1a034a0653c6') From voroskoi at frugalware.org Wed Jun 4 20:46:00 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 4 20:46:01 2008 Subject: [Frugalware-git] frugalware-current: scons-0.98.4-1-i686 Message-ID: <20080604184600.3055F1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7120b98086b86f49e06b2649ba1aa940721641f7 commit 7120b98086b86f49e06b2649ba1aa940721641f7 Author: voroskoi Date: Wed Jun 4 20:45:48 2008 +0200 scons-0.98.4-1-i686 version bump diff --git a/source/devel-extra/scons/FrugalBuild b/source/devel-extra/scons/FrugalBuild index 159d85a..9c9960e 100644 --- a/source/devel-extra/scons/FrugalBuild +++ b/source/devel-extra/scons/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=scons -pkgver=0.98.3 +pkgver=0.98.4 pkgrel=1 pkgdesc="SCons is an Open Source software construction tool, a next-generation build tool." _F_sourceforge_broken_up2date=1 @@ -12,4 +12,4 @@ url="http://www.scons.org/" depends=('python') groups=('devel-extra') archs=('i686' 'x86_64') -sha1sums=('0378dee14ace1601fce881a35d109115d3c6a014') +sha1sums=('b61764fe6fc7562f5034b71885323604cd6c74f5') From voroskoi at frugalware.org Wed Jun 4 20:51:16 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 4 20:51:17 2008 Subject: [Frugalware-git] frugalware-current: libassuan-1.0.5-1-i686 Message-ID: <20080604185117.004C41190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1a4fe508ef92119d44359a31103bd9db278024a5 commit 1a4fe508ef92119d44359a31103bd9db278024a5 Author: voroskoi Date: Wed Jun 4 20:50:51 2008 +0200 libassuan-1.0.5-1-i686 version bump diff --git a/source/lib/libassuan/FrugalBuild b/source/lib/libassuan/FrugalBuild index 34df763..d43e87e 100644 --- a/source/lib/libassuan/FrugalBuild +++ b/source/lib/libassuan/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: voroskoi pkgname=libassuan -pkgver=1.0.4 -pkgrel=2 +pkgver=1.0.5 +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 ;-) From voroskoi at frugalware.org Wed Jun 4 20:55:35 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 4 20:55:36 2008 Subject: [Frugalware-git] frugalware-current: c-ares-1.5.2-1-i686 Message-ID: <20080604185535.D7D3B1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ccbee4e928a04c5d60b4cab9a797bc004cb9ff48 commit ccbee4e928a04c5d60b4cab9a797bc004cb9ff48 Author: voroskoi Date: Wed Jun 4 20:55:23 2008 +0200 c-ares-1.5.2-1-i686 version bump diff --git a/source/lib/c-ares/FrugalBuild b/source/lib/c-ares/FrugalBuild index 385dbfd..858d091 100644 --- a/source/lib/c-ares/FrugalBuild +++ b/source/lib/c-ares/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=c-ares -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=1 pkgdesc="C library that performs DNS requests and name resolves asynchronously." url="http://daniel.haxx.se/projects/c-ares/" From voroskoi at frugalware.org Wed Jun 4 21:00:19 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 4 21:00:21 2008 Subject: [Frugalware-git] frugalware-current: sip-4.7.6-1-i686 Message-ID: <20080604190019.5216B1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f5b035fc5f3a35f4f71bfa39ea1d730c4cc44786 commit f5b035fc5f3a35f4f71bfa39ea1d730c4cc44786 Author: voroskoi Date: Wed Jun 4 21:00:08 2008 +0200 sip-4.7.6-1-i686 version bump diff --git a/source/xlib/sip/FrugalBuild b/source/xlib/sip/FrugalBuild index 9ee72b7..709072d 100644 --- a/source/xlib/sip/FrugalBuild +++ b/source/xlib/sip/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=sip -pkgver=4.7.5 +pkgver=4.7.6 pkgrel=1 pkgdesc="SIP is a tool that makes it very easy to create Python bindings for C and C++ libraries" url="http://www.riverbankcomputing.co.uk/software/sip/intro" @@ -11,6 +11,7 @@ groups=('xlib') archs=('i686' 'x86_64') up2date="lynx -dump http://www.riverbankcomputing.co.uk/software/sip/download |grep -v snapshot |Flasttar" source=(http://www.riverbankcomputing.co.uk/static/Downloads/sip4/$pkgname-$pkgver.tar.gz) +sha1sums=('8ae089513744c394e502e258b428780260e39cda') options=('scriptlet') build() @@ -21,6 +22,5 @@ build() Fsed "CFLAGS = -pipe -fPIC -O2 -w" "CFLAGS = $CFLAGS -fPIC -w" siplib/Makefile Fbuild } -sha1sums=('ef9a3e3665a064bffe931f547bdf285129029ebe') # optimization OK From voroskoi at frugalware.org Wed Jun 4 21:01:28 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 4 21:01:30 2008 Subject: [Frugalware-git] frugalware-current: chicken-3.2.5-1-x86_64 Message-ID: <20080604190128.448651190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0b822f4054bfc89994dce41ed1f74cfda4f98634 commit 0b822f4054bfc89994dce41ed1f74cfda4f98634 Author: voroskoi Date: Wed Jun 4 21:01:08 2008 +0200 chicken-3.2.5-1-x86_64 version bump diff --git a/source/devel-extra/chicken/FrugalBuild b/source/devel-extra/chicken/FrugalBuild index 5e5b350..2e62004 100644 --- a/source/devel-extra/chicken/FrugalBuild +++ b/source/devel-extra/chicken/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=chicken -pkgver=3.2.1 +pkgver=3.2.5 pkgrel=1 pkgdesc="A compiler for Scheme, which produces portable, efficient C." url="http://www.call-with-current-continuation.org/" @@ -12,7 +12,7 @@ groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://chicken.wiki.br/dev-snapshots/current/ |Flasttar" source=(http://chicken.wiki.br/dev-snapshots/current/$pkgname-$pkgver.tar.gz) -sha1sums=('bb846036fec43e21d2a9812988239206cc667267') +sha1sums=('4a75c6ae30ee18fa6f05a365d1a1aab141d972ca') build() { unset MAKEFLAGS From voroskoi at frugalware.org Wed Jun 4 21:10:14 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 4 21:10:16 2008 Subject: [Frugalware-git] frugalware-current: ruby-bdb-0.6.3-1-i686 Message-ID: <20080604191014.AC8891190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4f52e3e27aa1185474eed09483f8d9e6b41080b3 commit 4f52e3e27aa1185474eed09483f8d9e6b41080b3 Author: voroskoi Date: Wed Jun 4 21:08:59 2008 +0200 ruby-bdb-0.6.3-1-i686 version bump diff --git a/source/devel-extra/ruby-bdb/FrugalBuild b/source/devel-extra/ruby-bdb/FrugalBuild index 82f64af..eceb1cd 100644 --- a/source/devel-extra/ruby-bdb/FrugalBuild +++ b/source/devel-extra/ruby-bdb/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=ruby-bdb -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=1 pkgdesc="This is an interface to Berkeley DB for Ruby." url="http://moulon.inra.fr/ruby/bdb.html" @@ -13,7 +13,7 @@ _F_archive_name="bdb" _F_archive_nosort=1 up2date="lynx -dump ftp://moulon.inra.fr/pub/ruby/ |Flasttar" source=(ftp://moulon.inra.fr/pub/ruby/bdb-${pkgver}.tar.gz) -sha1sums=('7be3dfbc5d8769780f6c7a405819d189317c855e') +sha1sums=('61eeae1523f5117dcbc68aa2fbba8ee9c2a99863') _F_cd_path="bdb-${pkgver}" # optimization OK From voroskoi at frugalware.org Wed Jun 4 21:14:06 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 4 21:14:08 2008 Subject: [Frugalware-git] frugalware-current: pyrex-0.9.8.2-1-i686 Message-ID: <20080604191406.82AD21190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b18a882fef4de81db75124f133061419c9fab76f commit b18a882fef4de81db75124f133061419c9fab76f Author: voroskoi Date: Wed Jun 4 21:13:53 2008 +0200 pyrex-0.9.8.2-1-i686 version bump diff --git a/source/devel-extra/pyrex/FrugalBuild b/source/devel-extra/pyrex/FrugalBuild index 2db7623..ee16284 100644 --- a/source/devel-extra/pyrex/FrugalBuild +++ b/source/devel-extra/pyrex/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=pyrex -pkgver=0.9.7.2 +pkgver=0.9.8.2 pkgrel=1 pkgextraver= pkgdesc="A language for writing Python extension modules" @@ -13,7 +13,7 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep tar |sed -ne 's/.*-\(.*\).ta.*/\1/;1p' -e s/$pkgextraver//" source=($url/Pyrex-$pkgver$pkgextraver.tar.gz) -sha1sums=('4a05b03e764cbe09d6da0cf8707252c1623f5a5d') +sha1sums=('eabb373ebaf11891e76328fa29181572d8e0c8f3') build() { From voroskoi at frugalware.org Wed Jun 4 21:19:20 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 4 21:19:22 2008 Subject: [Frugalware-git] frugalware-current: awesome-2.3.1-1-i686 Message-ID: <20080604191920.577FD1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ab7b6bf5e48f4cf5e4fd2ac8e1b93461800a4efa commit ab7b6bf5e48f4cf5e4fd2ac8e1b93461800a4efa Author: voroskoi Date: Wed Jun 4 21:19:06 2008 +0200 awesome-2.3.1-1-i686 version bump diff --git a/source/x11-extra/awesome/FrugalBuild b/source/x11-extra/awesome/FrugalBuild index 98485bd..54d5b43 100644 --- a/source/x11-extra/awesome/FrugalBuild +++ b/source/x11-extra/awesome/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=awesome -pkgver=2.3 +pkgver=2.3.1 pkgrel=1 pkgdesc="awesome is a floating and tiling window manager initialy based on a dwm code rewriting." url="http://awesome.naquadah.org/" @@ -12,6 +12,6 @@ groups=('x11-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://awesome.naquadah.org/download/ |Flasttar" source=(http://awesome.naquadah.org/download/awesome-${pkgver}.tar.bz2) -sha1sums=('7d05a1e03db878f2232f8279fd3af55487674fd3') +sha1sums=('d116c9c3c6109ce0b11d16a20ee3b334032b4bab') # optimization OK From voroskoi at frugalware.org Wed Jun 4 21:23:04 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 4 21:23:05 2008 Subject: [Frugalware-git] frugalware-current: fbdesk-1.4.1-1-i686 Message-ID: <20080604192304.763941190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=48394171cfcb1a6fd7edbdb542bf2d391f1d4ada commit 48394171cfcb1a6fd7edbdb542bf2d391f1d4ada Author: voroskoi Date: Wed Jun 4 21:22:53 2008 +0200 fbdesk-1.4.1-1-i686 up2date fix diff --git a/source/x11-extra/fbdesk/FrugalBuild b/source/x11-extra/fbdesk/FrugalBuild index d950eab..a146c1b 100644 --- a/source/x11-extra/fbdesk/FrugalBuild +++ b/source/x11-extra/fbdesk/FrugalBuild @@ -11,7 +11,7 @@ depends=('libxpm' 'libxft' 'imlib2' 'libstdc++') makedepends=('xextproto' 'inputproto') groups=('x11-extra') archs=('i686' 'x86_64') -up2date="lynx -dump 'http://www.fluxbox.org/fbdesk/'|grep tar.gz$|sed -ne 's/.*k-\(.*\)\.t.*/\1/;1 p'" +up2date="lynx -dump http://fluxbox.sourceforge.net/fbdesk/|Flasttar" source=(http://www.fluxbox.org/download/$pkgname-$pkgver.tar.gz) sha1sums=('b5a2f446fa27406d9adb9a9608f1dc3c638d37ff') From voroskoi at frugalware.org Wed Jun 4 21:30:11 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 4 21:30:11 2008 Subject: [Frugalware-git] frugalware-current: fbpager-0.1.4-4-i686 Message-ID: <20080604193011.09DAC1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9f7b437ff395ae43928b928b82cb574b9171796c commit 9f7b437ff395ae43928b928b82cb574b9171796c Author: voroskoi Date: Wed Jun 4 21:26:13 2008 +0200 fbpager-0.1.4-4-i686 up2date fix diff --git a/source/x11-extra/fbpager/FrugalBuild b/source/x11-extra/fbpager/FrugalBuild index 1c1c0ac..72f4daa 100644 --- a/source/x11-extra/fbpager/FrugalBuild +++ b/source/x11-extra/fbpager/FrugalBuild @@ -12,7 +12,7 @@ depends=('libsm' 'libxrender' 'libstdc++') rodepends=('fluxbox') groups=('x11-extra') archs=('i686' 'x86_64') -up2date="lynx -dump ${url} |grep tar.gz$ |sed 's/.*-\(.*\).t.*/\1/'" +up2date="lynx -dump http://fluxbox.sourceforge.net/fbpager/ |Flasttar" source=(http://www.fluxbox.org/download/$pkgname-$pkgver.tar.gz g++-4.1_namespace.patch) sha1sums=('73415dd7911f24e338b2b1bfc43f4aeb53daa5b2' \ '0182937480fd7c0511217736c3e43ab129eaa01d') From voroskoi at frugalware.org Wed Jun 4 21:33:36 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 4 21:33:38 2008 Subject: [Frugalware-git] frugalware-current: unrar-3.8.1-1-i686 Message-ID: <20080604193336.A95651190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c44001b3d3755d971a7d6239589ae02cf651e16b commit c44001b3d3755d971a7d6239589ae02cf651e16b Author: voroskoi Date: Wed Jun 4 21:33:24 2008 +0200 unrar-3.8.1-1-i686 version bump diff --git a/source/apps-extra/unrar/FrugalBuild b/source/apps-extra/unrar/FrugalBuild index 7a9a7b0..670982d 100644 --- a/source/apps-extra/unrar/FrugalBuild +++ b/source/apps-extra/unrar/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=unrar -pkgver=3.7.8 +pkgver=3.8.1 pkgrel=1 pkgdesc="Uncompress rar files" url="http://www.rarlab.com/" @@ -20,7 +20,7 @@ build() { make -f makefile.unix || Fdie Fexerel /usr/bin/unrar } -sha1sums=('b2146b8021274cd6a0a3b816b2ec6f241c62baea' \ +sha1sums=('63dc8edb4ae7e9fa904a0b0e267d9a89d1074abb' \ '265050fcbedceafba4ad8aff1cfc4390954e4203') # optimization OK From bouleetbil at frogdev.info Wed Jun 4 21:40:48 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jun 4 21:40:49 2008 Subject: [Frugalware-git] frugalware-current: buzztard-0.3.0-1-i686 Message-ID: <20080604194048.4B82A1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d6bd1be701396e799f12ef2347ab7eab9f21ceda commit d6bd1be701396e799f12ef2347ab7eab9f21ceda Author: bouleetbil Date: Wed Jun 4 21:33:31 2008 +0200 buzztard-0.3.0-1-i686 * new package diff --git a/source/xapps-extra/buzztard/FrugalBuild b/source/xapps-extra/buzztard/FrugalBuild new file mode 100644 index 0000000..56a309f --- /dev/null +++ b/source/xapps-extra/buzztard/FrugalBuild @@ -0,0 +1,29 @@ +# Compiling Time: 0.87 SBU +# Maintainer: bouleetbil + +pkgname=buzztard +pkgver=0.3.0 +pkgrel=1 +pkgdesc="It is a music production environment" +depends=('gstreamer' 'gst-plugins-base' 'gst-plugins-good' \ + 'gst-plugins-ugly-mad' 'gst-plugins-base-oil' 'gst-plugins-base-ogg' \ + 'gtk+2' 'atk' 'pango' 'libgnomecanvas' 'gnome-vfs' \ + 'gst-buzztard' 'bml') +makedepends=('perl-xml-parser') +groups=('xapps-extra') +options=('scriptlet') +archs=('i686') +_F_gnome_iconcache="y" +_F_gnome_desktop="y" +_F_gnome_schemas=('/etc/gconf/schemas/buzztard.schemas') +Finclude sourceforge gnome-scriptlet +url="http://www.buzztard.org" +sha1sums=('17a9871f9b5fc6bc9396b4effb3007dd4ea22e46') + +build() { + Fbuild + Fbuild_gnome_scriptlet + Frm "usr/share/mime" +} + +# optimization OK From voroskoi at frugalware.org Wed Jun 4 21:46:05 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 4 21:46:09 2008 Subject: [Frugalware-git] frugalware-current: lftp-3.7.3-1-i686 Message-ID: <20080604194605.DA8F81190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1eeec545618edf64ff63e8cef5e90b21cff67313 commit 1eeec545618edf64ff63e8cef5e90b21cff67313 Author: voroskoi Date: Wed Jun 4 21:45:47 2008 +0200 lftp-3.7.3-1-i686 version bump diff --git a/source/network-extra/lftp/FrugalBuild b/source/network-extra/lftp/FrugalBuild index c6a798c..68e5bf4 100644 --- a/source/network-extra/lftp/FrugalBuild +++ b/source/network-extra/lftp/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=lftp -pkgver=3.7.1 +pkgver=3.7.3 pkgrel=1 pkgdesc="A sophisticated ftp/http client, file transfer program" url="http://lftp.yar.ru/" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') backup=('etc/lftp.conf') up2date="lynx -dump $url |grep released|sed -ne 's/.*p-\(.*\) r.*/\1/' -e '1 p'" source=(http://ftp.yars.free.net/pub/source/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('c0443a2a258731eae63045c3d204518f5d8fde37') +sha1sums=('0f212eccd4deb71660bc44785e42a36c10edfd32') # optimization OK From bouleetbil at frogdev.info Wed Jun 4 21:56:36 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jun 4 21:56:38 2008 Subject: [Frugalware-git] frugalware-current: buzztard-0.3.0-1-i686 Message-ID: <20080604195636.3D71F1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b19331baeb90bfd5f1810ed86ee97652bdd5a5d7 commit b19331baeb90bfd5f1810ed86ee97652bdd5a5d7 Author: bouleetbil Date: Wed Jun 4 21:49:42 2008 +0200 buzztard-0.3.0-1-i686 * moved to gnome-extra diff --git a/source/gnome-extra/buzztard/FrugalBuild b/source/gnome-extra/buzztard/FrugalBuild new file mode 100644 index 0000000..5608481 --- /dev/null +++ b/source/gnome-extra/buzztard/FrugalBuild @@ -0,0 +1,29 @@ +# Compiling Time: 0.87 SBU +# Maintainer: bouleetbil + +pkgname=buzztard +pkgver=0.3.0 +pkgrel=1 +pkgdesc="It is a music production environment" +depends=('gstreamer' 'gst-plugins-base' 'gst-plugins-good' \ + 'gst-plugins-ugly-mad' 'gst-plugins-base-oil' 'gst-plugins-base-ogg' \ + 'gtk+2' 'atk' 'pango' 'libgnomecanvas' 'gnome-vfs' \ + 'gst-buzztard' 'bml') +makedepends=('perl-xml-parser') +groups=('gnome-extra') +options=('scriptlet') +archs=('i686') +_F_gnome_iconcache="y" +_F_gnome_desktop="y" +_F_gnome_schemas=('/etc/gconf/schemas/buzztard.schemas') +Finclude sourceforge gnome-scriptlet +url="http://www.buzztard.org" +sha1sums=('17a9871f9b5fc6bc9396b4effb3007dd4ea22e46') + +build() { + Fbuild + Fbuild_gnome_scriptlet + Frm "usr/share/mime" +} + +# optimization OK diff --git a/source/xapps-extra/buzztard/FrugalBuild b/source/xapps-extra/buzztard/FrugalBuild deleted file mode 100644 index 56a309f..0000000 --- a/source/xapps-extra/buzztard/FrugalBuild +++ /dev/null @@ -1,29 +0,0 @@ -# Compiling Time: 0.87 SBU -# Maintainer: bouleetbil - -pkgname=buzztard -pkgver=0.3.0 -pkgrel=1 -pkgdesc="It is a music production environment" -depends=('gstreamer' 'gst-plugins-base' 'gst-plugins-good' \ - 'gst-plugins-ugly-mad' 'gst-plugins-base-oil' 'gst-plugins-base-ogg' \ - 'gtk+2' 'atk' 'pango' 'libgnomecanvas' 'gnome-vfs' \ - 'gst-buzztard' 'bml') -makedepends=('perl-xml-parser') -groups=('xapps-extra') -options=('scriptlet') -archs=('i686') -_F_gnome_iconcache="y" -_F_gnome_desktop="y" -_F_gnome_schemas=('/etc/gconf/schemas/buzztard.schemas') -Finclude sourceforge gnome-scriptlet -url="http://www.buzztard.org" -sha1sums=('17a9871f9b5fc6bc9396b4effb3007dd4ea22e46') - -build() { - Fbuild - Fbuild_gnome_scriptlet - Frm "usr/share/mime" -} - -# optimization OK From devil505linux at gmail.com Wed Jun 4 22:12:53 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Jun 4 22:12:55 2008 Subject: [Frugalware-git] frugalware-current: adonthell-0.3.5-1-i686 Message-ID: <20080604201253.E0E621190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d9fb26898b8bf87f146392ee9f5eecba43bf1c9a commit d9fb26898b8bf87f146392ee9f5eecba43bf1c9a Author: Devil505 Date: Wed Jun 4 22:12:32 2008 +0200 adonthell-0.3.5-1-i686 * version bump diff --git a/source/games-extra/adonthell/FrugalBuild b/source/games-extra/adonthell/FrugalBuild index 915d50a..f71c276 100644 --- a/source/games-extra/adonthell/FrugalBuild +++ b/source/games-extra/adonthell/FrugalBuild @@ -3,29 +3,15 @@ pkgname=adonthell _F_archive_name=$pkgname-src -pkgver=0.3.4a +pkgver=0.3.5 pkgrel=1 pkgdesc="roleplaying game engine" url="http://adonthell.linuxgames.com/" -depends=('sdl' 'libvorbis' 'python' 'freetype2' 'swig') +depends=('python' 'sdl_mixer' 'sdl_ttf' 'libstdc++' 'freetype2' 'swig') groups=('games-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://adonthell.linuxgames.com/download/source.shtml | Flasttar" source=(http://savannah.nongnu.org/download/adonthell/$pkgname-src-$pkgver.tar.gz) -_F_cd_path="$pkgname-0.3.4" -sha1sums=('01c07a138a7c41f5640d4306f2197f71a8554aee') +_F_cd_path="$pkgname-$pkgver" +sha1sums=('8e913173225b351b79db45124f627b436794f845') -build() { - Fcd - Fconf - - # fix some stuff... - sed 's|drawing_area::||' -i src/drawing_area.h - sed -e '46d' \ - -e 's|library->memory|NULL|' \ - -i src/SDL_ttf.c - find -name Makefile | xargs sed 's|\-lfakeroot||' -i - - Fmake - Fmakeinstall -} From voroskoi at frugalware.org Wed Jun 4 22:29:12 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 4 22:29:13 2008 Subject: [Frugalware-git] frugalware-current: ndiswrapper-1.53-1-i686 Message-ID: <20080604202912.4FBB51190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1aa3926baacd5ba721036449b6a5b72f9aa74085 commit 1aa3926baacd5ba721036449b6a5b72f9aa74085 Author: voroskoi Date: Wed Jun 4 22:28:51 2008 +0200 ndiswrapper-1.53-1-i686 version bump diff --git a/source/network-extra/ndiswrapper/FrugalBuild b/source/network-extra/ndiswrapper/FrugalBuild index d294ca8..e0e5a1e 100644 --- a/source/network-extra/ndiswrapper/FrugalBuild +++ b/source/network-extra/ndiswrapper/FrugalBuild @@ -3,17 +3,16 @@ # Maintainer: voroskoi pkgname=ndiswrapper -pkgver=1.52 -pkgrel=7 +pkgver=1.53 +pkgrel=1 pkgdesc="Wrapper for using Windows drivers for some wireless cards" _F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module sourceforge depends=(${depends[@]} 'pciutils' 'wireless_tools') groups=('network-extra') archs=('i686' 'x86_64') -source=(${source[@]} README.Frugalware no-depmod-thx.patch) -sha1sums=('e70cd3bc5081afd5878a22cd458734c642aec337'\ - 'c3f24143cb9814326a2c0c3cbc8d58d953bac268'\ +source=(${source[@]} README.Frugalware) +sha1sums=('0d27b2f1d59d6d4bcb6b384cab946f99cb1889d7'\ '1274975ac5c636c0fc26c312010eadd056fec010') [ "$CARCH" == "x86_64" ] && \ source=(${source[@]} ndiswrapper-amd64-detect-fix.patch) && \ diff --git a/source/network-extra/ndiswrapper/no-depmod-thx.patch b/source/network-extra/ndiswrapper/no-depmod-thx.patch deleted file mode 100644 index c87b945..0000000 --- a/source/network-extra/ndiswrapper/no-depmod-thx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naurp ndiswrapper-1.33/driver/Makefile ndiswrapper-1.33-no-depmod-thx/driver/Makefile ---- ndiswrapper-1.33/driver/Makefile 2006-12-29 05:13:07.000000000 +0100 -+++ ndiswrapper-1.33-no-depmod-thx/driver/Makefile 2007-01-01 15:04:18.000000000 +0100 -@@ -289,9 +289,6 @@ install: prereq_check win2lin_stubs.h ge - mkdir -p $(INST_DIR) - install -m 0644 $(MODULE) $(INST_DIR) - -@/bin/rm -rf $(SRC_DIR)/.tmp_versions --ifndef DIST_DESTDIR -- -/sbin/depmod -a $(KVERS) -b $(DESTDIR) --endif - - dist: - @for file in $(DISTFILES); do \ From bouleetbil at frogdev.info Wed Jun 4 22:32:55 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jun 4 22:32:57 2008 Subject: [Frugalware-git] frugalware-current: gnome-applets-2.22.2-1-i686 Message-ID: <20080604203255.C83751190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=376fbd03bcadf2db0b68f6d025d4666d60abb5d6 commit 376fbd03bcadf2db0b68f6d025d4666d60abb5d6 Author: bouleetbil Date: Wed Jun 4 22:24:45 2008 +0200 gnome-applets-2.22.2-1-i686 *version bump *add depend libgweather *delete gweather.schemas from _F_gnome_schemas provided by libgweather diff --git a/source/gnome/gnome-applets/FrugalBuild b/source/gnome/gnome-applets/FrugalBuild index 610c89b..cdc377c 100644 --- a/source/gnome/gnome-applets/FrugalBuild +++ b/source/gnome/gnome-applets/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-applets -pkgver=2.22.1 +pkgver=2.22.2 pkgrel=1 pkgdesc="Applets for use with the GNOME panel" url="http://www.gnome.org/" -depends=('gail' 'gnome-panel>=2.20.3' 'libgtop>=2.20.1' 'libxklavier>=3.3' 'libwnck>=2.20.3' \ - 'gucharmap>=2.22.1' 'gst-plugins-base>=0.10.12-3' 'libnotify' 'gnome-icon-theme' 'dbus-glib>=0.71-2' \ - 'libgnomekbd' 'gnome-settings-daemon') +depends=('gail' 'gnome-panel>=2.22.2' 'libgtop>=2.22.2' 'libxklavier>=3.6' 'libwnck>=2.22.1' \ + 'gucharmap>=2.22.1' 'gst-plugins-base>=0.10.19-2' 'libnotify' 'gnome-icon-theme' 'dbus-glib>=0.74-2' \ + 'libgnomekbd' 'gnome-settings-daemon' 'libgweather>=2.22.2') rodepends=('notification-daemon') makedepends=('intltool' 'gnome-doc-utils') groups=('gnome' 'gnome-minimal') @@ -18,7 +18,6 @@ _F_gnome_schemas=('/etc/gconf/schemas/battstat.schemas' '/etc/gconf/schemas/cpufreq-applet.schemas' '/etc/gconf/schemas/drivemount.schemas' '/etc/gconf/schemas/geyes.schemas' - '/etc/gconf/schemas/gweather.schemas' '/etc/gconf/schemas/mixer.schemas' '/etc/gconf/schemas/multiload.schemas' '/etc/gconf/schemas/stickynotes.schemas') @@ -27,6 +26,9 @@ _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-flags --enable-ipv6 --with-gstreamer=0.10 --enable-stickynotes" source=(${source[@]} mixer_applet_powersave.patch README.Frugalware) +sha1sums=('c134d2fedf2089a17ee2b3c82a6d5df1e6ea16e2' \ + '52f3ae4811dee6bd263fdec8f464f5221355d368' \ + 'c0774a7e94736eeb18aee8cba06bb52fc8a9f144') build() { Fbuild_slice_scrollkeeper @@ -42,6 +44,3 @@ build() { } # optimization OK -sha1sums=('ffcca6e35328006332b0f5e7f8a94e77e28b14b1' \ - '52f3ae4811dee6bd263fdec8f464f5221355d368' \ - 'c0774a7e94736eeb18aee8cba06bb52fc8a9f144') From crazy at frugalware.org Wed Jun 4 22:51:02 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 4 22:51:04 2008 Subject: [Frugalware-git] frugalware-current: numpy-1.1.0-1-x86_64 Message-ID: <20080604205102.E2A4C1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=641c8957c0e3e8510bdf13cc349e30698fa1eae2 commit 641c8957c0e3e8510bdf13cc349e30698fa1eae2 Author: crazy Date: Wed Jun 4 22:49:36 2008 +0200 numpy-1.1.0-1-x86_64 * Version bump diff --git a/source/devel-extra/numpy/FrugalBuild b/source/devel-extra/numpy/FrugalBuild index 4a88bab..11aa538 100644 --- a/source/devel-extra/numpy/FrugalBuild +++ b/source/devel-extra/numpy/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Priyank Gosalia pkgname=numpy -pkgver=1.0.4 +pkgver=1.1.0 pkgrel=1 pkgdesc="Numerical Python adds a fast array facility to the Python language" depends=('python>=2.5') groups=('devel-extra') archs=('i686' 'x86_64') Finclude sourceforge -sha1sums=('9a1f09358c3310cf990eecd06dc2eb54aec78321') +sha1sums=('c36451e05251599294abfefa386835300e2066d5') # optimization OK From voroskoi at frugalware.org Wed Jun 4 23:08:36 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 4 23:08:38 2008 Subject: [Frugalware-git] frugalware-current: smb4k-0.9.5-1-i686 Message-ID: <20080604210836.875931190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0cde7c3776aa7e746aed13c4d7e6ac49404ed555 commit 0cde7c3776aa7e746aed13c4d7e6ac49404ed555 Author: voroskoi Date: Wed Jun 4 23:08:05 2008 +0200 smb4k-0.9.5-1-i686 version bump diff --git a/source/kde-extra/smb4k/FrugalBuild b/source/kde-extra/smb4k/FrugalBuild index 20057fa..5e4e615 100644 --- a/source/kde-extra/smb4k/FrugalBuild +++ b/source/kde-extra/smb4k/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=smb4k -pkgver=0.9.4 +pkgver=0.9.5 pkgrel=1 pkgdesc="Smb4K is a SMB/CIFS share browser for KDE." _F_berlios_ext=".tar.bz2" @@ -13,6 +13,6 @@ depends=('kdebase') rodepends=('samba-client') groups=('kde-extra' 'kde-apps') archs=('i686' 'x86_64') -sha1sums=('348389398e998e8111fcc043e3b82ef2f227ea72') +sha1sums=('3065a057cd3872fbce64404d5ca09eb57d5ce939') # optimization OK From crazy at frugalware.org Wed Jun 4 23:11:41 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 4 23:11:43 2008 Subject: [Frugalware-git] frugalware-current: python-sqlobject-0.10.2-1-x86_64 Message-ID: <20080604211141.49DD21190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fdd0aacd11c84a548e1b078553a40af48639daa6 commit fdd0aacd11c84a548e1b078553a40af48639daa6 Author: crazy Date: Wed Jun 4 23:10:54 2008 +0200 python-sqlobject-0.10.2-1-x86_64 * Version bump diff --git a/source/devel-extra/python-sqlobject/FrugalBuild b/source/devel-extra/python-sqlobject/FrugalBuild index acf7c25..51eda5c 100644 --- a/source/devel-extra/python-sqlobject/FrugalBuild +++ b/source/devel-extra/python-sqlobject/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: enda pkgname=python-sqlobject -pkgver=0.10.1 +pkgver=0.10.2 pkgrel=1 pkgdesc="SQLObject is a popular Object Relational Manager for providing an object interface to your database." url="http://sqlobject.org/" @@ -14,5 +14,5 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://cheeseshop.python.org/pypi/SQLObject | grep -m1 SQLObject | sed 's/.*ct \(.*\) *O.*/\1/' | tr -d ' '" source=(http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-$pkgver.tar.gz) _F_cd_path="SQLObject-$pkgver" -sha1sums=('01062b16ba24ff41ee0af1a3f9157cdfd603d276') +sha1sums=('fe3588dc438a8789346014adc8ce84867276150e') From crazy at frugalware.org Wed Jun 4 23:36:17 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 4 23:36:18 2008 Subject: [Frugalware-git] frugalware-current: ipython-0.8.4-1-x86_64 Message-ID: <20080604213617.7D1C21190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=62c35d1cb3a6d44f379584c79a5b0fea46e08e26 commit 62c35d1cb3a6d44f379584c79a5b0fea46e08e26 Author: crazy Date: Wed Jun 4 23:34:42 2008 +0200 ipython-0.8.4-1-x86_64 * Version bump diff --git a/source/devel-extra/ipython/FrugalBuild b/source/devel-extra/ipython/FrugalBuild index 3d68e44..62b2ee4 100644 --- a/source/devel-extra/ipython/FrugalBuild +++ b/source/devel-extra/ipython/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=ipython -pkgver=0.8.3 +pkgver=0.8.4 pkgrel=1 pkgdesc="An enhanced Interactive Python shell." url="http://ipython.scipy.org/" @@ -12,7 +12,7 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://ipython.scipy.org/dist/ | grep ipython-.*.tar.gz | Flasttar" source=(http://ipython.scipy.org/dist/$pkgname-$pkgver.tar.gz) -sha1sums=('09482c904e145793f9f0bfc43731c04c82e658a4') +sha1sums=('68b7666d2c552fe2f5f873cb06ee8823e7165f8e') build() { From bouleetbil at frogdev.info Wed Jun 4 23:41:42 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jun 4 23:41:43 2008 Subject: [Frugalware-git] frugalware-current: gedit-2.22.3-1-i686 Message-ID: <20080604214142.264601190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5868d432ba600c60a650ce035a01eb921c439096 commit 5868d432ba600c60a650ce035a01eb921c439096 Author: bouleetbil Date: Wed Jun 4 23:16:34 2008 +0200 gedit-2.22.3-1-i686 *version bump diff --git a/source/gnome/gedit/FrugalBuild b/source/gnome/gedit/FrugalBuild index 5eece07..e8e7541 100644 --- a/source/gnome/gedit/FrugalBuild +++ b/source/gnome/gedit/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix pkgname=gedit -pkgver=2.22.1 +pkgver=2.22.3 pkgrel=1 pkgdesc="A text editor for GNOME" url="http://www.gnome.org/" -depends=('rarian' 'desktop-file-utils' 'python>=2.5' 'gtksourceview>=2.2.1' 'dbus-glib>=0.73' 'enchant' 'iso-codes' 'libgnomeui') +depends=('rarian' 'desktop-file-utils' 'python>=2.5' 'gtksourceview>=2.2.1' 'dbus-glib>=0.74' 'enchant' 'iso-codes' 'libgnomeui') makedepends=('intltool' 'gnome-doc-utils>=0.8.0' 'gnome-python-desktop-gtksourceview>=2.22.0' 'pygtksourceview>=2.2.0' 'gtk-doc') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') @@ -15,7 +15,7 @@ _F_gnome_schemas=('/etc/gconf/schemas/gedit.schemas' \ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -sha1sums=('146e2da6ffa2e7b821a44ec19f3ff074fc50a5ca') +sha1sums=('3582e532c6c18f1b49b92878540484693976307b') subpkgs=("$pkgname-python") subdescs=('gedit python plugins') From ryuo at frugalware.org Wed Jun 4 23:45:38 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 4 23:45:40 2008 Subject: [Frugalware-git] frugalware-current: bsnes-032a-1-i686 Message-ID: <20080604214538.C6ED21190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=249f96927f5432cf622537eca85c03a3342039d0 commit 249f96927f5432cf622537eca85c03a3342039d0 Author: James Buren Date: Wed Jun 4 16:42:20 2008 -0500 bsnes-032a-1-i686 * new package diff --git a/source/games-extra/bsnes/FrugalBuild b/source/games-extra/bsnes/FrugalBuild new file mode 100644 index 0000000..df1c7f1 --- /dev/null +++ b/source/games-extra/bsnes/FrugalBuild @@ -0,0 +1,29 @@ +# Compiling Time: 0.2 SBU +# Maintainer: James Buren + +pkgname=bsnes +pkgver=032a +pkgrel=1 +pkgdesc="A newer snes emulator designed with accuracy in mind." +url="http://byuu.cinnamonpirate.com/bsnes/" +depends=('gtk+2' 'freetype2' 'libxdmcp' 'libxtst' 'libgl' 'libxv' 'libao' 'openal' 'libstdc++' 'libxdamage' 'libxml2' 'sdl') +groups=('games-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump '$url' | grep -o '${pkgname}_\(.*\).tar.bz2' | sed 's|.*v\(.*\).t.*|\1|'" +source=(http://byuu.cinnamonpirate.com/files/${pkgname}_v$pkgver.tar.bz2) +_F_desktop_icon="$pkgname" +_F_desktop_categories="Games;Emulator;" +options=('scriptlet') +sha1sums=('aa6ed49eed3bd44bb638ce549cb1591c50ead72f') + +build() +{ + make -C src platform=x compiler=gcc enable_gzip=true enable_jma=true \ + flags="$CFLAGS -Ilib -DGZIP_SUPPORT -DJMA_SUPPORT" || Fdie + Fexe /usr/bin/$pkgname + Fdoc {readme,license}.txt + Ficon src/data/$pkgname.png + Fdesktop2 +} + +# optimization OK From crazy at frugalware.org Thu Jun 5 00:34:04 2008 From: crazy at frugalware.org (crazy) Date: Thu Jun 5 00:34:07 2008 Subject: [Frugalware-git] frugalware-current: perl-io-multiplex-1.09-1-x86_64 Message-ID: <20080604223404.63F151190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f8182e1ed1030fb014121deebebf8de8037931e8 commit f8182e1ed1030fb014121deebebf8de8037931e8 Author: crazy Date: Thu Jun 5 00:33:24 2008 +0200 perl-io-multiplex-1.09-1-x86_64 * m8r fix diff --git a/source/devel-extra/perl-io-multiplex/FrugalBuild b/source/devel-extra/perl-io-multiplex/FrugalBuild index c7ee43d..226e8b6 100644 --- a/source/devel-extra/perl-io-multiplex/FrugalBuild +++ b/source/devel-extra/perl-io-multiplex/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.05 SBU -# Maintainer: Zsolt SZALAI +# Maintainer: Zsolt Szalai _F_perl_name=IO-Multiplex _F_perl_author=B/BB/BBB From ryuo at frugalware.org Thu Jun 5 00:36:49 2008 From: ryuo at frugalware.org (James Buren) Date: Thu Jun 5 00:36:51 2008 Subject: [Frugalware-git] frugalware-current: loemu-0.3.1-1-i686 Message-ID: <20080604223649.D5FFE1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=51dda87e0b2d45e1f57b7da85424de422a216bad commit 51dda87e0b2d45e1f57b7da85424de422a216bad Author: James Buren Date: Wed Jun 4 17:34:32 2008 -0500 loemu-0.3.1-1-i686 * new package diff --git a/source/xapps-extra/loemu/FrugalBuild b/source/xapps-extra/loemu/FrugalBuild new file mode 100644 index 0000000..33e1a9f --- /dev/null +++ b/source/xapps-extra/loemu/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=loemu +pkgver=0.3.1 +pkgrel=1 +pkgdesc="A GUI frontend for xmame, sdl-mame, snes9x, and zsnes." +url="http://loemu.pegueroles.com" +depends=('libxslt' 'pygtk') +makedepends=('intltool') +groups=('xapps-extra') +archs=('i686' 'x86_64') +options=('scriptlet') +up2date="Flasttar $url" +source=($url/dists/$pkgname-$pkgver.tar.gz) +sha1sums=('61d4b0949c409adc6c58b655df6f6c7ce9c57854') From crazy at frugalware.org Thu Jun 5 00:37:28 2008 From: crazy at frugalware.org (crazy) Date: Thu Jun 5 00:37:31 2008 Subject: [Frugalware-git] frugalware-current: cyrus-sasl-2.1.22-13-x86_64 Message-ID: <20080604223728.D8C221190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=48d9671ec3a4961bd48675bb4734d8ef7dd1726c commit 48d9671ec3a4961bd48675bb4734d8ef7dd1726c Author: crazy Date: Thu Jun 5 00:36:50 2008 +0200 cyrus-sasl-2.1.22-13-x86_64 * m8r fix diff --git a/source/network/cyrus-sasl/FrugalBuild b/source/network/cyrus-sasl/FrugalBuild index 561eda2..d53c28f 100644 --- a/source/network/cyrus-sasl/FrugalBuild +++ b/source/network/cyrus-sasl/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.16 SBU -# Maintainer: Karoly COVEK +# Maintainer: Karoly CZOVEK pkgname=cyrus-sasl pkgver=2.1.22 From crazy at frugalware.org Thu Jun 5 00:43:45 2008 From: crazy at frugalware.org (crazy) Date: Thu Jun 5 00:43:46 2008 Subject: [Frugalware-git] frugalware-current: wxdfast-0.6.0-1-x86_64 Message-ID: <20080604224345.0E7DC1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4dc9d5357a7e2dc9bc748e341c9fa09d9e351dbb commit 4dc9d5357a7e2dc9bc748e341c9fa09d9e351dbb Author: crazy Date: Thu Jun 5 00:43:12 2008 +0200 wxdfast-0.6.0-1-x86_64 * m8r fix diff --git a/source/xapps-extra/wxdfast/FrugalBuild b/source/xapps-extra/wxdfast/FrugalBuild index 58b2f39..0d0d3d8 100644 --- a/source/xapps-extra/wxdfast/FrugalBuild +++ b/source/xapps-extra/wxdfast/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.05 SBU -# Maintainer: devil505 +# Maintainer: Devil505 pkgname=wxdfast pkgver=0.6.0 From crazy at frugalware.org Thu Jun 5 00:46:45 2008 From: crazy at frugalware.org (crazy) Date: Thu Jun 5 00:46:46 2008 Subject: [Frugalware-git] frugalware-current: gmrun-0.9.2-1-x86_64 Message-ID: <20080604224645.B97A21190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=57045051ad13d753611fe584fb316fa492d80901 commit 57045051ad13d753611fe584fb316fa492d80901 Author: crazy Date: Thu Jun 5 00:46:13 2008 +0200 gmrun-0.9.2-1-x86_64 * m8r fix diff --git a/source/xapps-extra/gmrun/FrugalBuild b/source/xapps-extra/gmrun/FrugalBuild index aa266a9..c2b12dc 100644 --- a/source/xapps-extra/gmrun/FrugalBuild +++ b/source/xapps-extra/gmrun/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.05 SBU -# Maintainer: Priyank +# Maintainer: Priyank Gosalia pkgname=gmrun pkgver=0.9.2 From crazy at frugalware.org Thu Jun 5 01:01:07 2008 From: crazy at frugalware.org (crazy) Date: Thu Jun 5 01:01:09 2008 Subject: [Frugalware-git] frugalware-current: claws-mail-extra-plugins-3.4.0-2-x86_64 Message-ID: <20080604230107.0B5511190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e7c50af958e5506402eda188bf87e601de036d1c commit e7c50af958e5506402eda188bf87e601de036d1c Author: crazy Date: Thu Jun 5 01:00:31 2008 +0200 claws-mail-extra-plugins-3.4.0-2-x86_64 * another m8r fix diff --git a/source/xlib-extra/claws-mail-extra-plugins/FrugalBuild b/source/xlib-extra/claws-mail-extra-plugins/FrugalBuild index 1739404..16422fb 100644 --- a/source/xlib-extra/claws-mail-extra-plugins/FrugalBuild +++ b/source/xlib-extra/claws-mail-extra-plugins/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 1.67 SBU -# Maintainer: bouleetbil@frogdev.info +# Maintainer: bouleetbil pkgname=claws-mail-extra-plugins pkgver=3.4.0 From crazy at frugalware.org Thu Jun 5 01:08:08 2008 From: crazy at frugalware.org (crazy) Date: Thu Jun 5 01:08:10 2008 Subject: [Frugalware-git] frugalware-current: news-notification-0.5rc2-1-x86_64 Message-ID: <20080604230808.35C981190ACA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=30e7a2ffdc7eda358631cc50cc89797374aba6b8 commit 30e7a2ffdc7eda358631cc50cc89797374aba6b8 Author: crazy Date: Thu Jun 5 01:07:27 2008 +0200 news-notification-0.5rc2-1-x86_64 * m8r fix diff --git a/source/gnome-extra/news-notification/FrugalBuild b/source/gnome-extra/news-notification/FrugalBuild index 218398e..63d331a 100644 --- a/source/gnome-extra/news-notification/FrugalBuild +++ b/source/gnome-extra/news-notification/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.15 SBU -# Maintainer: devil505 +# Maintainer: Devil505 pkgname=news-notification pkgver=0.5rc2 From crazy at frugalware.org Thu Jun 5 01:08:08 2008 From: crazy at frugalware.org (crazy) Date: Thu Jun 5 01:08:10 2008 Subject: [Frugalware-git] frugalware-current: galculator-1.3.1-1-x86_64 Message-ID: <20080604230808.05B851190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6ffc2a2b95f2be26af4596e5cfecb7e732a720fc commit 6ffc2a2b95f2be26af4596e5cfecb7e732a720fc Author: crazy Date: Thu Jun 5 01:06:01 2008 +0200 galculator-1.3.1-1-x86_64 * m8r fix diff --git a/source/xapps-extra/galculator/FrugalBuild b/source/xapps-extra/galculator/FrugalBuild index 9b7e46a..cba0141 100644 --- a/source/xapps-extra/galculator/FrugalBuild +++ b/source/xapps-extra/galculator/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.14 SBU -# Maintainer: devil505 +# Maintainer: Devil505 pkgname=galculator pkgver=1.3.1 From crazy at frugalware.org Thu Jun 5 01:46:07 2008 From: crazy at frugalware.org (crazy) Date: Thu Jun 5 01:46:10 2008 Subject: [Frugalware-git] frugalware-current: new test for packages with broken etc path Message-ID: <20080604234607.ACE3F1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cff5f953551826af6cb88803c29f677c4e58db00 commit cff5f953551826af6cb88803c29f677c4e58db00 Author: crazy Date: Thu Jun 5 01:45:27 2008 +0200 new test for packages with broken etc path * added etc test to check for invalid /usr/etc path diff --git a/t/etc b/t/etc new file mode 100755 index 0000000..6b26a8b --- /dev/null +++ b/t/etc @@ -0,0 +1,13 @@ +#!/bin/bash + +if [ "$1" == "--help" ]; then + echo "packages with invalid /usr/etc path" + exit 1 +fi + +cd ../frugalware-i686 +for i in $(ls|grep fpm$) +do + pacman-g2 -Ql -p "$i" |grep -q usr/etc && echo $i +done + From crazy at frugalware.org Thu Jun 5 02:45:58 2008 From: crazy at frugalware.org (crazy) Date: Thu Jun 5 02:46:00 2008 Subject: [Frugalware-git] pacman-tools: repoman: refuse to upload packages with broken file(s)/path(s) Message-ID: <20080605004558.52C791190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=0cb7dfc1f394d50029d0adce6ca8199dac1b331a commit 0cb7dfc1f394d50029d0adce6ca8199dac1b331a Author: crazy Date: Thu Jun 5 02:23:30 2008 +0200 repoman: refuse to upload packages with broken file(s)/path(s) * added checks for lib64 , /usr/etc and broken DESTDIR * if we find broken things print a nice message so the * packager knows what is going on and simply refuse to * upload the broken fpm(s) diff --git a/repoman b/repoman index a555586..6900e1a 100755 --- a/repoman +++ b/repoman @@ -308,6 +308,23 @@ upload() echo "package and try again." exit 1 fi + if echo $src | grep -q fpm$ && pacman-g2 -Ql -p $src | egrep -q ' lib64/| usr/lib64/'; then + echo "$src has invalid lib64 path , refusing to upload!" + echo "Please fix your package." + exit 1 + fi + if echo $src | grep -q fpm$ && pacman-g2 -Ql -p $src | grep -q 'var/tmp/fst'; then + echo "$src has broken DESTDIR , files are installed" + echo "in DESTDIR/DESTDIR , refusing to upload!" + echo "Please fix your package." + exit 1 + fi + if echo $src | grep -q fpm$ && pacman-g2 -Ql -p $src | grep -q 'usr/etc'; then + echo "$src has invalid etc path , files are installed" + echo "in /usr/etc , refusing to upload!" + echo "Please fix your package." + exit 1 + fi name=`basename $src` msg "Requesting a temporary file" tmp=`ssh $host "$sudo_cmd repoman server mktemp"` From crazy at frugalware.org Thu Jun 5 11:34:18 2008 From: crazy at frugalware.org (crazy) Date: Thu Jun 5 11:34:21 2008 Subject: [Frugalware-git] frugalware-current: ndiswrapper-1.53-1-x86_64 Message-ID: <20080605093418.0C9801190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=28de5153a91eefd150efecf6b44f753c85490d08 commit 28de5153a91eefd150efecf6b44f753c85490d08 Author: crazy Date: Thu Jun 5 11:33:35 2008 +0200 ndiswrapper-1.53-1-x86_64 * renamed patch to end in $arch so Fpatchall only patches on that arch * and removed these ugly sha1sums , source hacks for 64bit. diff --git a/source/network-extra/ndiswrapper/FrugalBuild b/source/network-extra/ndiswrapper/FrugalBuild index e0e5a1e..550bec2 100644 --- a/source/network-extra/ndiswrapper/FrugalBuild +++ b/source/network-extra/ndiswrapper/FrugalBuild @@ -11,12 +11,10 @@ Finclude kernel-module sourceforge depends=(${depends[@]} 'pciutils' 'wireless_tools') groups=('network-extra') archs=('i686' 'x86_64') -source=(${source[@]} README.Frugalware) -sha1sums=('0d27b2f1d59d6d4bcb6b384cab946f99cb1889d7'\ - '1274975ac5c636c0fc26c312010eadd056fec010') -[ "$CARCH" == "x86_64" ] && \ - source=(${source[@]} ndiswrapper-amd64-detect-fix.patch) && \ - sha1sums=(${sha1sums[@]} '7e46cc4bb72520d911f256748e8c3936498f001b') +source=(${source[@]} README.Frugalware ndiswrapper-detect-fix-x86_64.patch) +sha1sums=('0d27b2f1d59d6d4bcb6b384cab946f99cb1889d7' \ + 'c3f24143cb9814326a2c0c3cbc8d58d953bac268' \ + '7e46cc4bb72520d911f256748e8c3936498f001b') build() { diff --git a/source/network-extra/ndiswrapper/ndiswrapper-amd64-detect-fix.patch b/source/network-extra/ndiswrapper/ndiswrapper-amd64-detect-fix.patch deleted file mode 100644 index 5ee0635..0000000 --- a/source/network-extra/ndiswrapper/ndiswrapper-amd64-detect-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur ndiswrapper-1.3rc1.orig/driver/Makefile ndiswrapper-1.3rc1/driver/Makefile ---- ndiswrapper-1.3rc1.orig/driver/Makefile 2005-09-23 12:24:05.000000000 +0200 -+++ ndiswrapper-1.3rc1/driver/Makefile 2005-09-23 12:24:40.000000000 +0200 -@@ -99,6 +99,10 @@ - ntoskernel_io_exports.h: ntoskernel_io.c - usb_exports.h: usb.c - -+ifeq ($(CONFIG_MK8),y) -+CONFIG_X86_64=y -+endif -+ - ifeq ($(CONFIG_X86_64),y) - OBJS += x86_64_stubs.o - x86_64_stubs.o: x86_64_stubs.h x86_64_stubs.S diff --git a/source/network-extra/ndiswrapper/ndiswrapper-detect-fix-x86_64.patch b/source/network-extra/ndiswrapper/ndiswrapper-detect-fix-x86_64.patch new file mode 100644 index 0000000..5ee0635 --- /dev/null +++ b/source/network-extra/ndiswrapper/ndiswrapper-detect-fix-x86_64.patch @@ -0,0 +1,14 @@ +diff -Naur ndiswrapper-1.3rc1.orig/driver/Makefile ndiswrapper-1.3rc1/driver/Makefile +--- ndiswrapper-1.3rc1.orig/driver/Makefile 2005-09-23 12:24:05.000000000 +0200 ++++ ndiswrapper-1.3rc1/driver/Makefile 2005-09-23 12:24:40.000000000 +0200 +@@ -99,6 +99,10 @@ + ntoskernel_io_exports.h: ntoskernel_io.c + usb_exports.h: usb.c + ++ifeq ($(CONFIG_MK8),y) ++CONFIG_X86_64=y ++endif ++ + ifeq ($(CONFIG_X86_64),y) + OBJS += x86_64_stubs.o + x86_64_stubs.o: x86_64_stubs.h x86_64_stubs.S From crazy at frugalware.org Thu Jun 5 11:41:52 2008 From: crazy at frugalware.org (crazy) Date: Thu Jun 5 11:41:54 2008 Subject: [Frugalware-git] frugalware-current: windowmaker-0.92.0-4-x86_64 Message-ID: <20080605094152.6A5D01190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6fc108a8df33e769557040bd18da1e4ca611aad4 commit 6fc108a8df33e769557040bd18da1e4ca611aad4 Author: crazy Date: Thu Jun 5 11:40:26 2008 +0200 windowmaker-0.92.0-4-x86_64 * small fix for 64bit diff --git a/source/x11-extra/windowmaker/FrugalBuild b/source/x11-extra/windowmaker/FrugalBuild index 445d4e6..2bde969 100644 --- a/source/x11-extra/windowmaker/FrugalBuild +++ b/source/x11-extra/windowmaker/FrugalBuild @@ -23,8 +23,10 @@ sha1sums=('4f7fea6f40b9ba9f870d2e2f0ce46274750edb2c' \ build() { Fcd - [ "$CARCH" == "x86_64" ] && Fpatchall - [ "$CARCH" == "x86_64" ] && Fautoconfize + if [ "$CARCH" == "x86_64" ]; then + Fpatchall + Fautoreconf + fi source $Fsrcdir/$pkgname.sh || Fdie export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" Fconf --sysconfdir=/etc/X11 \ From vmiklos at frugalware.org Thu Jun 5 12:03:19 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jun 5 12:03:21 2008 Subject: [Frugalware-git] frugalware-current: authors: add polish translator as requested in email Message-ID: <20080605100319.4C6F91190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aea269d6eda900bf2181dee95187a7ffe2626ab6 commit aea269d6eda900bf2181dee95187a7ffe2626ab6 Author: Miklos Vajna Date: Thu Jun 5 12:03:15 2008 +0200 authors: add polish translator as requested in email diff --git a/docs/xml/authors.xml b/docs/xml/authors.xml index 2013635..77643f8 100644 --- a/docs/xml/authors.xml +++ b/docs/xml/authors.xml @@ -338,4 +338,11 @@ the list will be sorted automatically, so you no longer need to care about the o authors of all those nice newsletters contributor + + Tybura, Mateusz + wujciol + wujciol@gmail.com + Polish translations + contributor + From boobaa at frugalware.org Thu Jun 5 15:38:05 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Thu Jun 5 15:38:07 2008 Subject: [Frugalware-git] frugalware-current: pdfmerge4unix-1.0-1-i686 Message-ID: <20080605133805.73E241190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=364063c992dd3c074cadf4d7691c7fc7c328b982 commit 364063c992dd3c074cadf4d7691c7fc7c328b982 Author: CSCSY Lszl Date: Thu Jun 5 15:37:26 2008 +0200 pdfmerge4unix-1.0-1-i686 new package / initial import diff --git a/source/apps-extra/pdfmerge/FrugalBuild b/source/apps-extra/pdfmerge/FrugalBuild new file mode 100644 index 0000000..bdda505 --- /dev/null +++ b/source/apps-extra/pdfmerge/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 0.01 SBU +# Maintainer: CSCSY Lszl + +pkgname=pdfmerge4unix +pkgver=1.0 +pkgrel=1 +pkgdesc="A command line program written in Perl that merges pdf files in Unix-based platforms" +_F_sourceforge_name="pdfmerge" +_F_sourceforge_ext=".tar.gz" +Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=90404 | grep -m1 \.tar\.gz | sed 's/.*-\(.*\)\.t.*/\1/'" +groups=('apps-extra') +depends=('perl') +rodepends=('xghostscript') +archs=('i686') +#source=($source pngnq-makefile-corrections.patch) +sha1sums=('d9297eb836685311ca96089f671b2a62e9b1e9f1') + +build() { + Fexerel /usr/bin/$_F_sourceforge_name + Fdocrel gpl.txt +} + +# optimization OK From boobaa at frugalware.org Thu Jun 5 15:51:49 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Thu Jun 5 15:51:50 2008 Subject: [Frugalware-git] frugalware-current: pdfmerge4unix-1.0-1-i686 Message-ID: <20080605135149.0F8451190ACA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=78a66941f2b34b4ffe9e15d08601f983e075d45d commit 78a66941f2b34b4ffe9e15d08601f983e075d45d Author: CSCSY Lszl Date: Thu Jun 5 15:51:37 2008 +0200 pdfmerge4unix-1.0-1-i686 new package / initial import diff --git a/source/apps-extra/pdfmerge4unix/FrugalBuild b/source/apps-extra/pdfmerge4unix/FrugalBuild new file mode 100644 index 0000000..4e2520d --- /dev/null +++ b/source/apps-extra/pdfmerge4unix/FrugalBuild @@ -0,0 +1,23 @@ +# Compiling Time: 0.01 SBU +# Maintainer: CSCSY Lszl + +pkgname=pdfmerge4unix +pkgver=1.0 +pkgrel=1 +pkgdesc="A command line program written in Perl that merges pdf files in Unix-based platforms" +_F_sourceforge_name="pdfmerge" +_F_sourceforge_ext=".tar.gz" +Finclude sourceforge +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=90404 | grep -m1 \.tar\.gz | sed 's/.*-\(.*\)\.t.*/\1/'" +groups=('apps-extra') +archs=('i686') +depends=('perl') +rodepends=('xghostscript') +sha1sums=('d9297eb836685311ca96089f671b2a62e9b1e9f1') + +build() { + Fexerel /usr/bin/$_F_sourceforge_name + Fdocrel gpl.txt +} + +# optimization OK From boobaa at frugalware.org Thu Jun 5 15:51:48 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Thu Jun 5 15:51:51 2008 Subject: [Frugalware-git] frugalware-current: Revert "pdfmerge4unix-1.0-1-i686" Message-ID: <20080605135148.D73C31190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3c88d7b3be33e2e7908d991e6f75ca867cd7ce2a commit 3c88d7b3be33e2e7908d991e6f75ca867cd7ce2a Author: CSCSY Lszl Date: Thu Jun 5 15:46:55 2008 +0200 Revert "pdfmerge4unix-1.0-1-i686" This reverts commit 364063c992dd3c074cadf4d7691c7fc7c328b982. diff --git a/source/apps-extra/pdfmerge/FrugalBuild b/source/apps-extra/pdfmerge/FrugalBuild deleted file mode 100644 index bdda505..0000000 --- a/source/apps-extra/pdfmerge/FrugalBuild +++ /dev/null @@ -1,24 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: CSCSY Lszl - -pkgname=pdfmerge4unix -pkgver=1.0 -pkgrel=1 -pkgdesc="A command line program written in Perl that merges pdf files in Unix-based platforms" -_F_sourceforge_name="pdfmerge" -_F_sourceforge_ext=".tar.gz" -Finclude sourceforge -up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=90404 | grep -m1 \.tar\.gz | sed 's/.*-\(.*\)\.t.*/\1/'" -groups=('apps-extra') -depends=('perl') -rodepends=('xghostscript') -archs=('i686') -#source=($source pngnq-makefile-corrections.patch) -sha1sums=('d9297eb836685311ca96089f671b2a62e9b1e9f1') - -build() { - Fexerel /usr/bin/$_F_sourceforge_name - Fdocrel gpl.txt -} - -# optimization OK From ryuo at frugalware.org Thu Jun 5 16:17:46 2008 From: ryuo at frugalware.org (James Buren) Date: Thu Jun 5 16:17:47 2008 Subject: [Frugalware-git] frugalware-current: bsnes-032a-1-i686 Message-ID: <20080605141746.B70E11190ACA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bb7e7054a8fadefc2c9aa33d9ef8b0ca037face2 commit bb7e7054a8fadefc2c9aa33d9ef8b0ca037face2 Author: James Buren Date: Thu Jun 5 09:13:08 2008 -0500 bsnes-032a-1-i686 * simplified up2date diff --git a/source/games-extra/bsnes/FrugalBuild b/source/games-extra/bsnes/FrugalBuild index df1c7f1..a68c16e 100644 --- a/source/games-extra/bsnes/FrugalBuild +++ b/source/games-extra/bsnes/FrugalBuild @@ -9,7 +9,8 @@ url="http://byuu.cinnamonpirate.com/bsnes/" depends=('gtk+2' 'freetype2' 'libxdmcp' 'libxtst' 'libgl' 'libxv' 'libao' 'openal' 'libstdc++' 'libxdamage' 'libxml2' 'sdl') groups=('games-extra') archs=('i686' 'x86_64') -up2date="lynx -dump '$url' | grep -o '${pkgname}_\(.*\).tar.bz2' | sed 's|.*v\(.*\).t.*|\1|'" +Fpkgversep=_v +up2date="Flasttar $url" source=(http://byuu.cinnamonpirate.com/files/${pkgname}_v$pkgver.tar.bz2) _F_desktop_icon="$pkgname" _F_desktop_categories="Games;Emulator;" From crazy at frugalware.org Thu Jun 5 17:24:56 2008 From: crazy at frugalware.org (crazy) Date: Thu Jun 5 17:24:58 2008 Subject: [Frugalware-git] frugalware-current: pdfmerge4unix-1.0-1-x86_64 Message-ID: <20080605152456.4A6411190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2a8fed3492775a945172dd310b4a73ca98bb6a2a commit 2a8fed3492775a945172dd310b4a73ca98bb6a2a Author: crazy Date: Thu Jun 5 17:24:21 2008 +0200 pdfmerge4unix-1.0-1-x86_64 * added x86_64 to archs * removed custom up2date , use _F_sourceforge_broken_up2date * removed _F_sourceforge_ext=".tar.gz" .. this is default heh * still group is wrong rodepends on x apps diff --git a/source/apps-extra/pdfmerge4unix/FrugalBuild b/source/apps-extra/pdfmerge4unix/FrugalBuild index 4e2520d..4dbcf6f 100644 --- a/source/apps-extra/pdfmerge4unix/FrugalBuild +++ b/source/apps-extra/pdfmerge4unix/FrugalBuild @@ -6,11 +6,10 @@ pkgver=1.0 pkgrel=1 pkgdesc="A command line program written in Perl that merges pdf files in Unix-based platforms" _F_sourceforge_name="pdfmerge" -_F_sourceforge_ext=".tar.gz" +_F_sourceforge_broken_up2date=1 Finclude sourceforge -up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=90404 | grep -m1 \.tar\.gz | sed 's/.*-\(.*\)\.t.*/\1/'" groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') depends=('perl') rodepends=('xghostscript') sha1sums=('d9297eb836685311ca96089f671b2a62e9b1e9f1') From bouleetbil at frogdev.info Thu Jun 5 20:53:38 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jun 5 20:53:40 2008 Subject: [Frugalware-git] frugalware-current: phonetooth-0.4.1-1-i686 Message-ID: <20080605185338.4A5021190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e20225777bd73dd6c522f794b5e960633d9f55f1 commit e20225777bd73dd6c522f794b5e960633d9f55f1 Author: bouleetbil Date: Thu Jun 5 20:44:01 2008 +0200 phonetooth-0.4.1-1-i686 *version bump *delete url provided by googlecode diff --git a/source/gnome-extra/phonetooth/FrugalBuild b/source/gnome-extra/phonetooth/FrugalBuild index a1899d6..bc23078 100644 --- a/source/gnome-extra/phonetooth/FrugalBuild +++ b/source/gnome-extra/phonetooth/FrugalBuild @@ -2,13 +2,12 @@ # Maintainer: bouleetbil pkgname=phonetooth -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="Send messages and files to mobilephone" -url="http://code.google.com/p/phonetooth/" depends=('pygtk' 'pybluez' 'obexftp' 'pyserial' 'python-gammu') groups=('gnome-extra') archs=('i686' 'x86_64') options=('scriptlet') Finclude googlecode -sha1sums=('385ef6ff590591f6b106e3d8234162cba7aebe1b') +sha1sums=('30183e2b31940cba2ce03cd5428c24e508401301') From bouleetbil at frogdev.info Thu Jun 5 21:25:32 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jun 5 21:25:34 2008 Subject: [Frugalware-git] frugalware-current: eog-2.22.2-1-i686 Message-ID: <20080605192532.ABAC71190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2fa67cbd5003166495d366872d60723cbbce327e commit 2fa67cbd5003166495d366872d60723cbbce327e Author: bouleetbil Date: Thu Jun 5 21:19:13 2008 +0200 eog-2.22.2-1-i686 *version bump diff --git a/source/gnome/eog/FrugalBuild b/source/gnome/eog/FrugalBuild index 7ea4e61..5bf30db 100644 --- a/source/gnome/eog/FrugalBuild +++ b/source/gnome/eog/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix pkgname=eog -pkgver=2.22.1 +pkgver=2.22.2 pkgrel=1 pkgdesc="An image viewing and cataloging program for GNOME" -depends=('libexif' 'libgnomeui>=2.22.0' 'rarian' 'desktop-file-utils' \ - 'gnome-desktop>=2.22.0' 'lcms' 'pygtk' 'gnome-python' 'libart_lgpl') -makedepends=('intltool' 'gnome-doc-utils>=0.10.3') +depends=('libexif' 'libgnomeui>=2.22.1' 'rarian' 'desktop-file-utils' \ + 'gnome-desktop>=2.22.2' 'lcms' 'pygtk' 'gnome-python' 'libart_lgpl') +makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome') archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/eog.schemas') @@ -15,6 +15,6 @@ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet +sha1sums=('b9091c25b31fea262c9557d1148f5e6d4af08f9e') -sha1sums=('61d0d400156eae2c7003fa0a5c5da726628af783') # optimization OK From bouleetbil at frogdev.info Thu Jun 5 21:48:40 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jun 5 21:48:42 2008 Subject: [Frugalware-git] frugalware-current: gnome-system-monitor-2.22.2-1-i686 Message-ID: <20080605194840.3A5CD1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=26060734d37255aa633ab89b4c4af4a4d543d067 commit 26060734d37255aa633ab89b4c4af4a4d543d067 Author: bouleetbil Date: Thu Jun 5 21:40:54 2008 +0200 gnome-system-monitor-2.22.2-1-i686 *version bump diff --git a/source/gnome/gnome-system-monitor/FrugalBuild b/source/gnome/gnome-system-monitor/FrugalBuild index c26bfe1..b799d83 100644 --- a/source/gnome/gnome-system-monitor/FrugalBuild +++ b/source/gnome/gnome-system-monitor/FrugalBuild @@ -2,19 +2,19 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-system-monitor -pkgver=2.22.1 +pkgver=2.22.2 pkgrel=1 pkgdesc="A system monitor for GNOME" url="http://www.gnome.org/" -depends=('libgnomeui>=2.22.0' 'libgtop>=2.22.0' 'libwnck>=2.22.0' \ +depends=('libgnomeui>=2.22.1' 'libgtop>=2.22.2' 'libwnck>=2.22.1' \ 'rarian' 'libgksu>=2.0.4' 'libsexy' 'gnome-icon-theme' 'pcre' 'gtkmm>=2.12.7' 'librsvg') -makedepends=('intltool' 'gnome-doc-utils>=0.10.0') +makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_schemas=('/etc/gconf/schemas/gnome-system-monitor.schemas') Finclude gnome gnome-scriptlet -sha1sums=('eb6dec6abb7af398bb91b4b41de2570c3c6c1236') +sha1sums=('ef17df7f623222aabdd6571958772f1a33877759') # optimization OK From bouleetbil at frogdev.info Thu Jun 5 22:14:32 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jun 5 22:14:33 2008 Subject: [Frugalware-git] frugalware-current: epiphany-2.22.2-1-i686 Message-ID: <20080605201432.2CD841190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a2674d5f9d7a3c240a142594a421f408608af7f5 commit a2674d5f9d7a3c240a142594a421f408608af7f5 Author: bouleetbil Date: Thu Jun 5 22:05:35 2008 +0200 epiphany-2.22.2-1-i686 *version bump diff --git a/source/gnome-extra/epiphany/FrugalBuild b/source/gnome-extra/epiphany/FrugalBuild index 27fcb8d..1f92987 100644 --- a/source/gnome-extra/epiphany/FrugalBuild +++ b/source/gnome-extra/epiphany/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Christian Hamar alias krix pkgname=epiphany -pkgver=2.22.1.1 +pkgver=2.22.2 pkgrel=1 pkgdesc="GNOME webbrowser based on the mozilla rendering engine" url="http://www.gnome.org/projects/epiphany/" -depends=('libstdc++' 'dbus-x11' 'atk' 'libxslt' 'gnome-desktop>=2.22.0' 'startup-notification' \ +depends=('libstdc++' 'dbus-x11' 'atk' 'libxslt' 'gnome-desktop>=2.22.2' 'startup-notification' \ 'xulrunner>=1.8.1.3' 'docbook-xsl') -makedepends=('pygtk>=2.12.0' 'gtk-doc>=1.9' 'perl-xml-parser' 'python>=2.5' 'gnome-python>=2.22.0' 'iso-codes' 'gnome-doc-utils>=0.10.1') +makedepends=('pygtk>=2.12.1' 'gtk-doc>=1.9' 'perl-xml-parser' 'python>=2.5' 'gnome-python>=2.22.0' 'iso-codes' 'gnome-doc-utils>=0.12.2') _F_gnome_schemas=('/etc/gconf/schemas/epiphany.schemas' '/etc/gconf/schemas/epiphany-lockdown.schemas' '/etc/gconf/schemas/epiphany-pango.schemas' @@ -21,6 +21,6 @@ groups=('gnome-extra') archs=('x86_64' 'i686') Fconfopts="$Fconfopts -with-gecko=xulrunner \ --enable-python --enable-certificate-manager --disable-gtk-doc" -sha1sums=('473fe3394e1a9695e016ffc46089d42d4b5d6128') +sha1sums=('bd57901dec8684e6f39bfadb426eac475a353a97') # optimization OK From bouleetbil at frogdev.info Thu Jun 5 23:40:51 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jun 5 23:40:53 2008 Subject: [Frugalware-git] frugalware-current: epiphany-extensions-2.22.2-1-i686 Message-ID: <20080605214051.E54541190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=35ecdde58aa5c98be031f286bb42c1fa0d549529 commit 35ecdde58aa5c98be031f286bb42c1fa0d549529 Author: bouleetbil Date: Thu Jun 5 23:34:21 2008 +0200 epiphany-extensions-2.22.2-1-i686 *version bump diff --git a/source/gnome-extra/epiphany-extensions/FrugalBuild b/source/gnome-extra/epiphany-extensions/FrugalBuild index 4bed66a..45f4781 100644 --- a/source/gnome-extra/epiphany-extensions/FrugalBuild +++ b/source/gnome-extra/epiphany-extensions/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: Christian Hamar alias krix pkgname=epiphany-extensions -pkgver=2.22.1 +pkgver=2.22.2 pkgrel=1 pkgdesc="Extensions for epiphany web browser" url="http://www.gnome.org/projects/epiphany/extensions" -depends=('opensp' 'nss' 'nspr' 'pcre' 'epiphany>=2.22.1.1') -makedepends=('perl-xml-parser' 'gnome-doc-utils>=0.10.3') +depends=('opensp' 'nss' 'nspr' 'pcre' 'epiphany>=2.22.2') +makedepends=('perl-xml-parser' 'gnome-doc-utils>=0.12.2') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet license="GPL2" groups=('gnome-extra') archs=('x86_64' 'i686') Fconfopts="$Fconfopts --with-gecko=xulrunner --with-extensions=really-all" -sha1sums=('1cbef595dafeb65ce26763ec2a2b99937a82c3fb') +sha1sums=('0dff50f48a14e01dc358fa484b218f6d6a7f5519') # optimization OK From bouleetbil at frogdev.info Fri Jun 6 00:06:52 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Jun 6 00:06:53 2008 Subject: [Frugalware-git] frugalware-current: gnome-games-2.22.2.1-1-i686 Message-ID: <20080605220652.EB5501190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9e8c7d916e7d97fbc7528f8236424980b64e0ab4 commit 9e8c7d916e7d97fbc7528f8236424980b64e0ab4 Author: bouleetbil Date: Fri Jun 6 00:01:02 2008 +0200 gnome-games-2.22.2.1-1-i686 *version bump diff --git a/source/gnome-extra/gnome-games/FrugalBuild b/source/gnome-extra/gnome-games/FrugalBuild index 0a1562c..4d6e433 100644 --- a/source/gnome-extra/gnome-games/FrugalBuild +++ b/source/gnome-extra/gnome-games/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-games -pkgver=2.22.1.1 +pkgver=2.22.2.1 pkgrel=1 pkgdesc="Games for GNOME" url="http://www.gnome.org/" -depends=('guile' 'libgnomeui>=2.22.0' 'librsvg>=2.22.0' 'rarian>=0.8.0' \ +depends=('guile' 'libgnomeui>=2.22.1' 'librsvg>=2.22.2' 'rarian>=0.8.0' \ 'desktop-file-utils' 'libbonobo>=2.22.0' 'gnome-python-desktop>=2.22.0' 'ggz-client-libs' 'sdl' 'sdl_mixer') -makedepends=('intltool' 'gnome-doc-utils>=0.10.3') +makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome-extra') archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/aisleriot.schemas' @@ -31,6 +31,6 @@ _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --with-scores-group=users --with-scores-user=root" +sha1sums=('4ddf76ace133d7b826dc2a732d6155cc9d90e176') -sha1sums=('b10b6a0fd65f6f0bdc354ed6dfc49304da7d78ac') # optimization OK From bouleetbil at frogdev.info Fri Jun 6 00:33:32 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Jun 6 00:33:34 2008 Subject: [Frugalware-git] frugalware-current: file-roller-2.22.3-1-i686 Message-ID: <20080605223332.409901190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=321eeb51c1d878b387f43f60c270e199ee6a5a43 commit 321eeb51c1d878b387f43f60c270e199ee6a5a43 Author: bouleetbil Date: Fri Jun 6 00:16:50 2008 +0200 file-roller-2.22.3-1-i686 *version bump diff --git a/source/gnome/file-roller/FrugalBuild b/source/gnome/file-roller/FrugalBuild index 463947a..34995f5 100644 --- a/source/gnome/file-roller/FrugalBuild +++ b/source/gnome/file-roller/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix pkgname=file-roller -pkgver=2.22.2 +pkgver=2.22.3 pkgrel=1 pkgdesc="Archive manager utility for GNOME" -depends=('nautilus>=2.22.0' 'rarian' 'desktop-file-utils') -makedepends=('intltool' 'gnome-doc-utils>=0.10.3') +depends=('nautilus>=2.22.1' 'rarian' 'desktop-file-utils') +makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/file-roller.schemas') @@ -14,6 +14,6 @@ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet +sha1sums=('ccc082dcc9b31428ec51fc0ca863de26179c7590') -sha1sums=('0cccbaf829342bb8da607a019d522d593c3a4d48') # optimization OK From bouleetbil at frogdev.info Fri Jun 6 00:35:33 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Jun 6 00:35:34 2008 Subject: [Frugalware-git] frugalware-current: vino-2.22.2-1-i686 Message-ID: <20080605223533.6D00A1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=87e6eaa67322d0dbed4b9e4ba5437b07d27fa6d3 commit 87e6eaa67322d0dbed4b9e4ba5437b07d27fa6d3 Author: bouleetbil Date: Fri Jun 6 00:29:44 2008 +0200 vino-2.22.2-1-i686 *version bump diff --git a/source/gnome/vino/FrugalBuild b/source/gnome/vino/FrugalBuild index a5f1f19..82b0514 100644 --- a/source/gnome/vino/FrugalBuild +++ b/source/gnome/vino/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Christian Hamar alias krix pkgname=vino -pkgver=2.22.1 +pkgver=2.22.2 pkgrel=1 pkgdesc="An integrated VNC server for GNOME" -depends=('libgnomeui>=2.22.0' 'gnutls>=2.2' 'avahi' 'libxtst' 'libxdamage' 'libnotify' 'gnome-keyring') +depends=('libgnomeui>=2.22.1' 'gnutls>=2.2' 'avahi' 'libxtst' 'libxdamage' 'libnotify' 'gnome-keyring') makedepends=('intltool' 'perl-xml-parser') groups=('gnome') archs=('i686' 'x86_64') @@ -15,6 +15,6 @@ _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-http-server=yes --enable-session-support=yes --enable-avahi \ --enable-debug=no --enable-gnome-keyring=yes" -sha1sums=('571ae295939a4a54477120e0f707bbe2b3ff2ca9') +sha1sums=('ded4b0ce4e05caa31f6378ba65dc172b20a9594d') # optimization OK From vmiklos at frugalware.org Fri Jun 6 00:36:53 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 6 00:36:55 2008 Subject: [Frugalware-git] homepage-ng: Frugalware newsletter issue 25 Message-ID: <20080605223653.0C8AC1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=c1fabb9b90cc91dc15d706429eeac0bedc048597 commit c1fabb9b90cc91dc15d706429eeac0bedc048597 Author: Russell Dickenson Date: Thu Jun 5 21:51:27 2008 +1000 Frugalware newsletter issue 25 diff --git a/frugalware/images/interviews/ironiq.jpg b/frugalware/images/interviews/ironiq.jpg new file mode 100755 index 0000000..4745908 Binary files /dev/null and b/frugalware/images/interviews/ironiq.jpg differ diff --git a/frugalware/weeklynews/issue25.html b/frugalware/weeklynews/issue25.html new file mode 100755 index 0000000..1eea9d4 --- /dev/null +++ b/frugalware/weeklynews/issue25.html @@ -0,0 +1,133 @@ +

Table of Contents

+ + + +

Welcome

+

+ The newsletter's aim is to keep you up to date with what's happened recently in the world of the Linux distribution 'Frugalware'. +

+

+ Features of this issue include: +

    +
  • Frugalware's developer are people too! - IroniQ
    • +
  • Tips and tricks - man - odd symbols appearing
    • +
  • ryuo is now a developer!
    • +
  • Users fight it out in IRC
    • +
+

+ + +

Events

+

+ Here's a selection of events which have occurred since the previous newsletter: +

+
    +
  • +

    ryuo is now a developer!

    +

    Recently, VMiklos proposed and everyone agreed that ryuo be accepted into the prestigous club of Frugalware developers. He was granted all rights normally granted to a developer, including full access to the git repository. Those who don't subscribe to the development mailing list may not know that ryuo had been submitting package build scripts for some time now. With the help of other developers - particularly VMiklos and crazy, he quickly improved his packaging skills. Congratulations to ryuo for his hard work and his reward in becoming a developer. We look forward to many more packages to come.

    +

    Existing developers are grateful that as part of his new status as a developer, ryuo has a Frugalware domain email address. This will eliminate the spam which appeared as a signature to each of his email messages. :P

    +
    • +
  • +

    Polish translations - get ready

    +

    Mateusz Tybura - AKA wujciol - has recently joined the Frugalware project to provide translation to Polish. If you see wujciol on IRC or in the forums, please encourage this work. One of the goals of Frugalware is to be accessible to as many people as possible in their native language.

    +
    • +
  • +

    Users fight it out in IRC

    +

    On 27 May 2008, a fight broke out amongst several people on the Frugalware IRC channel. An innocent developer who also happened to be in the channel was used as a weapon. Thankfully the fight didn't last for long. Since developers are usually quite soft and most Frugalware users are weak, no-one was actually hurt. Those who took part in the fight have been asked to use Windows Vista for one week as punishment. Below is a record of what happened.

    + 

    * ryuo smacks Noobie| with Thomas Crapper's Golden Toiletseat.

    + 

    * Noobie| slaps ryuo with a krix

    + 

    <krix>	uhm

    + 

    * krix throws Noobie| at ryuo

    + 

    * ryuo smacks Noobie| with a boobaa.

    + 

    <ryuo> yes, lets play smack each other with developers game

    + 

    <DeX77> devs aren't allowed to play

    + 

    <Noobie|>	xD

    +
    • +
+ + + +

Frugalware's developers are people too!

+

In this feature of the newsletter, Frugalware's developers reveal a little about themselves. The aim is to show that "Frugalware's developers are people too!" I thank the developers for taking the time to answer the questions. There will be one interview per newsletter (until we run out of developers).

+ +

IroNiQ

+

This issue's interview is with IroniQ, whose main role in the Frugalware development team is system administration. Please stand and hum the Hungarian national anthem while you read his interview.

+ +
+
What's your name?
+

VASAS Krisztián

+
What's your IRC nickname?
+

IroNiQ

+
In what country do you live?
+

Hungary

+
In what country were you born?
+

Hungary

+
What do you like the most about where you live?
+

Most of the time I live in Bupapest, the capital of Hungary. I like it because of the bustle of the city. But my parents live in the Mátra mountains and if I want to relax, I go there and hike or just don't do anything.

+
What do you do for the Frugalware project?
+

I was the Xfce maintainer for a time, but I didn't have enough time for it and gave this maintainership to Priyank. Now I'm the bug tracking system and homepage admin, sysadmin of the buildservers and I help administer the main server.

+
What motivates you to work on Frugalware?
+

I tried several Linux distributions (almost all of the big ones) but something was missing from all of them. When I heard about Frugalware I tried it and found what I was looking for and started making packages for it.

+
What do you do when you're not working on Frugalware?
+

I was working as a network manager with switches and routers, but now I'm changing jobs so soon I'll work with IT security.

+
What's the view from your front door?
+

The view from my front door is only a staircase, that's small and dark, but my window is to an alley, behind this alley is a nice park. Please look out the window.

+
+ + + +

Tips and tricks

+ Disclaimer - Be aware that the hints & tips provided here have NOT been tested and so come with no warranty. +
    +
  • +

    man - odd symbols appearing - submitted by 'olegfink'

    +

    If you get unreadable symbols when using man,open /etc/man.conf with editor of your choice (e.g. vim) and change

    + 

    /usr/bin/nroff -Tlatin1 -mandoc -c

    +

    to

    + 

    /usr/bin/nroff -Tutf8 -mandoc -c

    +

    +
    • +
+

This section relies on your contributions! If have some tips and tricks that you would like to be shown in the newsletter, please post them on the forums in the Tips and Tricks section!

+ + + +

Focus On Package(s)

+ +

NoteCase

+

According to its home page, "NoteCase is a hierarchical note manager (aka. outliner). It helps you organize your everyday text notes into a single document, with individual notes placed in the tree-like structure (each note can have its sub-notes, ...). To ensure your privacy, encrypted document format is supported, along with standard unencrypted format." We all scribble notes on pieces of paper which get lost or forgotten. Searching for just the right piece of paper is usually impossible. Tools like NoteCase can fix this problem and allow you to add some structure to what would otherwise be random notes.

+ + + +

Bug fixes

+ +

A list of bugs closed since the previous newsletter is available here.

+ + + +

Security announcements

+

Remember - According to the normal support arrangements for Frugalware, the release of 0.8 ("Kalgan") means that support for the previous release has ended. This means that no further security or bug fixes will be released for Frugalware 0.7 ("Sayshell").

+ +

Here is a list of security issues which have been discovered and fixed in the 0.8 release since the previous newsletter.

+

Thankfully there are no security issues to report in this issue.

+ + + +

About the newsletter

+

Author

+

The Frugalware newsletter is written and edited by Russell Dickenson (AKA phayz). Credit for the Frugalware distribution goes to the development team.

+

Translations

+

The newsletter is currently translated into French and Danish. The French translation is provided by the French Frugalware community. The Danish translation is provided by the Danish Frugalware community. Thanks to all those involved in providing and hosting these translations.

+

Release

+

To allow time for review and corrections, each newsletter is written ahead of its release date. Therefore it may not mention events which occured in the few days before its release - e.g. security fixes. To be sure that you've got the very latest information on these topics, go to the appropriate page of the Frugalware web site.

+

Feedback

+

If you have feedback about the Frugalware newsletter - whether good or bad - please provide it via the forums. Your feedback is valuable because we want the newsletter to meet the needs of Frugalware's users.

diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index 6d24c23..0f41102 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -22,6 +22,25 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> + 100 + Frugalware Newsletter Issue 25 + Thu, 05 Jun 2008 21:46:39 +1000 + phayz + 0 + + Features of this issue include: +
    +
  • Frugalware's developer are people too! - IroniQ
    • +
  • Tips and tricks - man - odd symbols appearing
    • +
  • ryuo is now a developer!
    • +
  • Users fight it out in IRC
    • +
+ You can read it here. We hope you like it! + ]]> + + + 99 Frugalware Newsletter Issue 24 Tue, 27 May 2008 22:57:50 +1000 From vmiklos at frugalware.org Fri Jun 6 01:37:48 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 6 01:37:50 2008 Subject: [Frugalware-git] frugalware-current: cdrtools-2.01.01a39-2-i686 Message-ID: <20080605233748.251AD1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3085701a33f9d37cc604021bda63d5b76e83714a commit 3085701a33f9d37cc604021bda63d5b76e83714a Author: Miklos Vajna Date: Fri Jun 6 01:37:24 2008 +0200 cdrtools-2.01.01a39-2-i686 - fixup for the /etc test diff --git a/source/apps/cdrtools/FrugalBuild b/source/apps/cdrtools/FrugalBuild index a1915d2..1ec21c8 100644 --- a/source/apps/cdrtools/FrugalBuild +++ b/source/apps/cdrtools/FrugalBuild @@ -3,7 +3,7 @@ pkgname=cdrtools pkgver=2.01.01a39 -pkgrel=1 +pkgrel=2 pkgdesc="Tools for recording CDs" url="http://cdrecord.berlios.de/" depends=('glibc') @@ -27,4 +27,5 @@ build() make INS_BASE=$Fdestdir/usr DEFINSUSR=root DEFINSGRP=root \ COPTX="${CFLAGS}" CPPOPTX="${CFLAGS}" install || return 1 + Fmv /usr/etc /etc } From voroskoi at frugalware.org Fri Jun 6 04:52:01 2008 From: voroskoi at frugalware.org (voroskoi) Date: Fri Jun 6 04:52:04 2008 Subject: [Frugalware-git] frugalware-current: ktorrent-2.2.7-1-i686 Message-ID: <20080606025202.01AB91190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ae4c012f0d2f07820cc2cfee9f151300f1e1a49e commit ae4c012f0d2f07820cc2cfee9f151300f1e1a49e Author: voroskoi Date: Fri Jun 6 04:51:32 2008 +0200 ktorrent-2.2.7-1-i686 version bump diff --git a/source/kde-extra/ktorrent/FrugalBuild b/source/kde-extra/ktorrent/FrugalBuild index 3cd4292..ddf16db 100644 --- a/source/kde-extra/ktorrent/FrugalBuild +++ b/source/kde-extra/ktorrent/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=ktorrent -pkgver=2.2.6 +pkgver=2.2.7 pkgrel=1 pkgdesc="KTorrent is a BitTorrent program for KDE." depends=('kdelibs' 'libgl' 'libxmu' 'libxi' 'libxdamage' 'gmp' 'avahi' 'dbus') @@ -12,6 +12,6 @@ Finclude kde url="http://ktorrent.org/" up2date="lynx -dump ${url}/index.php?page=downloads |grep ktorrent-2 |Flasttar" source=(${url}/downloads/$pkgver/$pkgname-$pkgver.tar.bz2) -sha1sums=('8cb08ba0eedd8d8d12536c36acdb2fc1a8008137') +sha1sums=('ee671eca8d7b2f90ad6023f966219db7e3fec368') # optimization OK From voroskoi at frugalware.org Fri Jun 6 04:57:31 2008 From: voroskoi at frugalware.org (voroskoi) Date: Fri Jun 6 04:57:33 2008 Subject: [Frugalware-git] frugalware-current: wget-1.11.3-1-i686 Message-ID: <20080606025731.DD0F01190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a596972de59d13b9957e54cbc87347d7032ef6d2 commit a596972de59d13b9957e54cbc87347d7032ef6d2 Author: voroskoi Date: Fri Jun 6 04:57:16 2008 +0200 wget-1.11.3-1-i686 version bump diff --git a/source/network/wget/FrugalBuild b/source/network/wget/FrugalBuild index ae4578b..02d56b3 100644 --- a/source/network/wget/FrugalBuild +++ b/source/network/wget/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=wget -pkgver=1.11.2 +pkgver=1.11.3 pkgrel=1 pkgdesc="A network utility to retrieve files from the Web" url="http://www.gnu.org/software/wget/wget.html" From voroskoi at frugalware.org Fri Jun 6 05:26:16 2008 From: voroskoi at frugalware.org (voroskoi) Date: Fri Jun 6 05:26:18 2008 Subject: [Frugalware-git] frugalware-current: ruby-1.8.7-1-i686 Message-ID: <20080606032616.22EB51190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=64f98a5a51224496e48eb3b19b38d1710dbd5362 commit 64f98a5a51224496e48eb3b19b38d1710dbd5362 Author: voroskoi Date: Fri Jun 6 05:26:02 2008 +0200 ruby-1.8.7-1-i686 version bump diff --git a/source/devel/ruby/FrugalBuild b/source/devel/ruby/FrugalBuild index 8552dde..07b4dc0 100644 --- a/source/devel/ruby/FrugalBuild +++ b/source/devel/ruby/FrugalBuild @@ -3,18 +3,18 @@ # Maintainer: voroskoi pkgname=ruby -pkgver=1.8.6 -pkgextraver=-p114 -pkgrel=5 +pkgver=1.8.7 +pkgextraver= +pkgrel=1 pkgdesc="An object-oriented programming language." url="http://www.ruby-lang.org/" depends=('termcap' 'zlib' 'db>=4.6.18' 'readline' 'openssl' 'gdbm') makedepend=('tk') groups=('devel') archs=('i686' 'x86_64') -up2date="lynx -dump http://www.ruby-lang.org/en/downloads/ |grep tar.gz |sed -ne 's/.*y-\(.*\).tar.*/\1/;1p' |sed s/$pkgextraver//" -source=(ftp://ftp.ruby-lang.org/pub/ruby/ruby-${pkgver}${pkgextraver}.tar.bz2) -sha1sums=('9929782935ebb77d040593a010b8d65b03ce6e23') +up2date="lynx -dump http://www.ruby-lang.org/en/downloads/ |sort -r|Flasttar" +source=(ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-${pkgver}.tar.bz2) +sha1sums=('297282d0e4b885176336f5b26f986f9cf5f47133') build() { Fbuild --enable-shared --enable-pthread \ From voroskoi at frugalware.org Fri Jun 6 05:43:42 2008 From: voroskoi at frugalware.org (voroskoi) Date: Fri Jun 6 05:43:51 2008 Subject: [Frugalware-git] frugalware-current: mutt-devel-1.5.18-1-i686 Message-ID: <20080606034342.A1EF11190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3c2a37405cffae7faee3bc7372474b8ad3fb3ae8 commit 3c2a37405cffae7faee3bc7372474b8ad3fb3ae8 Author: voroskoi Date: Fri Jun 6 05:42:04 2008 +0200 mutt-devel-1.5.18-1-i686 version bump diff --git a/source/network-extra/mutt-devel/FrugalBuild b/source/network-extra/mutt-devel/FrugalBuild index 613c91b..50c82a1 100644 --- a/source/network-extra/mutt-devel/FrugalBuild +++ b/source/network-extra/mutt-devel/FrugalBuild @@ -4,7 +4,7 @@ pkgname=mutt-devel origname=mutt -pkgver=1.5.17 +pkgver=1.5.18 pkgrel=1 pkgdesc="A small but very powerful text-based mail client development release." url="http://www.mutt.org/" From ryuo at frugalware.org Fri Jun 6 10:52:39 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Jun 6 10:52:41 2008 Subject: [Frugalware-git] frugalware-current: libviper-1.3.2-1-i686 Message-ID: <20080606085239.69D221190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ca071906f05a9700c60d3716eaa8df1a76769847 commit ca071906f05a9700c60d3716eaa8df1a76769847 Author: James Buren Date: Fri Jun 6 03:49:51 2008 -0500 libviper-1.3.2-1-i686 * new package diff --git a/source/lib-extra/libviper/FrugalBuild b/source/lib-extra/libviper/FrugalBuild new file mode 100644 index 0000000..7080274 --- /dev/null +++ b/source/lib-extra/libviper/FrugalBuild @@ -0,0 +1,25 @@ +# Compiling Time: 0.02 SBU +# Maintainer: James Buren + +pkgname=libviper +pkgver=1.3.2 +pkgrel=1 +pkgdesc="An API combining ncurses/gpm for creating interfaces in text mode." +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +depends=('glibc') +groups=('lib-extra') +archs=('i686') +sha1sums=('caa1512e5a6b695f15cf40ab5ce6f0c5d4c62e31') + +build() +{ + Fcd $pkgname + make CFLAGS="${CFLAGS} -Wall" || Fdie + Fmkdir /usr/{include,lib} + # edit out a non-functional entry + Fsed 'ldconfig' '' Makefile + Fmakeinstall prefix=$Fdestdir/usr +} + +# optimization OK From ryuo at frugalware.org Fri Jun 6 10:57:14 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Jun 6 10:57:15 2008 Subject: [Frugalware-git] frugalware-current: libpseudo-1.0.1-1-i686 Message-ID: <20080606085714.2EDD31190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=846c142e30ec5215b9a6ebe325eedb7eede45105 commit 846c142e30ec5215b9a6ebe325eedb7eede45105 Author: James Buren Date: Fri Jun 6 03:54:48 2008 -0500 libpseudo-1.0.1-1-i686 * new package diff --git a/source/lib-extra/libpseudo/FrugalBuild b/source/lib-extra/libpseudo/FrugalBuild new file mode 100644 index 0000000..3cf9154 --- /dev/null +++ b/source/lib-extra/libpseudo/FrugalBuild @@ -0,0 +1,27 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=libpseudo +pkgver=1.0.1 +pkgrel=1 +pkgdesc="A thread handling library for safer threading." +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +depends=('glibc') +groups=('lib-extra') +archs=('i686') +sha1sums=('d5f88aebe780d1418f6b66a7378cd103aa601c45') + +build() +{ + Fcd $pkgname + make CFLAGS="${CFLAGS} -Wall" || Fdie + Fmkdir /usr/{include,lib} + # edit out a non-functional entry + Fsed 'ldconfig' '' Makefile + # correct pathes + Fsed '/usr/local/lib' '${libdir}' Makefile + Fmakeinstall prefix=$Fdestdir/usr +} + +# optimization OK From crazy at frugalware.org Fri Jun 6 12:33:16 2008 From: crazy at frugalware.org (crazy) Date: Fri Jun 6 12:33:18 2008 Subject: [Frugalware-git] frugalware-current: redirfs-0.2-10-x86_64 Message-ID: <20080606103316.37E461190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e091c2ddbd7c3876bd419565b7f384792774407a commit e091c2ddbd7c3876bd419565b7f384792774407a Author: crazy Date: Fri Jun 6 12:30:55 2008 +0200 redirfs-0.2-10-x86_64 * up2date / url / source fix diff --git a/source/apps-extra/redirfs/FrugalBuild b/source/apps-extra/redirfs/FrugalBuild index b587abe..00f7212 100644 --- a/source/apps-extra/redirfs/FrugalBuild +++ b/source/apps-extra/redirfs/FrugalBuild @@ -5,14 +5,13 @@ pkgname=redirfs pkgver=0.2 pkgrel=10 pkgdesc="Redirecting FileSystem" -url="http://redirfs.org/" +url="http://www.redirfs.org/tiki-index.php" _F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module groups=('apps-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://redirfs.org/tiki-index.php?page=redirfs_download|grep -m1 gz$|Flasttar" -# http://www.redirfs.org/packages/redirfs-$pkgver.tar.gz is unavailable atm -source=(http://ftp.frugalware.org/pub/other/sources/redirfs/redirfs-$pkgver.tar.gz redirfs-0.2-2.6.25.patch) +up2date="lynx -dump 'http://www.redirfs.org/tiki-index.php?page=redirfs_download'|grep -m1 gz$|Flasttar" +source=(http://www.redirfs.org/packages/$pkgname-$pkgver.tar.gz redirfs-0.2-2.6.25.patch) sha1sums=('c736b6a9b9cb0540010eb865febfd4f3b1fe6d82' \ '63c510b866b660b6aa7e9d07814b43ea8921743a') From crazy at frugalware.org Fri Jun 6 12:39:35 2008 From: crazy at frugalware.org (crazy) Date: Fri Jun 6 12:39:36 2008 Subject: [Frugalware-git] frugalware-current: podsleuth-0.6.2-1-x86_64 Message-ID: <20080606103935.1CD6A1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8171920e374c93591b77fec43984221ffe9eeeed commit 8171920e374c93591b77fec43984221ffe9eeeed Author: crazy Date: Fri Jun 6 12:38:55 2008 +0200 podsleuth-0.6.2-1-x86_64 * Version bump diff --git a/source/apps-extra/podsleuth/FrugalBuild b/source/apps-extra/podsleuth/FrugalBuild index b29daf7..19327fe 100644 --- a/source/apps-extra/podsleuth/FrugalBuild +++ b/source/apps-extra/podsleuth/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: crazy pkgname=podsleuth -pkgver=0.6.1 -pkgrel=2 +pkgver=0.6.2 +pkgrel=1 pkgdesc="PodSleuth is a tool to discover detailed model information about an Apple (TM) iPod (TM)." url="http://banshee-project.org" depends=('mono>=1.9' 'hal' 'ndesk-dbus>=0.6.1a-2' 'sg3-utils') @@ -13,7 +13,7 @@ up2date="Flasttar http://banshee-project.org/files/$pkgname" source=(http://banshee-project.org/files/$pkgname/$pkgname-$pkgver.tar.bz2) _F_mono_aot=0 Finclude mono -sha1sums=('6e651225f4af0f5ee144483861015404510a5f6d') +sha1sums=('f6fdd28dfadba6acc5226d71b0021478116052e7') Fconfopts="$Fconfopts --disable-docs" # optimization OK From crazy at frugalware.org Fri Jun 6 12:44:38 2008 From: crazy at frugalware.org (crazy) Date: Fri Jun 6 12:44:39 2008 Subject: [Frugalware-git] frugalware-current: graphicsmagick-1.2.3-1-x86_64 Message-ID: <20080606104438.88B5A1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=baf1412fb822dc403527acc77e1c609fe464647f commit baf1412fb822dc403527acc77e1c609fe464647f Author: crazy Date: Fri Jun 6 12:42:20 2008 +0200 graphicsmagick-1.2.3-1-x86_64 * Version bump diff --git a/source/xapps-extra/graphicsmagick/FrugalBuild b/source/xapps-extra/graphicsmagick/FrugalBuild index 4a62746..d0b3290 100644 --- a/source/xapps-extra/graphicsmagick/FrugalBuild +++ b/source/xapps-extra/graphicsmagick/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=graphicsmagick -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=1 pkgdesc="A collection of tools and libraries for many image formats" depends=('libxext' 'libsm' 'lcms' 'freetype2' 'libxml2' 'bzip2' 'jasper>=1.900.0' 'libpng' 'perl' 'urw-fonts' 'xghostscript') @@ -15,7 +15,7 @@ Finclude sourceforge source=($source gcc43.patch) url="http://www.graphicsmagick.org/" _F_cd_path="GraphicsMagick-$pkgver" -sha1sums=('bc2f83a5a5d5f91c7fafd26f9dad5061f6c1e09e' \ +sha1sums=('5fa8312f6c3649d65aff120286b27f3fbb1c67d6' \ 'ef21522941221ae88a9430177c4da8179c228404') subpkgs=("$pkgname-docs") From crazy at frugalware.org Fri Jun 6 12:48:15 2008 From: crazy at frugalware.org (crazy) Date: Fri Jun 6 12:48:17 2008 Subject: [Frugalware-git] frugalware-current: sofia-sip-1.12.9-1-x86_64 Message-ID: <20080606104815.B5AA71190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aa191b8ab005f66ef5e813d7df53634f9e79a35c commit aa191b8ab005f66ef5e813d7df53634f9e79a35c Author: crazy Date: Fri Jun 6 12:47:02 2008 +0200 sofia-sip-1.12.9-1-x86_64 * Version bump diff --git a/source/lib-extra/sofia-sip/FrugalBuild b/source/lib-extra/sofia-sip/FrugalBuild index ddb5c80..3db8a09 100644 --- a/source/lib-extra/sofia-sip/FrugalBuild +++ b/source/lib-extra/sofia-sip/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=sofia-sip -pkgver=1.12.8 +pkgver=1.12.9 pkgrel=1 pkgdesc="Sofia-SIP is an open-source SIP User-Agent library" depends=('glib2' 'openssl') @@ -11,6 +11,6 @@ groups=('lib-extra') archs=('i686' 'x86_64') _F_sourceforge_broken_up2date=1 Finclude sourceforge -sha1sums=('10d2430f109e25c3cb9debae4ac8df8aa238b512') +sha1sums=('f5dcabacffe3f5637a0da60e75d46309ea687005') # optimization OK From crazy at frugalware.org Fri Jun 6 12:49:28 2008 From: crazy at frugalware.org (crazy) Date: Fri Jun 6 12:49:28 2008 Subject: [Frugalware-git] frugalware-current: dbus-glib-0.76-1-x86_64 Message-ID: <20080606104928.04C911190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0da5087414f89dd3cd4682cd7ff86291463d0070 commit 0da5087414f89dd3cd4682cd7ff86291463d0070 Author: crazy Date: Fri Jun 6 12:48:43 2008 +0200 dbus-glib-0.76-1-x86_64 * Version bump diff --git a/source/apps/dbus-glib/FrugalBuild b/source/apps/dbus-glib/FrugalBuild index fc06797..85f0aba 100644 --- a/source/apps/dbus-glib/FrugalBuild +++ b/source/apps/dbus-glib/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: crazy pkgname=dbus-glib -pkgver=0.74 -pkgrel=2 +pkgver=0.76 +pkgrel=1 pkgdesc="Glib bindings for DBUS" url="http://www.freedesktop.org/wiki/Software_2fDBusBindings" depends=('dbus>=0.93' 'glib2>=2.16.3' 'expat') @@ -13,6 +13,7 @@ archs=('i686' 'x86_64') options=('scriptlet') up2date="lynx -dump http://dbus.freedesktop.org/releases/dbus-glib/|Flasttar" source=(http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +sha1sums=('f7bfe7c394559bee12f0adfffd333304d471779a') build() { @@ -31,6 +32,6 @@ build() Fmakeinstall Fln ../usr/bin/dbus-binding-tool /bin/dbus-binding-tool } - -sha1sums=('ea8a1c9269fe6b5f63e6571a2c8a537a558f0211') + + # optimization OK From crazy at frugalware.org Fri Jun 6 15:09:27 2008 From: crazy at frugalware.org (crazy) Date: Fri Jun 6 15:09:31 2008 Subject: [Frugalware-git] frugalware-current: kernel-xen0 Message-ID: <20080606130927.6F03A1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=895e70cf3614d9e72fdcb6b9625fc71ee12e5be7 commit 895e70cf3614d9e72fdcb6b9625fc71ee12e5be7 Author: crazy Date: Fri Jun 6 15:08:50 2008 +0200 kernel-xen0 * removed from tree diff --git a/source/base-extra/kernel-xen0/FrugalBuild b/source/base-extra/kernel-xen0/FrugalBuild deleted file mode 100644 index 6a881b4..0000000 --- a/source/base-extra/kernel-xen0/FrugalBuild +++ /dev/null @@ -1,33 +0,0 @@ -# Compiling Time: 11.74 SBU -# Maintainer: AlexExtreme - -pkgver=2.6.19 -pkgrel=2 -_F_kernel_vmlinuz="vmlinuz" -_F_kernel_stable=4 -_F_kernel_name="-xen0" -_F_kernel_dontsedarch=1 -_F_kernel_manualamd64=1 -srcurl="http://ftp.frugalware.org/pub/other/sources/xen" -[ "$CARCH" == "x86_64" ] && \ - _F_kernel_patches=(${_F_kernel_patches[@]} linux-$pkgver-x86_64_config.patch0) -_F_kernel_patches=(${_F_kernel_patches[@]} $srcurl/linux-$pkgver-xen.patch.bz2) -Finclude kernel -pkgdesc="The Xen domain 0 Linux Kernel and modules" -rodepends=('module-init-tools' 'xen>=3.0.4') -groups=('base-extra') -source=(${source[@]} README.Frugalware) -signatures=("${signatures[@]}" '') -unset install -options=('nobuild') -subgroups=('xapps-extra' 'xapps-extra') -suboptions=('nobuild' 'nobuild') -up2date="lynx -dump http://cvs.fedora.redhat.com/viewcvs/devel/kernel-xen-2.6/sources?view=markup | grep linux | Flasttarbz2" -archs=('i686') -subarchs=('i686' 'i686') - -build() -{ - Fbuildkernel - Fdoc README.Frugalware -} diff --git a/source/base-extra/kernel-xen0/README.Frugalware b/source/base-extra/kernel-xen0/README.Frugalware deleted file mode 100644 index f90bb90..0000000 --- a/source/base-extra/kernel-xen0/README.Frugalware +++ /dev/null @@ -1,30 +0,0 @@ -.Usage instructions: -1. Get the latest xen0 package. -+ --------------------------------------------- -# pacman-g2 -Syu && pacman-g2 -S kernel-xen0 --------------------------------------------- - -2. Add the following lines to the bottom of '/boot/grub/menu.lst' -+ ------------------------------------------------------------------------ -title Frugalware 0.5 (Siwenna) - With Xen - kernel (hd0,13)/boot/xen.gz noreboot dom0_mem=768M - module (hd0,13)/boot/vmlinuz-2.6.16-xen0-fw4 ro root=/dev/hda14 ------------------------------------------------------------------------ -+ -Replace (hd0,13) with the grub reference to your Frugalware partition, and -/dev/hda14 with the Linux device name for your partition (use the existing grub -entry for frugalware as a reference). 768M should also be replaced with a value -of around half of your total system memory. - -3. Reboot and select the Xen option at the Grub menu. - -4. Hopefully nothing bad will happen. If it does, write down the last few - messages that you see, and file a bugreport at http://bugs.frugalware.org - -5. If all works OK after the first few boots, you should be able to safely remove - noreboot from the kernel command line. If you run into problems later and Xen - reboots before you can see the error, just readd noreboot - -NOTE: on i686, you need the glibc-xen package instead of the normal glibc! diff --git a/source/base-extra/kernel-xen0/config b/source/base-extra/kernel-xen0/config deleted file mode 100644 index a886146..0000000 --- a/source/base-extra/kernel-xen0/config +++ /dev/null @@ -1,3310 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.19.4 -# Wed Feb 21 08:01:56 2007 -# -CONFIG_X86_32=y -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_SEMAPHORE_SLEEPERS=y -CONFIG_X86=y -CONFIG_MMU=y -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_IOMAP=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_DMI=y -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" - -# -# Code maturity level options -# -CONFIG_EXPERIMENTAL=y -CONFIG_LOCK_KERNEL=y -CONFIG_INIT_ENV_ARG_LIMIT=32 - -# -# General setup -# -CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -# CONFIG_IPC_NS is not set -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -# CONFIG_BSD_PROCESS_ACCT_V3 is not set -# CONFIG_TASKSTATS is not set -# CONFIG_UTS_NS is not set -# CONFIG_AUDIT is not set -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_CPUSETS=y -# CONFIG_RELAY is not set -CONFIG_INITRAMFS_SOURCE="" -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_SYSCTL=y -# CONFIG_EMBEDDED is not set -CONFIG_UID16=y -CONFIG_SYSCTL_SYSCALL=y -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_EXTRA_PASS is not set -CONFIG_HOTPLUG=y -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_SHMEM=y -CONFIG_SLAB=y -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_RT_MUTEXES=y -# CONFIG_TINY_SHMEM is not set -CONFIG_BASE_SMALL=0 -# CONFIG_SLOB is not set - -# -# Loadable module support -# -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_MODVERSIONS=y -# CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_KMOD=y -CONFIG_STOP_MACHINE=y - -# -# Block layer -# -CONFIG_BLOCK=y -CONFIG_LBD=y -# CONFIG_BLK_DEV_IO_TRACE is not set -CONFIG_LSF=y - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -CONFIG_DEFAULT_AS=y -# CONFIG_DEFAULT_DEADLINE is not set -# CONFIG_DEFAULT_CFQ is not set -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="anticipatory" - -# -# Processor type and features -# -CONFIG_SMP=y -# CONFIG_X86_PC is not set -CONFIG_X86_XEN=y -# CONFIG_X86_ELAN is not set -# CONFIG_X86_VOYAGER is not set -# CONFIG_X86_NUMAQ is not set -# CONFIG_X86_SUMMIT is not set -# CONFIG_X86_BIGSMP is not set -# CONFIG_X86_VISWS is not set -# CONFIG_X86_GENERICARCH is not set -# CONFIG_X86_ES7000 is not set -# CONFIG_M386 is not set -# CONFIG_M486 is not set -CONFIG_M586=y -# CONFIG_M586TSC is not set -# CONFIG_M586MMX is not set -# CONFIG_M686 is not set -# CONFIG_MPENTIUMII is not set -# CONFIG_MPENTIUMIII is not set -# CONFIG_MPENTIUMM is not set -# CONFIG_MPENTIUM4 is not set -# CONFIG_MK6 is not set -# CONFIG_MK7 is not set -# CONFIG_MK8 is not set -# CONFIG_MCRUSOE is not set -# CONFIG_MEFFICEON is not set -# CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP2 is not set -# CONFIG_MWINCHIP3D is not set -# CONFIG_MGEODEGX1 is not set -# CONFIG_MGEODE_LX is not set -# CONFIG_MCYRIXIII is not set -# CONFIG_MVIAC3_2 is not set -CONFIG_X86_GENERIC=y -CONFIG_X86_CMPXCHG=y -CONFIG_X86_XADD=y -CONFIG_X86_L1_CACHE_SHIFT=7 -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_X86_PPRO_FENCE=y -CONFIG_X86_WP_WORKS_OK=y -CONFIG_X86_INVLPG=y -CONFIG_X86_BSWAP=y -CONFIG_X86_POPAD_OK=y -CONFIG_X86_CMPXCHG64=y -CONFIG_X86_ALIGNMENT_16=y -CONFIG_X86_INTEL_USERCOPY=y -CONFIG_NR_CPUS=8 -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set -# CONFIG_PREEMPT is not set -CONFIG_PREEMPT_BKL=y -CONFIG_X86_LOCAL_APIC=y -CONFIG_X86_IO_APIC=y -CONFIG_VM86=y -CONFIG_TOSHIBA=m -CONFIG_I8K=m -CONFIG_X86_REBOOTFIXUPS=y -CONFIG_MICROCODE=m -CONFIG_MICROCODE_OLD_INTERFACE=y -CONFIG_X86_CPUID=m -CONFIG_SWIOTLB=y - -# -# Firmware Drivers -# -CONFIG_DELL_RBU=m -CONFIG_DCDBAS=m -# CONFIG_NOHIGHMEM is not set -CONFIG_HIGHMEM4G=y -# CONFIG_HIGHMEM64G is not set -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_HIGHMEM=y -CONFIG_ARCH_POPULATES_NODE_MAP=y -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM_MANUAL=y -# CONFIG_DISCONTIGMEM_MANUAL is not set -# CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y -CONFIG_FLAT_NODE_MEM_MAP=y -# CONFIG_SPARSEMEM_STATIC is not set -CONFIG_SPLIT_PTLOCK_CPUS=4096 -# CONFIG_RESOURCES_64BIT is not set -CONFIG_MTRR=y -# CONFIG_REGPARM is not set -CONFIG_SECCOMP=y -# CONFIG_HZ_100 is not set -# CONFIG_HZ_250 is not set -CONFIG_HZ_1000=y -CONFIG_HZ=1000 -# CONFIG_KEXEC is not set -# CONFIG_CRASH_DUMP is not set -CONFIG_PHYSICAL_START=0x100000 -CONFIG_HOTPLUG_CPU=y -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y - -# -# Power management options (ACPI, APM) -# -CONFIG_PM=y - -# -# ACPI (Advanced Configuration and Power Interface) Support -# -CONFIG_ACPI=y -CONFIG_ACPI_AC=m -CONFIG_ACPI_BATTERY=m -CONFIG_ACPI_BUTTON=m -CONFIG_ACPI_VIDEO=m -# CONFIG_ACPI_HOTKEY is not set -CONFIG_ACPI_FAN=m -# CONFIG_ACPI_DOCK is not set -CONFIG_ACPI_PROCESSOR=m -CONFIG_ACPI_HOTPLUG_CPU=y -CONFIG_ACPI_THERMAL=m -CONFIG_ACPI_ASUS=m -CONFIG_ACPI_IBM=m -CONFIG_ACPI_IBM_DOCK=y -CONFIG_ACPI_TOSHIBA=m -CONFIG_ACPI_BLACKLIST_YEAR=0 -# CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_EC=y -CONFIG_ACPI_POWER=y -CONFIG_ACPI_SYSTEM=y -CONFIG_ACPI_CONTAINER=m -# CONFIG_ACPI_SBS is not set - -# -# CPU Frequency scaling -# -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=m -# CONFIG_CPU_FREQ_DEBUG is not set -CONFIG_CPU_FREQ_STAT=m -# CONFIG_CPU_FREQ_STAT_DETAILS is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_PERFORMANCE=m -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=m -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m - -# -# CPUFreq processor drivers -# -CONFIG_X86_ACPI_CPUFREQ=m -CONFIG_X86_POWERNOW_K6=m -CONFIG_X86_POWERNOW_K7=m -CONFIG_X86_POWERNOW_K7_ACPI=y -CONFIG_X86_POWERNOW_K8=m -CONFIG_X86_POWERNOW_K8_ACPI=y -CONFIG_X86_GX_SUSPMOD=m -CONFIG_X86_SPEEDSTEP_CENTRINO=m -CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y -CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y -CONFIG_X86_SPEEDSTEP_ICH=m -CONFIG_X86_SPEEDSTEP_SMI=m -CONFIG_X86_P4_CLOCKMOD=m -CONFIG_X86_CPUFREQ_NFORCE2=m -CONFIG_X86_LONGRUN=m -# CONFIG_X86_LONGHAUL is not set - -# -# shared options -# -# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set -CONFIG_X86_SPEEDSTEP_LIB=m -# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set - -# -# Bus options (PCI, PCMCIA, EISA, MCA, ISA) -# -CONFIG_PCI=y -# CONFIG_PCI_GOBIOS is not set -# CONFIG_PCI_GOMMCONFIG is not set -# CONFIG_PCI_GODIRECT is not set -# CONFIG_PCI_GOXEN_FE is not set -CONFIG_PCI_GOANY=y -CONFIG_PCI_DIRECT=y -CONFIG_PCI_MMCONFIG=y -CONFIG_XEN_PCIDEV_FRONTEND=y -# CONFIG_XEN_PCIDEV_FE_DEBUG is not set -CONFIG_PCIEPORTBUS=y -CONFIG_HOTPLUG_PCI_PCIE=m -# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set -CONFIG_PCIEAER=y -CONFIG_ISA_DMA_API=y -CONFIG_SCx200=m -CONFIG_K8_NB=y - -# -# PCCARD (PCMCIA/CardBus) support -# -CONFIG_PCCARD=y -# CONFIG_PCMCIA_DEBUG is not set -CONFIG_PCMCIA=y -CONFIG_PCMCIA_LOAD_CIS=y -# CONFIG_PCMCIA_IOCTL is not set -CONFIG_CARDBUS=y - -# -# PC-card bridges -# -CONFIG_YENTA=m -CONFIG_YENTA_O2=y -CONFIG_YENTA_RICOH=y -CONFIG_YENTA_TI=y -CONFIG_YENTA_ENE_TUNE=y -CONFIG_YENTA_TOSHIBA=y -CONFIG_PD6729=m -CONFIG_I82092=m -CONFIG_PCCARD_NONSTATIC=m - -# -# PCI Hotplug Support -# -CONFIG_HOTPLUG_PCI=y -CONFIG_HOTPLUG_PCI_FAKE=m -CONFIG_HOTPLUG_PCI_ACPI=m -CONFIG_HOTPLUG_PCI_ACPI_IBM=m -# CONFIG_HOTPLUG_PCI_CPCI is not set -CONFIG_HOTPLUG_PCI_SHPC=m -# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set - -# -# Executable file formats -# -CONFIG_BINFMT_ELF=y -CONFIG_BINFMT_AOUT=m -CONFIG_BINFMT_MISC=m - -# -# Networking -# -CONFIG_NET=y - -# -# Networking options -# -# CONFIG_NETDEBUG is not set -CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=y -CONFIG_XFRM=y -CONFIG_XFRM_USER=y -# CONFIG_XFRM_SUB_POLICY is not set -CONFIG_NET_KEY=m -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_ASK_IP_FIB_HASH=y -# CONFIG_IP_FIB_TRIE is not set -CONFIG_IP_FIB_HASH=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_FWMARK=y -CONFIG_IP_ROUTE_MULTIPATH=y -# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set -CONFIG_IP_ROUTE_VERBOSE=y -# CONFIG_IP_PNP is not set -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE=m -CONFIG_NET_IPGRE_BROADCAST=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -# CONFIG_ARPD is not set -CONFIG_SYN_COOKIES=y -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INET_TUNNEL=m -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y -CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_BIC=y -CONFIG_TCP_CONG_CUBIC=m -CONFIG_TCP_CONG_WESTWOOD=m -CONFIG_TCP_CONG_HTCP=m -CONFIG_TCP_CONG_HSTCP=m -CONFIG_TCP_CONG_HYBLA=m -CONFIG_TCP_CONG_VEGAS=m -CONFIG_TCP_CONG_SCALABLE=m -# CONFIG_TCP_CONG_LP is not set -# CONFIG_TCP_CONG_VENO is not set -CONFIG_DEFAULT_BIC=y -# CONFIG_DEFAULT_CUBIC is not set -# CONFIG_DEFAULT_HTCP is not set -# CONFIG_DEFAULT_VEGAS is not set -# CONFIG_DEFAULT_WESTWOOD is not set -# CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="bic" - -# -# IP: Virtual Server Configuration -# -CONFIG_IP_VS=m -# CONFIG_IP_VS_DEBUG is not set -CONFIG_IP_VS_TAB_BITS=12 - -# -# IPVS transport protocol load balancing support -# -CONFIG_IP_VS_PROTO_TCP=y -CONFIG_IP_VS_PROTO_UDP=y -CONFIG_IP_VS_PROTO_ESP=y -CONFIG_IP_VS_PROTO_AH=y - -# -# IPVS scheduler -# -CONFIG_IP_VS_RR=m -CONFIG_IP_VS_WRR=m -CONFIG_IP_VS_LC=m -CONFIG_IP_VS_WLC=m -CONFIG_IP_VS_LBLC=m -CONFIG_IP_VS_LBLCR=m -CONFIG_IP_VS_DH=m -CONFIG_IP_VS_SH=m -CONFIG_IP_VS_SED=m -CONFIG_IP_VS_NQ=m - -# -# IPVS application helper -# -CONFIG_IP_VS_FTP=m -CONFIG_IPV6=m -CONFIG_IPV6_PRIVACY=y -# CONFIG_IPV6_ROUTER_PREF is not set -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -# CONFIG_IPV6_MIP6 is not set -CONFIG_INET6_XFRM_TUNNEL=m -CONFIG_INET6_TUNNEL=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=m -CONFIG_IPV6_TUNNEL=m -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_NETLABEL is not set -# CONFIG_NETWORK_SECMARK is not set -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -CONFIG_BRIDGE_NETFILTER=y - -# -# Core Netfilter Configuration -# -CONFIG_NETFILTER_NETLINK=m -CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_NETLINK_LOG=m -CONFIG_NETFILTER_XTABLES=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -# CONFIG_NETFILTER_XT_TARGET_DSCP is not set -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -# CONFIG_NETFILTER_XT_MATCH_DSCP is not set -# CONFIG_NETFILTER_XT_MATCH_ESP is not set -CONFIG_NETFILTER_XT_MATCH_HELPER=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -# CONFIG_NETFILTER_XT_MATCH_POLICY is not set -# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set -CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set -CONFIG_NETFILTER_XT_MATCH_REALM=m -CONFIG_NETFILTER_XT_MATCH_SCTP=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m - -# -# IP: Netfilter Configuration -# -CONFIG_IP_NF_CONNTRACK=m -CONFIG_IP_NF_CT_ACCT=y -CONFIG_IP_NF_CONNTRACK_MARK=y -CONFIG_IP_NF_CONNTRACK_EVENTS=y -CONFIG_IP_NF_CONNTRACK_NETLINK=m -CONFIG_IP_NF_CT_PROTO_SCTP=m -CONFIG_IP_NF_FTP=m -CONFIG_IP_NF_IRC=m -CONFIG_IP_NF_NETBIOS_NS=m -CONFIG_IP_NF_TFTP=m -CONFIG_IP_NF_AMANDA=m -CONFIG_IP_NF_PPTP=m -# CONFIG_IP_NF_H323 is not set -# CONFIG_IP_NF_SIP is not set -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_IPRANGE=m -CONFIG_IP_NF_MATCH_TOS=m -CONFIG_IP_NF_MATCH_RECENT=m -CONFIG_IP_NF_MATCH_ECN=m -# CONFIG_IP_NF_MATCH_AH is not set -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_MATCH_OWNER=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m -CONFIG_IP_NF_MATCH_HASHLIMIT=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_IP_NF_TARGET_TCPMSS=m -CONFIG_IP_NF_NAT=m -CONFIG_IP_NF_NAT_NEEDED=y -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_SAME=m -CONFIG_IP_NF_NAT_SNMP_BASIC=m -CONFIG_IP_NF_NAT_IRC=m -CONFIG_IP_NF_NAT_FTP=m -CONFIG_IP_NF_NAT_TFTP=m -CONFIG_IP_NF_NAT_AMANDA=m -CONFIG_IP_NF_NAT_PPTP=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_TOS=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m - -# -# IPv6: Netfilter Configuration (EXPERIMENTAL) -# -CONFIG_IP6_NF_QUEUE=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_OWNER=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -# CONFIG_IP6_NF_MATCH_AH is not set -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_LOG=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_RAW=m - -# -# DECnet: Netfilter Configuration -# -# CONFIG_DECNET_NF_GRABULATOR is not set - -# -# Bridge: Netfilter Configuration -# -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_802_3=m -CONFIG_BRIDGE_EBT_AMONG=m -CONFIG_BRIDGE_EBT_ARP=m -CONFIG_BRIDGE_EBT_IP=m -CONFIG_BRIDGE_EBT_LIMIT=m -CONFIG_BRIDGE_EBT_MARK=m -CONFIG_BRIDGE_EBT_PKTTYPE=m -CONFIG_BRIDGE_EBT_STP=m -CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_EBT_ARPREPLY=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_MARK_T=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_LOG=m -# CONFIG_BRIDGE_EBT_ULOG is not set - -# -# DCCP Configuration (EXPERIMENTAL) -# -# CONFIG_IP_DCCP is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# -CONFIG_IP_SCTP=m -# CONFIG_SCTP_DBG_MSG is not set -# CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_HMAC_NONE is not set -# CONFIG_SCTP_HMAC_SHA1 is not set -CONFIG_SCTP_HMAC_MD5=y - -# -# TIPC Configuration (EXPERIMENTAL) -# -# CONFIG_TIPC is not set -CONFIG_ATM=m -CONFIG_ATM_CLIP=m -# CONFIG_ATM_CLIP_NO_ICMP is not set -CONFIG_ATM_LANE=m -CONFIG_ATM_MPOA=m -CONFIG_ATM_BR2684=m -# CONFIG_ATM_BR2684_IPFILTER is not set -CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m -CONFIG_DECNET=m -# CONFIG_DECNET_ROUTER is not set -CONFIG_LLC=y -CONFIG_LLC2=m -CONFIG_IPX=m -# CONFIG_IPX_INTERN is not set -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_IPDDP_DECAP=y -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_ECONET is not set -CONFIG_WAN_ROUTER=m - -# -# QoS and/or fair queueing -# -CONFIG_NET_SCHED=y -CONFIG_NET_SCH_CLK_JIFFIES=y -# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set -# CONFIG_NET_SCH_CLK_CPU is not set - -# -# Queueing/Scheduling -# -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_SCH_INGRESS=m - -# -# Classification -# -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -# CONFIG_CLS_U32_MARK is not set -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_EMATCH=y -CONFIG_NET_EMATCH_STACK=32 -CONFIG_NET_EMATCH_CMP=m -CONFIG_NET_EMATCH_NBYTE=m -CONFIG_NET_EMATCH_U32=m -CONFIG_NET_EMATCH_META=m -CONFIG_NET_EMATCH_TEXT=m -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=m -CONFIG_NET_ACT_GACT=m -CONFIG_GACT_PROB=y -CONFIG_NET_ACT_MIRRED=m -CONFIG_NET_ACT_IPT=m -CONFIG_NET_ACT_PEDIT=m -# CONFIG_NET_ACT_SIMP is not set -CONFIG_NET_CLS_IND=y -CONFIG_NET_ESTIMATOR=y - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set -CONFIG_HAMRADIO=y - -# -# Packet Radio protocols -# -CONFIG_AX25=m -# CONFIG_AX25_DAMA_SLAVE is not set -CONFIG_NETROM=m -CONFIG_ROSE=m - -# -# AX.25 network device drivers -# -# CONFIG_MKISS is not set -# CONFIG_6PACK is not set -CONFIG_BPQETHER=m -CONFIG_BAYCOM_SER_FDX=m -CONFIG_BAYCOM_SER_HDX=m -CONFIG_BAYCOM_PAR=m -CONFIG_BAYCOM_EPP=m -CONFIG_YAM=m -CONFIG_IRDA=m - -# -# IrDA protocols -# -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -# CONFIG_IRDA_ULTRA is not set - -# -# IrDA options -# -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -# CONFIG_IRDA_DEBUG is not set - -# -# Infrared-port device drivers -# - -# -# SIR device drivers -# -CONFIG_IRTTY_SIR=m - -# -# Dongle support -# -CONFIG_DONGLE=y -CONFIG_ESI_DONGLE=m -CONFIG_ACTISYS_DONGLE=m -CONFIG_TEKRAM_DONGLE=m -CONFIG_TOIM3232_DONGLE=m -CONFIG_LITELINK_DONGLE=m -CONFIG_MA600_DONGLE=m -CONFIG_GIRBIL_DONGLE=m -CONFIG_MCP2120_DONGLE=m -CONFIG_OLD_BELKIN_DONGLE=m -CONFIG_ACT200L_DONGLE=m - -# -# Old SIR device drivers -# - -# -# Old Serial dongle support -# - -# -# FIR device drivers -# -CONFIG_USB_IRDA=m -CONFIG_SIGMATEL_FIR=m -CONFIG_NSC_FIR=m -CONFIG_WINBOND_FIR=m -CONFIG_TOSHIBA_FIR=m -CONFIG_SMC_IRCC_FIR=m -CONFIG_ALI_FIR=m -CONFIG_VLSI_FIR=m -CONFIG_VIA_FIR=m -# CONFIG_MCS_FIR is not set -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_CMTP=m -CONFIG_BT_HIDP=m - -# -# Bluetooth device drivers -# -CONFIG_BT_HCIUSB=m -CONFIG_BT_HCIUSB_SCO=y -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIDTL1=m -CONFIG_BT_HCIBT3C=m -CONFIG_BT_HCIBLUECARD=m -CONFIG_BT_HCIBTUART=m -CONFIG_BT_HCIVHCI=m -CONFIG_IEEE80211=m -# CONFIG_IEEE80211_DEBUG is not set -CONFIG_IEEE80211_CRYPT_WEP=m -CONFIG_IEEE80211_CRYPT_CCMP=m -CONFIG_IEEE80211_CRYPT_TKIP=m -CONFIG_IEEE80211_SOFTMAC=m -# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set -CONFIG_WIRELESS_EXT=y -CONFIG_FIB_RULES=y - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=y -# CONFIG_SYS_HYPERVISOR is not set - -# -# Connector - unified userspace <-> kernelspace linker -# -CONFIG_CONNECTOR=m - -# -# Memory Technology Devices (MTD) -# -CONFIG_MTD=m -# CONFIG_MTD_DEBUG is not set -CONFIG_MTD_CONCAT=m -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=m -CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 -# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set -# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set - -# -# User Modules And Translation Layers -# -CONFIG_MTD_CHAR=m -CONFIG_MTD_BLOCK=m -CONFIG_MTD_BLOCK_RO=m -CONFIG_FTL=m -CONFIG_NFTL=m -CONFIG_NFTL_RW=y -CONFIG_INFTL=m -CONFIG_RFD_FTL=m -# CONFIG_SSFDC is not set - -# -# RAM/ROM/Flash chip drivers -# -CONFIG_MTD_CFI=m -CONFIG_MTD_JEDECPROBE=m -CONFIG_MTD_GEN_PROBE=m -# CONFIG_MTD_CFI_ADV_OPTIONS is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set -CONFIG_MTD_CFI_INTELEXT=m -CONFIG_MTD_CFI_AMDSTD=m -CONFIG_MTD_CFI_STAA=m -CONFIG_MTD_CFI_UTIL=m -CONFIG_MTD_RAM=m -CONFIG_MTD_ROM=m -CONFIG_MTD_ABSENT=m -# CONFIG_MTD_OBSOLETE_CHIPS is not set - -# -# Mapping drivers for chip access -# -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PHYSMAP=m -CONFIG_MTD_PHYSMAP_START=0x8000000 -CONFIG_MTD_PHYSMAP_LEN=0x4000000 -CONFIG_MTD_PHYSMAP_BANKWIDTH=2 -CONFIG_MTD_PNC2000=m -CONFIG_MTD_SC520CDP=m -CONFIG_MTD_NETSC520=m -CONFIG_MTD_TS5500=m -CONFIG_MTD_SBC_GXX=m -CONFIG_MTD_SCx200_DOCFLASH=m -CONFIG_MTD_AMD76XROM=m -CONFIG_MTD_ICHXROM=m -CONFIG_MTD_SCB2_FLASH=m -CONFIG_MTD_NETtel=m -CONFIG_MTD_DILNETPC=m -CONFIG_MTD_DILNETPC_BOOTSIZE=0x80000 -CONFIG_MTD_L440GX=m -CONFIG_MTD_PCI=m -CONFIG_MTD_PLATRAM=m - -# -# Self-contained MTD device drivers -# -CONFIG_MTD_PMC551=m -CONFIG_MTD_PMC551_BUGFIX=y -# CONFIG_MTD_PMC551_DEBUG is not set -CONFIG_MTD_DATAFLASH=m -CONFIG_MTD_M25P80=m -CONFIG_MTD_SLRAM=m -CONFIG_MTD_PHRAM=m -CONFIG_MTD_MTDRAM=m -CONFIG_MTDRAM_TOTAL_SIZE=4096 -CONFIG_MTDRAM_ERASE_SIZE=128 -CONFIG_MTD_BLOCK2MTD=m - -# -# Disk-On-Chip Device Drivers -# -# CONFIG_MTD_DOC2000 is not set -# CONFIG_MTD_DOC2001 is not set -CONFIG_MTD_DOC2001PLUS=m -CONFIG_MTD_DOCPROBE=m -CONFIG_MTD_DOCECC=m -# CONFIG_MTD_DOCPROBE_ADVANCED is not set -CONFIG_MTD_DOCPROBE_ADDRESS=0 - -# -# NAND Flash Device Drivers -# -CONFIG_MTD_NAND=m -CONFIG_MTD_NAND_VERIFY_WRITE=y -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=m -# CONFIG_MTD_NAND_DISKONCHIP is not set -CONFIG_MTD_NAND_NANDSIM=m - -# -# OneNAND Flash Device Drivers -# -CONFIG_MTD_ONENAND=m -CONFIG_MTD_ONENAND_VERIFY_WRITE=y -# CONFIG_MTD_ONENAND_OTP is not set - -# -# Parallel port support -# -CONFIG_PARPORT=m -CONFIG_PARPORT_PC=m -CONFIG_PARPORT_SERIAL=m -# CONFIG_PARPORT_PC_FIFO is not set -# CONFIG_PARPORT_PC_SUPERIO is not set -CONFIG_PARPORT_PC_PCMCIA=m -CONFIG_PARPORT_NOT_PC=y -# CONFIG_PARPORT_GSC is not set -# CONFIG_PARPORT_AX88796 is not set -CONFIG_PARPORT_1284=y - -# -# Plug and Play support -# -CONFIG_PNP=y -# CONFIG_PNP_DEBUG is not set - -# -# Protocols -# -CONFIG_PNPACPI=y - -# -# Block devices -# -CONFIG_BLK_DEV_FD=y -CONFIG_PARIDE=m -CONFIG_PARIDE_PARPORT=m - -# -# Parallel IDE high-level drivers -# -CONFIG_PARIDE_PD=m -CONFIG_PARIDE_PCD=m -CONFIG_PARIDE_PF=m -CONFIG_PARIDE_PT=m -CONFIG_PARIDE_PG=m - -# -# Parallel IDE protocol modules -# -CONFIG_PARIDE_ATEN=m -CONFIG_PARIDE_BPCK=m -CONFIG_PARIDE_BPCK6=m -CONFIG_PARIDE_COMM=m -CONFIG_PARIDE_DSTR=m -CONFIG_PARIDE_FIT2=m -CONFIG_PARIDE_FIT3=m -CONFIG_PARIDE_EPAT=m -CONFIG_PARIDE_EPATC8=y -CONFIG_PARIDE_EPIA=m -CONFIG_PARIDE_FRIQ=m -CONFIG_PARIDE_FRPW=m -CONFIG_PARIDE_KBIC=m -CONFIG_PARIDE_KTTI=m -CONFIG_PARIDE_ON20=m -CONFIG_PARIDE_ON26=m -CONFIG_BLK_CPQ_DA=m -CONFIG_BLK_CPQ_CISS_DA=m -CONFIG_CISS_SCSI_TAPE=y -CONFIG_BLK_DEV_DAC960=m -CONFIG_BLK_DEV_UMEM=m -# CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_SX8=m -# CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 -CONFIG_BLK_DEV_INITRD=y -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -CONFIG_CDROM_PKTCDVD_WCACHE=y -CONFIG_ATA_OVER_ETH=m - -# -# Misc devices -# -CONFIG_IBM_ASM=m -# CONFIG_SGI_IOC4 is not set -# CONFIG_TIFM_CORE is not set - -# -# ATA/ATAPI/MFM/RLL support -# -CONFIG_IDE=y -CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# -# CONFIG_BLK_DEV_IDE_SATA is not set -# CONFIG_BLK_DEV_HD_IDE is not set -CONFIG_BLK_DEV_IDEDISK=y -CONFIG_IDEDISK_MULTI_MODE=y -CONFIG_BLK_DEV_IDECS=m -CONFIG_BLK_DEV_IDECD=y -CONFIG_BLK_DEV_IDETAPE=m -CONFIG_BLK_DEV_IDEFLOPPY=m -# CONFIG_BLK_DEV_IDESCSI is not set -# CONFIG_IDE_TASK_IOCTL is not set - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_CMD640=y -CONFIG_BLK_DEV_CMD640_ENHANCED=y -CONFIG_BLK_DEV_IDEPNP=y -CONFIG_BLK_DEV_IDEPCI=y -CONFIG_IDEPCI_SHARE_IRQ=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=y -CONFIG_BLK_DEV_OPTI621=y -CONFIG_BLK_DEV_RZ1000=y -CONFIG_BLK_DEV_IDEDMA_PCI=y -# CONFIG_BLK_DEV_IDEDMA_FORCED is not set -CONFIG_IDEDMA_PCI_AUTO=y -# CONFIG_IDEDMA_ONLYDISK is not set -CONFIG_BLK_DEV_AEC62XX=y -CONFIG_BLK_DEV_ALI15X3=y -# CONFIG_WDC_ALI15X3 is not set -CONFIG_BLK_DEV_AMD74XX=y -CONFIG_BLK_DEV_ATIIXP=y -CONFIG_BLK_DEV_CMD64X=y -CONFIG_BLK_DEV_TRIFLEX=y -CONFIG_BLK_DEV_CY82C693=y -CONFIG_BLK_DEV_CS5520=y -CONFIG_BLK_DEV_CS5530=y -CONFIG_BLK_DEV_CS5535=m -CONFIG_BLK_DEV_HPT34X=y -# CONFIG_HPT34X_AUTODMA is not set -CONFIG_BLK_DEV_HPT366=y -# CONFIG_BLK_DEV_JMICRON is not set -CONFIG_BLK_DEV_SC1200=y -CONFIG_BLK_DEV_PIIX=y -CONFIG_BLK_DEV_IT821X=m -CONFIG_BLK_DEV_NS87415=m -CONFIG_BLK_DEV_PDC202XX_OLD=y -CONFIG_PDC202XX_BURST=y -CONFIG_BLK_DEV_PDC202XX_NEW=y -CONFIG_BLK_DEV_SVWKS=y -CONFIG_BLK_DEV_SIIMAGE=y -CONFIG_BLK_DEV_SIS5513=y -CONFIG_BLK_DEV_SLC90E66=y -CONFIG_BLK_DEV_TRM290=y -CONFIG_BLK_DEV_VIA82CXXX=y -# CONFIG_IDE_ARM is not set -CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_IDEDMA_IVB is not set -CONFIG_IDEDMA_AUTO=y -# CONFIG_BLK_DEV_HD is not set - -# -# SCSI device support -# -# CONFIG_RAID_ATTRS is not set -CONFIG_SCSI=y -CONFIG_SCSI_NETLINK=y -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=y -CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SG=m -CONFIG_CHR_DEV_SCH=m - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y - -# -# SCSI Transports -# -CONFIG_SCSI_SPI_ATTRS=y -CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_SAS_ATTRS=m -# CONFIG_SCSI_SAS_LIBSAS is not set - -# -# SCSI low-level drivers -# -# CONFIG_ISCSI_TCP is not set -CONFIG_BLK_DEV_3W_XXXX_RAID=m -CONFIG_SCSI_3W_9XXX=m -CONFIG_SCSI_ACARD=m -CONFIG_SCSI_AACRAID=m -CONFIG_SCSI_AIC7XXX=y -CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 -CONFIG_AIC7XXX_RESET_DELAY_MS=15000 -# CONFIG_AIC7XXX_DEBUG_ENABLE is not set -CONFIG_AIC7XXX_DEBUG_MASK=0 -# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set -CONFIG_SCSI_AIC7XXX_OLD=m -CONFIG_SCSI_AIC79XX=m -CONFIG_AIC79XX_CMDS_PER_DEVICE=4 -CONFIG_AIC79XX_RESET_DELAY_MS=15000 -# CONFIG_AIC79XX_ENABLE_RD_STRM is not set -# CONFIG_AIC79XX_DEBUG_ENABLE is not set -CONFIG_AIC79XX_DEBUG_MASK=0 -# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set -# CONFIG_SCSI_AIC94XX is not set -CONFIG_SCSI_DPT_I2O=m -CONFIG_SCSI_ADVANSYS=m -# CONFIG_SCSI_ARCMSR is not set -# CONFIG_MEGARAID_NEWGEN is not set -CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m -# CONFIG_SCSI_HPTIOP is not set -CONFIG_SCSI_BUSLOGIC=y -# CONFIG_SCSI_OMIT_FLASHPOINT is not set -CONFIG_SCSI_DMX3191D=m -CONFIG_SCSI_EATA=m -# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set -# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set -CONFIG_SCSI_EATA_MAX_TAGS=16 -CONFIG_SCSI_FUTURE_DOMAIN=m -CONFIG_SCSI_GDTH=m -CONFIG_SCSI_IPS=y -CONFIG_SCSI_INITIO=m -CONFIG_SCSI_INIA100=m -CONFIG_SCSI_PPA=m -CONFIG_SCSI_IMM=m -# CONFIG_SCSI_IZIP_EPP16 is not set -# CONFIG_SCSI_IZIP_SLOW_CTR is not set -CONFIG_SCSI_STEX=y -CONFIG_SCSI_SYM53C8XX_2=m -CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 -CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 -CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 -CONFIG_SCSI_SYM53C8XX_MMIO=y -# CONFIG_SCSI_IPR is not set -CONFIG_SCSI_QLOGIC_1280=m -CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set -CONFIG_SCSI_LPFC=m -CONFIG_SCSI_DC395x=m -CONFIG_SCSI_DC390T=m -CONFIG_SCSI_NSP32=m -CONFIG_SCSI_DEBUG=m - -# -# PCMCIA SCSI adapter support -# -CONFIG_PCMCIA_AHA152X=m -CONFIG_PCMCIA_FDOMAIN=m -CONFIG_PCMCIA_NINJA_SCSI=m -CONFIG_PCMCIA_QLOGIC=m -CONFIG_PCMCIA_SYM53C500=m - -# -# Serial ATA (prod) and Parallel ATA (experimental) drivers -# -CONFIG_ATA=y -CONFIG_SATA_AHCI=y -CONFIG_SATA_SVW=m -CONFIG_ATA_PIIX=y -# CONFIG_SATA_MV is not set -CONFIG_SATA_NV=y -CONFIG_PDC_ADMA=m -CONFIG_SATA_QSTOR=m -CONFIG_SATA_PROMISE=y -CONFIG_SATA_SX4=y -CONFIG_SATA_SIL=y -CONFIG_SATA_SIL24=y -CONFIG_SATA_SIS=y -CONFIG_SATA_ULI=y -CONFIG_SATA_VIA=y -CONFIG_SATA_VITESSE=y -CONFIG_SATA_INTEL_COMBINED=y -CONFIG_PATA_ALI=m -CONFIG_PATA_AMD=m -CONFIG_PATA_ARTOP=m -CONFIG_PATA_ATIIXP=m -CONFIG_PATA_CMD64X=m -CONFIG_PATA_CS5520=m -CONFIG_PATA_CS5530=m -CONFIG_PATA_CS5535=m -# CONFIG_PATA_CYPRESS is not set -CONFIG_PATA_EFAR=m -CONFIG_ATA_GENERIC=m -CONFIG_PATA_HPT366=m -# CONFIG_PATA_HPT37X is not set -# CONFIG_PATA_HPT3X2N is not set -CONFIG_PATA_HPT3X3=m -CONFIG_PATA_IT821X=m -CONFIG_PATA_JMICRON=y -CONFIG_PATA_TRIFLEX=m -CONFIG_PATA_MPIIX=m -CONFIG_PATA_OLDPIIX=m -CONFIG_PATA_NETCELL=m -CONFIG_PATA_NS87410=m -# CONFIG_PATA_OPTI is not set -# CONFIG_PATA_OPTIDMA is not set -CONFIG_PATA_PCMCIA=m -# CONFIG_PATA_PDC_OLD is not set -# CONFIG_PATA_RADISYS is not set -CONFIG_PATA_RZ1000=m -CONFIG_PATA_SC1200=m -CONFIG_PATA_SERVERWORKS=m -CONFIG_PATA_PDC2027X=m -CONFIG_PATA_SIL680=m -CONFIG_PATA_SIS=m -CONFIG_PATA_VIA=m -CONFIG_PATA_WINBOND=m - -# -# Multi-device support (RAID and LVM) -# -CONFIG_MD=y -CONFIG_BLK_DEV_MD=y -CONFIG_MD_LINEAR=m -CONFIG_MD_RAID0=y -CONFIG_MD_RAID1=y -# CONFIG_MD_RAID10 is not set -# CONFIG_MD_RAID456 is not set -CONFIG_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -CONFIG_BLK_DEV_DM=m -# CONFIG_DM_DEBUG is not set -CONFIG_DM_CRYPT=m -# CONFIG_DM_SNAPSHOT is not set -# CONFIG_DM_MIRROR is not set -# CONFIG_DM_ZERO is not set -# CONFIG_DM_MULTIPATH is not set - -# -# Fusion MPT device support -# -CONFIG_FUSION=y -CONFIG_FUSION_SPI=m -CONFIG_FUSION_FC=m -CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=128 -CONFIG_FUSION_CTL=m -CONFIG_FUSION_LAN=m - -# -# IEEE 1394 (FireWire) support -# -CONFIG_IEEE1394=y - -# -# Subsystem Options -# -# CONFIG_IEEE1394_VERBOSEDEBUG is not set -# CONFIG_IEEE1394_OUI_DB is not set -CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y -CONFIG_IEEE1394_CONFIG_ROM_IP1394=y -# CONFIG_IEEE1394_EXPORT_FULL_API is not set - -# -# Device Drivers -# -CONFIG_IEEE1394_PCILYNX=m -CONFIG_IEEE1394_OHCI1394=m - -# -# Protocol Drivers -# -CONFIG_IEEE1394_VIDEO1394=m -CONFIG_IEEE1394_SBP2=m -# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set -CONFIG_IEEE1394_ETH1394=m -CONFIG_IEEE1394_DV1394=m -CONFIG_IEEE1394_RAWIO=m - -# -# I2O device support -# -CONFIG_I2O=m -CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y -CONFIG_I2O_EXT_ADAPTEC=y -CONFIG_I2O_CONFIG=m -CONFIG_I2O_CONFIG_OLD_IOCTL=y -CONFIG_I2O_BUS=m -CONFIG_I2O_BLOCK=m -CONFIG_I2O_SCSI=m -CONFIG_I2O_PROC=m - -# -# Network device support -# -CONFIG_NETDEVICES=y -CONFIG_IFB=m -CONFIG_DUMMY=m -CONFIG_BONDING=m -CONFIG_EQUALIZER=m -CONFIG_TUN=m -CONFIG_NET_SB1000=m - -# -# ARCnet devices -# -CONFIG_ARCNET=m -CONFIG_ARCNET_1201=m -CONFIG_ARCNET_1051=m -CONFIG_ARCNET_RAW=m -CONFIG_ARCNET_CAP=m -CONFIG_ARCNET_COM90xx=m -CONFIG_ARCNET_COM90xxIO=m -CONFIG_ARCNET_RIM_I=m -CONFIG_ARCNET_COM20020=m -CONFIG_ARCNET_COM20020_PCI=m - -# -# PHY device support -# -CONFIG_PHYLIB=m - -# -# MII PHY device drivers -# -CONFIG_MARVELL_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_LXT_PHY=m -CONFIG_CICADA_PHY=m -# CONFIG_VITESSE_PHY is not set -# CONFIG_SMSC_PHY is not set -# CONFIG_FIXED_PHY is not set - -# -# Ethernet (10 or 100Mbit) -# -CONFIG_NET_ETHERNET=y -CONFIG_MII=m -CONFIG_HAPPYMEAL=m -CONFIG_SUNGEM=m -CONFIG_CASSINI=m -CONFIG_NET_VENDOR_3COM=y -CONFIG_VORTEX=m -CONFIG_TYPHOON=m - -# -# Tulip family network device support -# -CONFIG_NET_TULIP=y -CONFIG_DE2104X=m -CONFIG_TULIP=m -# CONFIG_TULIP_MWI is not set -CONFIG_TULIP_MMIO=y -# CONFIG_TULIP_NAPI is not set -CONFIG_DE4X5=m -CONFIG_WINBOND_840=m -CONFIG_DM9102=m -CONFIG_ULI526X=m -CONFIG_PCMCIA_XIRCOM=m -CONFIG_HP100=m -CONFIG_NET_PCI=y -CONFIG_PCNET32=m -# CONFIG_PCNET32_NAPI is not set -CONFIG_AMD8111_ETH=m -# CONFIG_AMD8111E_NAPI is not set -CONFIG_ADAPTEC_STARFIRE=m -CONFIG_ADAPTEC_STARFIRE_NAPI=y -CONFIG_B44=m -CONFIG_FORCEDETH=m -# CONFIG_FORCEDETH_NAPI is not set -CONFIG_DGRS=m -CONFIG_EEPRO100=m -CONFIG_E100=m -CONFIG_FEALNX=m -CONFIG_NATSEMI=m -CONFIG_NE2K_PCI=m -CONFIG_8139CP=m -CONFIG_8139TOO=m -CONFIG_8139TOO_PIO=y -# CONFIG_8139TOO_TUNE_TWISTER is not set -CONFIG_8139TOO_8129=y -# CONFIG_8139_OLD_RX_RESET is not set -CONFIG_SIS900=m -CONFIG_EPIC100=m -CONFIG_SUNDANCE=m -# CONFIG_SUNDANCE_MMIO is not set -CONFIG_TLAN=m -CONFIG_VIA_RHINE=m -CONFIG_VIA_RHINE_MMIO=y -# CONFIG_VIA_RHINE_NAPI is not set -CONFIG_NET_POCKET=y -CONFIG_ATP=m -CONFIG_DE600=m -CONFIG_DE620=m - -# -# Ethernet (1000 Mbit) -# -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_E1000_NAPI=y -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -# CONFIG_R8169_NAPI is not set -# CONFIG_R8169_VLAN is not set -CONFIG_SIS190=m -CONFIG_SKGE=m -CONFIG_SKY2=m -CONFIG_SK98LIN=m -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m -# CONFIG_QLA3XXX is not set - -# -# Ethernet (10000 Mbit) -# -CONFIG_CHELSIO_T1=m -CONFIG_IXGB=m -CONFIG_IXGB_NAPI=y -CONFIG_S2IO=m -CONFIG_S2IO_NAPI=y -# CONFIG_MYRI10GE is not set - -# -# Token Ring devices -# -CONFIG_TR=y -CONFIG_IBMOL=m -CONFIG_IBMLS=m -CONFIG_3C359=m -CONFIG_TMS380TR=m -CONFIG_TMSPCI=m -CONFIG_ABYSS=m - -# -# Wireless LAN (non-hamradio) -# -CONFIG_NET_RADIO=y -CONFIG_NET_WIRELESS_RTNETLINK=y - -# -# Obsolete Wireless cards support (pre-802.11) -# -CONFIG_STRIP=m -CONFIG_PCMCIA_WAVELAN=m -CONFIG_PCMCIA_NETWAVE=m - -# -# Wireless 802.11 Frequency Hopping cards support -# -CONFIG_PCMCIA_RAYCS=m - -# -# Wireless 802.11b ISA/PCI cards support -# -CONFIG_IPW2100=m -CONFIG_IPW2100_MONITOR=y -# CONFIG_IPW2100_DEBUG is not set -CONFIG_IPW2200=m -CONFIG_IPW2200_MONITOR=y -# CONFIG_IPW2200_RADIOTAP is not set -# CONFIG_IPW2200_PROMISCUOUS is not set -# CONFIG_IPW2200_QOS is not set -# CONFIG_IPW2200_DEBUG is not set -CONFIG_AIRO=m -CONFIG_HERMES=m -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCI_HERMES=m -CONFIG_ATMEL=m -CONFIG_PCI_ATMEL=m - -# -# Wireless 802.11b Pcmcia/Cardbus cards support -# -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_AIRO_CS=m -CONFIG_PCMCIA_ATMEL=m -CONFIG_PCMCIA_WL3501=m - -# -# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support -# -CONFIG_PRISM54=m -CONFIG_USB_ZD1201=m -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_PCI=m -CONFIG_HOSTAP_CS=m -CONFIG_BCM43XX=m -# CONFIG_BCM43XX_DEBUG is not set -CONFIG_BCM43XX_DMA=y -CONFIG_BCM43XX_PIO=y -CONFIG_BCM43XX_DMA_AND_PIO_MODE=y -# CONFIG_BCM43XX_DMA_MODE is not set -# CONFIG_BCM43XX_PIO_MODE is not set -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_NET_WIRELESS=y - -# -# PCMCIA network device support -# -CONFIG_NET_PCMCIA=y -CONFIG_PCMCIA_3C589=m -CONFIG_PCMCIA_3C574=m -CONFIG_PCMCIA_FMVJ18X=m -CONFIG_PCMCIA_PCNET=m -CONFIG_PCMCIA_NMCLAN=m -CONFIG_PCMCIA_SMC91C92=m -CONFIG_PCMCIA_XIRC2PS=m -CONFIG_PCMCIA_AXNET=m -CONFIG_ARCNET_COM20020_CS=m -CONFIG_PCMCIA_IBMTR=m - -# -# Wan interfaces -# -CONFIG_WAN=y -CONFIG_DSCC4=m -# CONFIG_DSCC4_PCISYNC is not set -# CONFIG_DSCC4_PCI_RST is not set -CONFIG_LANMEDIA=m -CONFIG_HDLC=m -CONFIG_HDLC_RAW=m -CONFIG_HDLC_RAW_ETH=m -CONFIG_HDLC_CISCO=m -CONFIG_HDLC_FR=m -CONFIG_HDLC_PPP=m - -# -# X.25/LAPB support is disabled -# -CONFIG_PCI200SYN=m -CONFIG_WANXL=m -CONFIG_PC300=m -CONFIG_PC300_MLPPP=y - -# -# Cyclades-PC300 MLPPP support is disabled. -# - -# -# Refer to the file README.mlppp, provided by PC300 package. -# -CONFIG_FARSYNC=m -CONFIG_DLCI=m -CONFIG_DLCI_COUNT=24 -CONFIG_DLCI_MAX=8 -CONFIG_WAN_ROUTER_DRIVERS=y -CONFIG_CYCLADES_SYNC=m -CONFIG_CYCLOMX_X25=y -CONFIG_SBNI=m -# CONFIG_SBNI_MULTILINE is not set - -# -# ATM drivers -# -# CONFIG_ATM_DUMMY is not set -CONFIG_ATM_TCP=m -CONFIG_ATM_LANAI=m -CONFIG_ATM_ENI=m -# CONFIG_ATM_ENI_DEBUG is not set -# CONFIG_ATM_ENI_TUNE_BURST is not set -CONFIG_ATM_FIRESTREAM=m -CONFIG_ATM_ZATM=m -# CONFIG_ATM_ZATM_DEBUG is not set -CONFIG_ATM_NICSTAR=m -# CONFIG_ATM_NICSTAR_USE_SUNI is not set -# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set -CONFIG_ATM_IDT77252=m -# CONFIG_ATM_IDT77252_DEBUG is not set -# CONFIG_ATM_IDT77252_RCV_ALL is not set -CONFIG_ATM_IDT77252_USE_SUNI=y -CONFIG_ATM_AMBASSADOR=m -# CONFIG_ATM_AMBASSADOR_DEBUG is not set -CONFIG_ATM_HORIZON=m -# CONFIG_ATM_HORIZON_DEBUG is not set -CONFIG_ATM_IA=m -# CONFIG_ATM_IA_DEBUG is not set -CONFIG_ATM_FORE200E_MAYBE=m -# CONFIG_ATM_FORE200E_PCA is not set -CONFIG_ATM_HE=m -# CONFIG_ATM_HE_USE_SUNI is not set -CONFIG_FDDI=y -CONFIG_DEFXX=m -CONFIG_SKFP=m -CONFIG_HIPPI=y -CONFIG_ROADRUNNER=m -# CONFIG_ROADRUNNER_LARGE_RINGS is not set -CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOE=m -CONFIG_PPPOATM=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLHC=m -CONFIG_SLIP_SMART=y -# CONFIG_SLIP_MODE_SLIP6 is not set -CONFIG_NET_FC=y -CONFIG_SHAPER=m -CONFIG_NETCONSOLE=m -CONFIG_NETPOLL=y -# CONFIG_NETPOLL_RX is not set -# CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y - -# -# ISDN subsystem -# -CONFIG_ISDN=m - -# -# Old ISDN4Linux -# -# CONFIG_ISDN_I4L is not set - -# -# CAPI subsystem -# -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_CAPI_CAPI20=m -CONFIG_ISDN_CAPI_CAPIFS_BOOL=y -CONFIG_ISDN_CAPI_CAPIFS=m - -# -# CAPI hardware drivers -# - -# -# Active AVM cards -# -CONFIG_CAPI_AVM=y -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_AVMB1_C4=m - -# -# Active Eicon DIVA Server cards -# -CONFIG_CAPI_EICON=y -CONFIG_ISDN_DIVAS=m -CONFIG_ISDN_DIVAS_BRIPCI=y -CONFIG_ISDN_DIVAS_PRIPCI=y -CONFIG_ISDN_DIVAS_DIVACAPI=m -CONFIG_ISDN_DIVAS_USERIDI=m -CONFIG_ISDN_DIVAS_MAINT=m - -# -# Telephony Support -# -CONFIG_PHONE=m -CONFIG_PHONE_IXJ=m -CONFIG_PHONE_IXJ_PCMCIA=m - -# -# Input device support -# -CONFIG_INPUT=y -CONFIG_INPUT_FF_MEMLESS=y - -# -# Userland interfaces -# -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -CONFIG_INPUT_JOYDEV=m -CONFIG_INPUT_TSDEV=m -CONFIG_INPUT_TSDEV_SCREEN_X=240 -CONFIG_INPUT_TSDEV_SCREEN_Y=320 -CONFIG_INPUT_EVDEV=m -# CONFIG_INPUT_EVBUG is not set - -# -# Input Device Drivers -# -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set -# CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_KEYBOARD_STOWAWAY is not set -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=y -CONFIG_MOUSE_SERIAL=m -CONFIG_MOUSE_VSXXXAA=m -CONFIG_INPUT_JOYSTICK=y -CONFIG_JOYSTICK_ANALOG=m -CONFIG_JOYSTICK_A3D=m -CONFIG_JOYSTICK_ADI=m -CONFIG_JOYSTICK_COBRA=m -CONFIG_JOYSTICK_GF2K=m -CONFIG_JOYSTICK_GRIP=m -CONFIG_JOYSTICK_GRIP_MP=m -CONFIG_JOYSTICK_GUILLEMOT=m -CONFIG_JOYSTICK_INTERACT=m -CONFIG_JOYSTICK_SIDEWINDER=m -CONFIG_JOYSTICK_TMDC=m -CONFIG_JOYSTICK_IFORCE=m -CONFIG_JOYSTICK_IFORCE_USB=y -CONFIG_JOYSTICK_IFORCE_232=y -CONFIG_JOYSTICK_WARRIOR=m -CONFIG_JOYSTICK_MAGELLAN=m -CONFIG_JOYSTICK_SPACEORB=m -CONFIG_JOYSTICK_SPACEBALL=m -CONFIG_JOYSTICK_STINGER=m -CONFIG_JOYSTICK_TWIDJOY=m -CONFIG_JOYSTICK_DB9=m -CONFIG_JOYSTICK_GAMECON=m -CONFIG_JOYSTICK_TURBOGRAFX=m -# CONFIG_JOYSTICK_JOYDUMP is not set -CONFIG_INPUT_TOUCHSCREEN=y -# CONFIG_TOUCHSCREEN_ADS7846 is not set -CONFIG_TOUCHSCREEN_GUNZE=m -CONFIG_TOUCHSCREEN_ELO=m -CONFIG_TOUCHSCREEN_MTOUCH=m -CONFIG_TOUCHSCREEN_MK712=m -# CONFIG_TOUCHSCREEN_PENMOUNT is not set -# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set -# CONFIG_TOUCHSCREEN_TOUCHWIN is not set -CONFIG_INPUT_MISC=y -CONFIG_INPUT_PCSPKR=m -# CONFIG_INPUT_WISTRON_BTNS is not set -CONFIG_INPUT_UINPUT=m - -# -# Hardware I/O ports -# -CONFIG_SERIO=y -CONFIG_SERIO_I8042=y -CONFIG_SERIO_SERPORT=m -CONFIG_SERIO_CT82C710=m -CONFIG_SERIO_PARKBD=m -CONFIG_SERIO_PCIPS2=m -CONFIG_SERIO_LIBPS2=y -# CONFIG_SERIO_RAW is not set -CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m -CONFIG_GAMEPORT_EMU10K1=m -CONFIG_GAMEPORT_FM801=m - -# -# Character devices -# -CONFIG_VT=y -CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y -# CONFIG_VT_HW_CONSOLE_BINDING is not set -CONFIG_SERIAL_NONSTANDARD=y -CONFIG_COMPUTONE=m -CONFIG_ROCKETPORT=m -CONFIG_CYCLADES=m -# CONFIG_CYZ_INTR is not set -CONFIG_DIGIEPCA=m -CONFIG_MOXA_INTELLIO=m -CONFIG_MOXA_SMARTIO=m -# CONFIG_ISI is not set -CONFIG_SYNCLINK=m -CONFIG_SYNCLINKMP=m -CONFIG_SYNCLINK_GT=m -CONFIG_N_HDLC=m -CONFIG_SPECIALIX=m -CONFIG_SPECIALIX_RTSCTS=y -CONFIG_SX=m -CONFIG_RIO=m -# CONFIG_RIO_OLDPCI is not set -CONFIG_STALDRV=y - -# -# Serial drivers -# -CONFIG_SERIAL_8250=m -CONFIG_SERIAL_8250_PCI=m -CONFIG_SERIAL_8250_PNP=m -CONFIG_SERIAL_8250_CS=m -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_8250_DETECT_IRQ=y -CONFIG_SERIAL_8250_RSA=y - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_CORE=m -CONFIG_SERIAL_JSM=m -CONFIG_UNIX98_PTYS=y -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 -CONFIG_PRINTER=m -CONFIG_LP_CONSOLE=y -CONFIG_PPDEV=m -CONFIG_TIPAR=m - -# -# IPMI -# -CONFIG_IPMI_HANDLER=m -# CONFIG_IPMI_PANIC_EVENT is not set -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_WATCHDOG=m -CONFIG_IPMI_POWEROFF=m - -# -# Watchdog Cards -# -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -CONFIG_ACQUIRE_WDT=m -CONFIG_ADVANTECH_WDT=m -CONFIG_ALIM1535_WDT=m -CONFIG_ALIM7101_WDT=m -CONFIG_SC520_WDT=m -CONFIG_EUROTECH_WDT=m -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m -CONFIG_WAFER_WDT=m -CONFIG_I6300ESB_WDT=m -CONFIG_I8XX_TCO=m -# CONFIG_ITCO_WDT is not set -CONFIG_SC1200_WDT=m -CONFIG_SCx200_WDT=m -CONFIG_60XX_WDT=m -CONFIG_SBC8360_WDT=m -CONFIG_CPU5_WDT=m -# CONFIG_SMSC37B787_WDT is not set -CONFIG_W83627HF_WDT=m -# CONFIG_W83697HF_WDT is not set -CONFIG_W83877F_WDT=m -CONFIG_W83977F_WDT=m -CONFIG_MACHZ_WDT=m -CONFIG_SBC_EPX_C3_WATCHDOG=m - -# -# PCI-based Watchdog Cards -# -CONFIG_PCIPCWATCHDOG=m -CONFIG_WDTPCI=m -CONFIG_WDT_501_PCI=y - -# -# USB-based Watchdog Cards -# -CONFIG_USBPCWATCHDOG=m -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_INTEL=y -CONFIG_HW_RANDOM_AMD=y -CONFIG_HW_RANDOM_GEODE=y -CONFIG_HW_RANDOM_VIA=y -CONFIG_NVRAM=m -CONFIG_RTC=y -CONFIG_DTLK=m -CONFIG_R3964=m -CONFIG_APPLICOM=m -CONFIG_SONYPI=m - -# -# Ftape, the floppy tape device driver -# -CONFIG_AGP=m -CONFIG_AGP_ALI=m -CONFIG_AGP_ATI=m -CONFIG_AGP_AMD=m -CONFIG_AGP_AMD64=m -CONFIG_AGP_INTEL=m -CONFIG_AGP_NVIDIA=m -CONFIG_AGP_SIS=m -CONFIG_AGP_SWORKS=m -CONFIG_AGP_VIA=m -CONFIG_AGP_EFFICEON=m -CONFIG_DRM=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m -CONFIG_DRM_I810=m -CONFIG_DRM_I830=m -CONFIG_DRM_I915=m -CONFIG_DRM_MGA=m -CONFIG_DRM_SIS=m -CONFIG_DRM_VIA=m -CONFIG_DRM_SAVAGE=m - -# -# PCMCIA character devices -# -CONFIG_SYNCLINK_CS=m -CONFIG_CARDMAN_4000=m -CONFIG_CARDMAN_4040=m -CONFIG_MWAVE=m -CONFIG_SCx200_GPIO=m -CONFIG_PC8736x_GPIO=m -CONFIG_NSC_GPIO=m -CONFIG_CS5535_GPIO=m -# CONFIG_RAW_DRIVER is not set -CONFIG_HPET=y -# CONFIG_HPET_RTC_IRQ is not set -CONFIG_HPET_MMAP=y -CONFIG_HANGCHECK_TIMER=m - -# -# TPM devices -# -CONFIG_TCG_TPM=m -CONFIG_TCG_TIS=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m -CONFIG_TCG_INFINEON=m -# CONFIG_TCG_XEN is not set -CONFIG_TELCLOCK=m - -# -# I2C support -# -CONFIG_I2C=m -CONFIG_I2C_CHARDEV=m - -# -# I2C Algorithms -# -CONFIG_I2C_ALGOBIT=m -CONFIG_I2C_ALGOPCF=m -CONFIG_I2C_ALGOPCA=m - -# -# I2C Hardware Bus support -# -CONFIG_I2C_ALI1535=m -CONFIG_I2C_ALI1563=m -CONFIG_I2C_ALI15X3=m -CONFIG_I2C_AMD756=m -CONFIG_I2C_AMD756_S4882=m -CONFIG_I2C_AMD8111=m -CONFIG_I2C_I801=m -CONFIG_I2C_I810=m -CONFIG_I2C_PIIX4=m -CONFIG_I2C_ISA=m -CONFIG_I2C_NFORCE2=m -# CONFIG_I2C_OCORES is not set -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_PROSAVAGE=m -CONFIG_I2C_SAVAGE4=m -CONFIG_SCx200_I2C=m -CONFIG_SCx200_I2C_SCL=12 -CONFIG_SCx200_I2C_SDA=13 -CONFIG_SCx200_ACB=m -CONFIG_I2C_SIS5595=m -CONFIG_I2C_SIS630=m -CONFIG_I2C_SIS96X=m -# CONFIG_I2C_STUB is not set -CONFIG_I2C_VIA=m -CONFIG_I2C_VIAPRO=m -CONFIG_I2C_VOODOO3=m -CONFIG_I2C_PCA_ISA=m - -# -# Miscellaneous I2C Chip support -# -CONFIG_SENSORS_DS1337=m -CONFIG_SENSORS_DS1374=m -CONFIG_SENSORS_EEPROM=m -CONFIG_SENSORS_PCF8574=m -CONFIG_SENSORS_PCA9539=m -CONFIG_SENSORS_PCF8591=m -CONFIG_SENSORS_MAX6875=m -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set - -# -# SPI support -# -CONFIG_SPI=y -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -CONFIG_SPI_BITBANG=m -# CONFIG_SPI_BUTTERFLY is not set - -# -# SPI Protocol Masters -# - -# -# Dallas's 1-wire bus -# -CONFIG_W1=m -CONFIG_W1_CON=y - -# -# 1-wire Bus Masters -# -CONFIG_W1_MASTER_MATROX=m -# CONFIG_W1_MASTER_DS2490 is not set -CONFIG_W1_MASTER_DS2482=m - -# -# 1-wire Slaves -# -CONFIG_W1_SLAVE_THERM=m -CONFIG_W1_SLAVE_SMEM=m -CONFIG_W1_SLAVE_DS2433=m -# CONFIG_W1_SLAVE_DS2433_CRC is not set - -# -# Hardware Monitoring support -# -CONFIG_HWMON=y -CONFIG_HWMON_VID=m -# CONFIG_SENSORS_ABITUGURU is not set -CONFIG_SENSORS_ADM1021=m -CONFIG_SENSORS_ADM1025=m -CONFIG_SENSORS_ADM1026=m -CONFIG_SENSORS_ADM1031=m -CONFIG_SENSORS_ADM9240=m -# CONFIG_SENSORS_K8TEMP is not set -CONFIG_SENSORS_ASB100=m -CONFIG_SENSORS_ATXP1=m -CONFIG_SENSORS_DS1621=m -CONFIG_SENSORS_F71805F=m -CONFIG_SENSORS_FSCHER=m -CONFIG_SENSORS_FSCPOS=m -CONFIG_SENSORS_GL518SM=m -CONFIG_SENSORS_GL520SM=m -CONFIG_SENSORS_IT87=m -CONFIG_SENSORS_LM63=m -# CONFIG_SENSORS_LM70 is not set -CONFIG_SENSORS_LM75=m -CONFIG_SENSORS_LM77=m -CONFIG_SENSORS_LM78=m -CONFIG_SENSORS_LM80=m -CONFIG_SENSORS_LM83=m -CONFIG_SENSORS_LM85=m -CONFIG_SENSORS_LM87=m -CONFIG_SENSORS_LM90=m -CONFIG_SENSORS_LM92=m -CONFIG_SENSORS_MAX1619=m -CONFIG_SENSORS_PC87360=m -CONFIG_SENSORS_SIS5595=m -CONFIG_SENSORS_SMSC47M1=m -# CONFIG_SENSORS_SMSC47M192 is not set -CONFIG_SENSORS_SMSC47B397=m -CONFIG_SENSORS_VIA686A=m -# CONFIG_SENSORS_VT1211 is not set -CONFIG_SENSORS_VT8231=m -CONFIG_SENSORS_W83781D=m -# CONFIG_SENSORS_W83791D is not set -CONFIG_SENSORS_W83792D=m -CONFIG_SENSORS_W83L785TS=m -CONFIG_SENSORS_W83627HF=m -CONFIG_SENSORS_W83627EHF=m -CONFIG_SENSORS_HDAPS=m -# CONFIG_HWMON_DEBUG_CHIP is not set - -# -# Multimedia devices -# -CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L1=y -CONFIG_VIDEO_V4L1_COMPAT=y -CONFIG_VIDEO_V4L2=y - -# -# Video Capture Adapters -# - -# -# Video Capture Adapters -# -# CONFIG_VIDEO_ADV_DEBUG is not set -CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TDA9875=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA7111=m -CONFIG_VIDEO_SAA7114=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_VPX3220=m -CONFIG_VIDEO_CX2341X=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m -CONFIG_VIDEO_VIVI=m -CONFIG_VIDEO_BT848=m -CONFIG_VIDEO_BT848_DVB=y -CONFIG_VIDEO_SAA6588=m -CONFIG_VIDEO_BWQCAM=m -CONFIG_VIDEO_CQCAM=m -CONFIG_VIDEO_W9966=m -CONFIG_VIDEO_CPIA=m -CONFIG_VIDEO_CPIA_PP=m -CONFIG_VIDEO_CPIA_USB=m -CONFIG_VIDEO_CPIA2=m -CONFIG_VIDEO_SAA5246A=m -CONFIG_VIDEO_SAA5249=m -CONFIG_TUNER_3036=m -CONFIG_VIDEO_STRADIS=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m -CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_SAA7134=m -CONFIG_VIDEO_SAA7134_ALSA=m -CONFIG_VIDEO_SAA7134_DVB=m -CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_DPC=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_CX88=m -CONFIG_VIDEO_CX88_ALSA=m -CONFIG_VIDEO_CX88_BLACKBIRD=m -CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88_VP3054=m - -# -# V4L USB devices -# -CONFIG_VIDEO_PVRUSB2=m -# CONFIG_VIDEO_PVRUSB2_29XXX is not set -# CONFIG_VIDEO_PVRUSB2_24XXX is not set -CONFIG_VIDEO_PVRUSB2_SYSFS=y -# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_USBVIDEO=m -CONFIG_USB_VICAM=m -CONFIG_USB_IBMCAM=m -CONFIG_USB_KONICAWC=m -CONFIG_USB_QUICKCAM_MESSENGER=m -CONFIG_USB_ET61X251=m -CONFIG_VIDEO_OVCAMCHIP=m -CONFIG_USB_W9968CF=m -CONFIG_USB_OV511=m -CONFIG_USB_SE401=m -CONFIG_USB_SN9C102=m -CONFIG_USB_STV680=m -CONFIG_USB_ZC0301=m -CONFIG_USB_PWC=m -# CONFIG_USB_PWC_DEBUG is not set - -# -# Radio Adapters -# -CONFIG_RADIO_GEMTEK_PCI=m -CONFIG_RADIO_MAXIRADIO=m -CONFIG_RADIO_MAESTRO=m -CONFIG_USB_DSBR=m - -# -# Digital Video Broadcasting Devices -# -CONFIG_DVB=y -CONFIG_DVB_CORE=m -# CONFIG_DVB_CORE_ATTACH is not set - -# -# Supported SAA7146 based PCI Adapters -# -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m - -# -# Supported USB Adapters -# -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set -CONFIG_DVB_USB_DIBUSB_MC=m -# CONFIG_DVB_USB_DIB0700 is not set -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_DVB_CINERGYT2=m -# CONFIG_DVB_CINERGYT2_TUNING is not set - -# -# Supported FlexCopII (B2C2) Adapters -# -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set - -# -# Supported BT878 Adapters -# -CONFIG_DVB_BT8XX=m - -# -# Supported Pluto2 Adapters -# -CONFIG_DVB_PLUTO2=m - -# -# Supported DVB Frontends -# - -# -# Customise DVB Frontends -# -# CONFIG_DVB_FE_CUSTOMISE is not set - -# -# DVB-S (satellite) frontends -# -CONFIG_DVB_STV0299=m -CONFIG_DVB_CX24110=m -CONFIG_DVB_CX24123=m -CONFIG_DVB_TDA8083=m -CONFIG_DVB_MT312=m -CONFIG_DVB_VES1X93=m -CONFIG_DVB_S5H1420=m -CONFIG_DVB_TDA10086=m - -# -# DVB-T (terrestrial) frontends -# -CONFIG_DVB_SP8870=m -CONFIG_DVB_SP887X=m -CONFIG_DVB_CX22700=m -CONFIG_DVB_CX22702=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m -CONFIG_DVB_MT352=m -CONFIG_DVB_ZL10353=m -CONFIG_DVB_DIB3000MB=m -CONFIG_DVB_DIB3000MC=m - -# -# DVB-C (cable) frontends -# -CONFIG_DVB_VES1820=m -CONFIG_DVB_TDA10021=m -CONFIG_DVB_STV0297=m - -# -# ATSC (North American/Korean Terrestrial/Cable DTV) frontends -# -CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m -CONFIG_DVB_OR51132=m -CONFIG_DVB_BCM3510=m -CONFIG_DVB_LGDT330X=m - -# -# Tuners/PLL support -# -CONFIG_DVB_PLL=m -CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUNER_MT2060=m - -# -# Miscellaneous devices -# -CONFIG_DVB_LNBP21=m -CONFIG_DVB_ISL6421=m -CONFIG_DVB_TUA6100=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_VIDEO_VIDEOBUF=m -CONFIG_VIDEO_TUNER=m -CONFIG_VIDEO_BUF=m -CONFIG_VIDEO_BUF_DVB=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_IR=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_USB_DABUSB=m - -# -# Graphics support -# -CONFIG_FIRMWARE_EDID=y -CONFIG_FB=y -CONFIG_FB_DDC=m -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -# CONFIG_FB_MACMODES is not set -# CONFIG_FB_BACKLIGHT is not set -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_CIRRUS is not set -# CONFIG_FB_PM2 is not set -# CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_ARC is not set -# CONFIG_FB_ASILIANT is not set -# CONFIG_FB_IMSTT is not set -CONFIG_FB_VGA16=m -CONFIG_FB_VESA=y -# CONFIG_FB_HGA is not set -# CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set -CONFIG_FB_I810=m -CONFIG_FB_I810_GTF=y -# CONFIG_FB_I810_I2C is not set -CONFIG_FB_INTEL=m -# CONFIG_FB_INTEL_DEBUG is not set -CONFIG_FB_INTEL_I2C=y -CONFIG_FB_MATROX=m -# CONFIG_FB_MATROX_MILLENIUM is not set -# CONFIG_FB_MATROX_MYSTIQUE is not set -CONFIG_FB_MATROX_G=y -CONFIG_FB_MATROX_I2C=m -CONFIG_FB_MATROX_MAVEN=m -CONFIG_FB_MATROX_MULTIHEAD=y -CONFIG_FB_RADEON=m -CONFIG_FB_RADEON_I2C=y -# CONFIG_FB_RADEON_DEBUG is not set -CONFIG_FB_ATY128=m -CONFIG_FB_ATY=m -# CONFIG_FB_ATY_CT is not set -# CONFIG_FB_ATY_GX is not set -# CONFIG_FB_SAVAGE is not set -CONFIG_FB_SIS=m -CONFIG_FB_SIS_300=y -CONFIG_FB_SIS_315=y -# CONFIG_FB_NEOMAGIC is not set -# CONFIG_FB_KYRO is not set -# CONFIG_FB_3DFX is not set -# CONFIG_FB_VOODOO1 is not set -# CONFIG_FB_CYBLA is not set -# CONFIG_FB_TRIDENT is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_VIRTUAL is not set - -# -# Console display driver support -# -CONFIG_VGA_CONSOLE=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set -CONFIG_VIDEO_SELECT=y -CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -# CONFIG_FONT_6x11 is not set -# CONFIG_FONT_7x14 is not set -# CONFIG_FONT_PEARL_8x8 is not set -# CONFIG_FONT_ACORN_8x8 is not set -# CONFIG_FONT_MINI_4x6 is not set -# CONFIG_FONT_SUN8x16 is not set -# CONFIG_FONT_SUN12x22 is not set -# CONFIG_FONT_10x18 is not set - -# -# Logo configuration -# -# CONFIG_LOGO is not set -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set - -# -# Sound -# -CONFIG_SOUND=y - -# -# Advanced Linux Sound Architecture -# -CONFIG_SND=y -CONFIG_SND_TIMER=y -CONFIG_SND_PCM=y -CONFIG_SND_HWDEP=m -CONFIG_SND_RAWMIDI=m -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m -CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y -CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_SEQUENCER_OSS=y -CONFIG_SND_RTCTIMER=m -CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y -# CONFIG_SND_DYNAMIC_MINORS is not set -CONFIG_SND_SUPPORT_OLD_API=y -# CONFIG_SND_VERBOSE_PROCFS is not set -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set - -# -# Generic devices -# -CONFIG_SND_MPU401_UART=m -CONFIG_SND_OPL3_LIB=m -CONFIG_SND_VX_LIB=m -CONFIG_SND_AC97_CODEC=m -CONFIG_SND_AC97_BUS=m -CONFIG_SND_DUMMY=m -CONFIG_SND_VIRMIDI=m -CONFIG_SND_MTPAV=m -# CONFIG_SND_MTS64 is not set -CONFIG_SND_SERIAL_U16550=m -CONFIG_SND_MPU401=m - -# -# PCI devices -# -CONFIG_SND_AD1889=m -CONFIG_SND_ALS300=m -CONFIG_SND_ALS4000=m -CONFIG_SND_ALI5451=m -CONFIG_SND_ATIIXP=m -CONFIG_SND_ATIIXP_MODEM=m -CONFIG_SND_AU8810=m -CONFIG_SND_AU8820=m -CONFIG_SND_AU8830=m -CONFIG_SND_AZT3328=m -CONFIG_SND_BT87X=m -# CONFIG_SND_BT87X_OVERCLOCK is not set -CONFIG_SND_CA0106=m -CONFIG_SND_CMIPCI=m -CONFIG_SND_CS4281=m -CONFIG_SND_CS46XX=m -CONFIG_SND_CS46XX_NEW_DSP=y -CONFIG_SND_CS5535AUDIO=m -CONFIG_SND_DARLA20=m -CONFIG_SND_GINA20=m -CONFIG_SND_LAYLA20=m -CONFIG_SND_DARLA24=m -CONFIG_SND_GINA24=m -CONFIG_SND_LAYLA24=m -CONFIG_SND_MONA=m -CONFIG_SND_MIA=m -CONFIG_SND_ECHO3G=m -CONFIG_SND_INDIGO=m -CONFIG_SND_INDIGOIO=m -CONFIG_SND_INDIGODJ=m -CONFIG_SND_EMU10K1=m -CONFIG_SND_EMU10K1X=m -CONFIG_SND_ENS1370=m -CONFIG_SND_ENS1371=m -CONFIG_SND_ES1938=m -CONFIG_SND_ES1968=m -CONFIG_SND_FM801=m -CONFIG_SND_FM801_TEA575X_BOOL=y -CONFIG_SND_FM801_TEA575X=m -CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDSP=m -CONFIG_SND_HDSPM=m -CONFIG_SND_ICE1712=m -CONFIG_SND_ICE1724=m -CONFIG_SND_INTEL8X0=m -CONFIG_SND_INTEL8X0M=m -CONFIG_SND_KORG1212=m -CONFIG_SND_MAESTRO3=m -CONFIG_SND_MIXART=m -CONFIG_SND_NM256=m -CONFIG_SND_PCXHR=m -CONFIG_SND_RIPTIDE=m -CONFIG_SND_RME32=m -CONFIG_SND_RME96=m -CONFIG_SND_RME9652=m -CONFIG_SND_SONICVIBES=m -CONFIG_SND_TRIDENT=m -CONFIG_SND_VIA82XX=m -CONFIG_SND_VIA82XX_MODEM=m -CONFIG_SND_VX222=m -CONFIG_SND_YMFPCI=m -# CONFIG_SND_AC97_POWER_SAVE is not set - -# -# USB devices -# -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_USX2Y=m - -# -# PCMCIA devices -# -CONFIG_SND_VXPOCKET=m -CONFIG_SND_PDAUDIOCF=m - -# -# Open Sound System -# -# CONFIG_SOUND_PRIME is not set - -# -# USB support -# -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB_ARCH_HAS_EHCI=y -CONFIG_USB=y -# CONFIG_USB_DEBUG is not set - -# -# Miscellaneous USB options -# -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_BANDWIDTH is not set -# CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_SUSPEND is not set -# CONFIG_USB_OTG is not set - -# -# USB Host Controller Drivers -# -CONFIG_USB_EHCI_HCD=m -CONFIG_USB_EHCI_SPLIT_ISO=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -# CONFIG_USB_EHCI_TT_NEWSCHED is not set -CONFIG_USB_ISP116X_HCD=m -CONFIG_USB_OHCI_HCD=m -# CONFIG_USB_OHCI_BIG_ENDIAN is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_UHCI_HCD=m -CONFIG_USB_SL811_HCD=m -CONFIG_USB_SL811_CS=m - -# -# USB Device Class drivers -# -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m - -# -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' -# - -# -# may also be needed; see USB_STORAGE Help for more information -# -CONFIG_USB_STORAGE=m -# CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_DPCM=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -# CONFIG_USB_STORAGE_KARMA is not set -# CONFIG_USB_LIBUSUAL is not set - -# -# USB Input Devices -# -CONFIG_USB_HID=y -CONFIG_USB_HIDINPUT=y -# CONFIG_USB_HIDINPUT_POWERBOOK is not set -CONFIG_HID_FF=y -CONFIG_HID_PID=y -CONFIG_LOGITECH_FF=y -CONFIG_THRUSTMASTER_FF=y -# CONFIG_ZEROPLUS_FF is not set -CONFIG_USB_HIDDEV=y -CONFIG_USB_AIPTEK=m -CONFIG_USB_WACOM=m -CONFIG_USB_ACECAD=m -CONFIG_USB_KBTAB=m -CONFIG_USB_POWERMATE=m -CONFIG_USB_TOUCHSCREEN=m -CONFIG_USB_TOUCHSCREEN_EGALAX=y -CONFIG_USB_TOUCHSCREEN_PANJIT=y -CONFIG_USB_TOUCHSCREEN_3M=y -CONFIG_USB_TOUCHSCREEN_ITM=y -CONFIG_USB_TOUCHSCREEN_ETURBO=y -CONFIG_USB_TOUCHSCREEN_GUNZE=y -CONFIG_USB_YEALINK=m -CONFIG_USB_XPAD=m -CONFIG_USB_ATI_REMOTE=m -CONFIG_USB_ATI_REMOTE2=m -# CONFIG_USB_KEYSPAN_REMOTE is not set -CONFIG_USB_APPLETOUCH=m - -# -# USB Imaging devices -# -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m - -# -# USB Network Adapters -# -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET_MII=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m -# CONFIG_USB_NET_MCS7830 is not set -# CONFIG_USB_NET_RNDIS_HOST is not set -CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -# CONFIG_USB_EPSON2888 is not set -CONFIG_USB_NET_ZAURUS=m -# CONFIG_USB_MON is not set - -# -# USB port drivers -# -CONFIG_USB_USS720=m - -# -# USB Serial Converter support -# -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -# CONFIG_USB_SERIAL_AIRCABLE is not set -CONFIG_USB_SERIAL_AIRPRIME=m -CONFIG_USB_SERIAL_ARK3116=m -CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_WHITEHEAT=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_CP2101=m -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_FUNSOFT=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -# CONFIG_USB_SERIAL_MOS7720 is not set -# CONFIG_USB_SERIAL_MOS7840 is not set -CONFIG_USB_SERIAL_NAVMAN=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_SERIAL_HP4X=m -CONFIG_USB_SERIAL_SAFE=m -CONFIG_USB_SERIAL_SAFE_PADDED=y -# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set -CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_EZUSB=y - -# -# USB Miscellaneous drivers -# -CONFIG_USB_EMI62=m -CONFIG_USB_EMI26=m -# CONFIG_USB_ADUTUX is not set -CONFIG_USB_AUERSWALD=m -CONFIG_USB_RIO500=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_LCD=m -CONFIG_USB_LED=m -# CONFIG_USB_CYPRESS_CY7C63 is not set -CONFIG_USB_CYTHERM=m -# CONFIG_USB_PHIDGET is not set -CONFIG_USB_IDMOUSE=m -# CONFIG_USB_FTDI_ELAN is not set -# CONFIG_USB_APPLEDISPLAY is not set -CONFIG_USB_SISUSBVGA=m -# CONFIG_USB_SISUSBVGA_CON is not set -CONFIG_USB_LD=m -# CONFIG_USB_TRANCEVIBRATOR is not set -CONFIG_USB_TEST=m - -# -# USB DSL modem support -# -CONFIG_USB_ATM=m -CONFIG_USB_SPEEDTOUCH=m -CONFIG_USB_CXACRU=m -CONFIG_USB_UEAGLEATM=m -CONFIG_USB_XUSBATM=m - -# -# USB Gadget Support -# -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG_FILES is not set -CONFIG_USB_GADGET_SELECTED=y -CONFIG_USB_GADGET_NET2280=y -CONFIG_USB_NET2280=m -# CONFIG_USB_GADGET_PXA2XX is not set -# CONFIG_USB_GADGET_GOKU is not set -# CONFIG_USB_GADGET_LH7A40X is not set -# CONFIG_USB_GADGET_OMAP is not set -# CONFIG_USB_GADGET_AT91 is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set -CONFIG_USB_GADGET_DUALSPEED=y -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=m -# CONFIG_USB_ETH_RNDIS is not set -# CONFIG_USB_GADGETFS is not set -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_G_SERIAL=m -# CONFIG_USB_MIDI_GADGET is not set - -# -# MMC/SD Card support -# -CONFIG_MMC=m -# CONFIG_MMC_DEBUG is not set -CONFIG_MMC_BLOCK=m -CONFIG_MMC_SDHCI=m -CONFIG_MMC_WBSD=m -# CONFIG_MMC_TIFM_SD is not set - -# -# LED devices -# -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m - -# -# LED drivers -# -# CONFIG_LEDS_NET48XX is not set - -# -# LED Triggers -# -# CONFIG_LEDS_TRIGGERS is not set - -# -# InfiniBand support -# -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -# CONFIG_INFINIBAND_AMSO1100 is not set -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -# CONFIG_INFINIBAND_ISER is not set - -# -# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) -# -# CONFIG_EDAC is not set - -# -# Real Time Clock -# -CONFIG_RTC_LIB=m -CONFIG_RTC_CLASS=m - -# -# RTC interfaces -# -CONFIG_RTC_INTF_SYSFS=m -CONFIG_RTC_INTF_PROC=m -CONFIG_RTC_INTF_DEV=m -# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set - -# -# RTC drivers -# -CONFIG_RTC_DRV_X1205=m -# CONFIG_RTC_DRV_DS1307 is not set -# CONFIG_RTC_DRV_DS1553 is not set -# CONFIG_RTC_DRV_ISL1208 is not set -CONFIG_RTC_DRV_DS1672=m -# CONFIG_RTC_DRV_DS1742 is not set -CONFIG_RTC_DRV_PCF8563=m -# CONFIG_RTC_DRV_PCF8583 is not set -# CONFIG_RTC_DRV_RS5C348 is not set -CONFIG_RTC_DRV_RS5C372=m -CONFIG_RTC_DRV_M48T86=m -CONFIG_RTC_DRV_TEST=m -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_V3020 is not set - -# -# DMA Engine support -# -# CONFIG_DMA_ENGINE is not set - -# -# DMA Clients -# - -# -# DMA Devices -# - -# -# File systems -# -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -# CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -# CONFIG_EXT4DEV_FS is not set -CONFIG_JBD=y -# CONFIG_JBD_DEBUG is not set -CONFIG_FS_MBCACHE=y -CONFIG_REISERFS_FS=y -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -CONFIG_REISERFS_FS_SECURITY=y -CONFIG_JFS_FS=m -CONFIG_JFS_POSIX_ACL=y -CONFIG_JFS_SECURITY=y -# CONFIG_JFS_DEBUG is not set -CONFIG_JFS_STATISTICS=y -CONFIG_FS_POSIX_ACL=y -CONFIG_XFS_FS=y -CONFIG_XFS_QUOTA=y -CONFIG_XFS_SECURITY=y -CONFIG_XFS_POSIX_ACL=y -# CONFIG_XFS_RT is not set -# CONFIG_GFS2_FS is not set -# CONFIG_OCFS2_FS is not set -# CONFIG_MINIX_FS is not set -CONFIG_ROMFS_FS=m -CONFIG_INOTIFY=y -CONFIG_INOTIFY_USER=y -CONFIG_QUOTA=y -CONFIG_QFMT_V1=m -CONFIG_QFMT_V2=m -CONFIG_QUOTACTL=y -CONFIG_DNOTIFY=y -CONFIG_AUTOFS_FS=m -CONFIG_AUTOFS4_FS=m -CONFIG_FUSE_FS=m - -# -# CD-ROM/DVD Filesystems -# -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_ZISOFS_FS=m -CONFIG_UDF_FS=m -CONFIG_UDF_NLS=y - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=m -# CONFIG_MSDOS_FS is not set -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_PROC_KCORE=y -CONFIG_PROC_SYSCTL=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_HUGETLB_PAGE is not set -CONFIG_RAMFS=y -# CONFIG_CONFIGFS_FS is not set - -# -# Miscellaneous filesystems -# -CONFIG_ADFS_FS=m -# CONFIG_ADFS_FS_RW is not set -CONFIG_AFFS_FS=m -# CONFIG_ECRYPT_FS is not set -CONFIG_HFS_FS=m -CONFIG_HFSPLUS_FS=m -CONFIG_BEFS_FS=m -# CONFIG_BEFS_DEBUG is not set -CONFIG_BFS_FS=m -CONFIG_EFS_FS=m -CONFIG_JFFS_FS=m -CONFIG_JFFS_FS_VERBOSE=0 -# CONFIG_JFFS_PROC_FS is not set -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_SUMMARY is not set -# CONFIG_JFFS2_FS_XATTR is not set -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_ZLIB=y -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set -# CONFIG_JFFS2_CMODE_NONE is not set -CONFIG_JFFS2_CMODE_PRIORITY=y -# CONFIG_JFFS2_CMODE_SIZE is not set -CONFIG_CRAMFS=m -CONFIG_VXFS_FS=m -CONFIG_HPFS_FS=m -CONFIG_QNX4FS_FS=m -CONFIG_SYSV_FS=m -CONFIG_UFS_FS=m -# CONFIG_UFS_FS_WRITE is not set -# CONFIG_UFS_DEBUG is not set - -# -# Network File Systems -# -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -# CONFIG_NFS_V3_ACL is not set -CONFIG_NFS_V4=y -CONFIG_NFS_DIRECTIO=y -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -# CONFIG_NFSD_V3_ACL is not set -CONFIG_NFSD_V4=y -CONFIG_NFSD_TCP=y -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_RPCSEC_GSS_KRB5=m -# CONFIG_RPCSEC_GSS_SPKM3 is not set -CONFIG_SMB_FS=m -# CONFIG_SMB_NLS_DEFAULT is not set -CONFIG_CIFS=m -# CONFIG_CIFS_STATS is not set -# CONFIG_CIFS_WEAK_PW_HASH is not set -# CONFIG_CIFS_XATTR is not set -# CONFIG_CIFS_DEBUG2 is not set -# CONFIG_CIFS_EXPERIMENTAL is not set -CONFIG_NCP_FS=m -CONFIG_NCPFS_PACKET_SIGNING=y -CONFIG_NCPFS_IOCTL_LOCKING=y -CONFIG_NCPFS_STRONG=y -CONFIG_NCPFS_NFS_NS=y -CONFIG_NCPFS_OS2_NS=y -CONFIG_NCPFS_SMALLDOS=y -CONFIG_NCPFS_NLS=y -CONFIG_NCPFS_EXTRAS=y -CONFIG_CODA_FS=m -# CONFIG_CODA_FS_OLD_API is not set -CONFIG_AFS_FS=m -CONFIG_RXRPC=m -# CONFIG_9P_FS is not set - -# -# Partition Types -# -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -CONFIG_MAC_PARTITION=y -CONFIG_MSDOS_PARTITION=y -CONFIG_BSD_DISKLABEL=y -# CONFIG_MINIX_SUBPARTITION is not set -CONFIG_SOLARIS_X86_PARTITION=y -# CONFIG_UNIXWARE_DISKLABEL is not set -CONFIG_LDM_PARTITION=y -# CONFIG_LDM_DEBUG is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -# CONFIG_KARMA_PARTITION is not set -# CONFIG_EFI_PARTITION is not set - -# -# Native Language Support -# -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=m - -# -# Distributed Lock Manager -# -# CONFIG_DLM is not set - -# -# Instrumentation Support -# -# CONFIG_PROFILING is not set -# CONFIG_KPROBES is not set - -# -# Kernel hacking -# -CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set -CONFIG_ENABLE_MUST_CHECK=y -# CONFIG_MAGIC_SYSRQ is not set -CONFIG_UNUSED_SYMBOLS=y -# CONFIG_DEBUG_KERNEL is not set -CONFIG_LOG_BUF_SHIFT=15 -CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_FS is not set -# CONFIG_UNWIND_INFO is not set -# CONFIG_HEADERS_CHECK is not set -CONFIG_EARLY_PRINTK=y -CONFIG_X86_FIND_SMP_CONFIG=y -CONFIG_X86_MPPARSE=y - -# -# Security options -# -CONFIG_KEYS=y -CONFIG_KEYS_DEBUG_PROC_KEYS=y -CONFIG_SECURITY=y -CONFIG_SECURITY_NETWORK=y -# CONFIG_SECURITY_NETWORK_XFRM is not set -CONFIG_SECURITY_CAPABILITIES=m -CONFIG_SECURITY_ROOTPLUG=m - -# -# Cryptographic options -# -CONFIG_CRYPTO=y -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=m -# CONFIG_CRYPTO_TWOFISH_586 is not set -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_AES_586=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_TEST=m - -# -# Hardware crypto devices -# -CONFIG_CRYPTO_DEV_PADLOCK=m -CONFIG_CRYPTO_DEV_PADLOCK_AES=m -CONFIG_CRYPTO_DEV_PADLOCK_SHA=m -CONFIG_XEN=y -CONFIG_XEN_INTERFACE_VERSION=0x00030203 - -# -# XEN -# -CONFIG_XEN_PRIVILEGED_GUEST=y -# CONFIG_XEN_UNPRIVILEGED_GUEST is not set -CONFIG_XEN_PRIVCMD=y -CONFIG_XEN_XENBUS_DEV=y -CONFIG_XEN_BACKEND=y -CONFIG_XEN_BLKDEV_BACKEND=y -CONFIG_XEN_BLKDEV_TAP=y -CONFIG_XEN_NETDEV_BACKEND=y -# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set -CONFIG_XEN_NETDEV_LOOPBACK=y -CONFIG_XEN_PCIDEV_BACKEND=y -CONFIG_XEN_PCIDEV_BACKEND_VPCI=y -# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set -# CONFIG_XEN_PCIDEV_BACKEND_SLOT is not set -# CONFIG_XEN_PCIDEV_BE_DEBUG is not set -CONFIG_XEN_TPMDEV_BACKEND=y -CONFIG_XEN_BLKDEV_FRONTEND=y -CONFIG_XEN_NETDEV_FRONTEND=y -# CONFIG_XEN_FRAMEBUFFER is not set -CONFIG_XEN_SCRUB_PAGES=y -CONFIG_XEN_DISABLE_SERIAL=y -CONFIG_XEN_SYSFS=y -CONFIG_XEN_COMPAT_030002_AND_LATER=y -# CONFIG_XEN_COMPAT_LATEST_ONLY is not set -CONFIG_XEN_COMPAT_030002=y -CONFIG_HAVE_ARCH_ALLOC_SKB=y -CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y -CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y -CONFIG_NO_IDLE_HZ=y -CONFIG_XEN_UTIL=y -CONFIG_XEN_BALLOON=y -CONFIG_XEN_DEVMEM=y -CONFIG_XEN_SKBUFF=y -CONFIG_XEN_REBOOT=y -CONFIG_XEN_SMPBOOT=y - -# -# Library routines -# -CONFIG_CRC_CCITT=m -CONFIG_CRC16=m -CONFIG_CRC32=y -CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=m -CONFIG_ZLIB_DEFLATE=m -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m -CONFIG_PLIST=y -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_X86_SMP=y -CONFIG_X86_BIOS_REBOOT=y -CONFIG_X86_TRAMPOLINE=y -CONFIG_X86_NO_TSS=y -CONFIG_X86_NO_IDT=y -CONFIG_KTIME_SCALAR=y diff --git a/source/base-extra/kernel-xen0/linux-2.6.19-x86_64_config.patch0 b/source/base-extra/kernel-xen0/linux-2.6.19-x86_64_config.patch0 deleted file mode 100644 index 97e49cb..0000000 --- a/source/base-extra/kernel-xen0/linux-2.6.19-x86_64_config.patch0 +++ /dev/null @@ -1,564 +0,0 @@ ---- .config.old 2007-02-21 08:04:30.000000000 +0000 -+++ .config 2007-02-21 08:04:13.000000000 +0000 -@@ -1,19 +1,26 @@ - # - # Automatically generated make config: don't edit - # Linux kernel version: 2.6.19.4 --# Wed Feb 21 08:01:56 2007 -+# Wed Feb 21 08:04:13 2007 - # --CONFIG_X86_32=y -+CONFIG_X86_64=y -+CONFIG_64BIT=y -+CONFIG_X86=y -+CONFIG_ZONE_DMA32=y - CONFIG_LOCKDEP_SUPPORT=y --CONFIG_STACKTRACE_SUPPORT=y - CONFIG_SEMAPHORE_SLEEPERS=y --CONFIG_X86=y - CONFIG_MMU=y -+CONFIG_RWSEM_GENERIC_SPINLOCK=y -+CONFIG_GENERIC_HWEIGHT=y -+CONFIG_GENERIC_CALIBRATE_DELAY=y -+CONFIG_X86_CMPXCHG=y -+CONFIG_EARLY_PRINTK=y - CONFIG_GENERIC_ISA_DMA=y - CONFIG_GENERIC_IOMAP=y --CONFIG_GENERIC_HWEIGHT=y - CONFIG_ARCH_MAY_HAVE_PC_FDC=y -+CONFIG_ARCH_POPULATES_NODE_MAP=y - CONFIG_DMI=y -+CONFIG_AUDIT_ARCH=y - CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" - - # -@@ -99,80 +106,32 @@ - # - # Processor type and features - # -+CONFIG_X86_PC=y -+# CONFIG_X86_VSMP is not set -+CONFIG_MK8=y -+# CONFIG_MPSC is not set -+# CONFIG_GENERIC_CPU is not set -+CONFIG_X86_64_XEN=y -+CONFIG_X86_NO_TSS=y -+CONFIG_X86_NO_IDT=y -+CONFIG_X86_L1_CACHE_BYTES=64 -+CONFIG_X86_L1_CACHE_SHIFT=6 -+CONFIG_X86_INTERNODE_CACHE_BYTES=64 -+CONFIG_X86_GOOD_APIC=y -+CONFIG_MICROCODE=m -+CONFIG_MICROCODE_OLD_INTERFACE=y -+# CONFIG_X86_MSR is not set -+CONFIG_X86_CPUID=m -+CONFIG_X86_IO_APIC=y -+CONFIG_X86_XEN_GENAPIC=y -+CONFIG_X86_LOCAL_APIC=y -+CONFIG_MTRR=y - CONFIG_SMP=y --# CONFIG_X86_PC is not set --CONFIG_X86_XEN=y --# CONFIG_X86_ELAN is not set --# CONFIG_X86_VOYAGER is not set --# CONFIG_X86_NUMAQ is not set --# CONFIG_X86_SUMMIT is not set --# CONFIG_X86_BIGSMP is not set --# CONFIG_X86_VISWS is not set --# CONFIG_X86_GENERICARCH is not set --# CONFIG_X86_ES7000 is not set --# CONFIG_M386 is not set --# CONFIG_M486 is not set --CONFIG_M586=y --# CONFIG_M586TSC is not set --# CONFIG_M586MMX is not set --# CONFIG_M686 is not set --# CONFIG_MPENTIUMII is not set --# CONFIG_MPENTIUMIII is not set --# CONFIG_MPENTIUMM is not set --# CONFIG_MPENTIUM4 is not set --# CONFIG_MK6 is not set --# CONFIG_MK7 is not set --# CONFIG_MK8 is not set --# CONFIG_MCRUSOE is not set --# CONFIG_MEFFICEON is not set --# CONFIG_MWINCHIPC6 is not set --# CONFIG_MWINCHIP2 is not set --# CONFIG_MWINCHIP3D is not set --# CONFIG_MGEODEGX1 is not set --# CONFIG_MGEODE_LX is not set --# CONFIG_MCYRIXIII is not set --# CONFIG_MVIAC3_2 is not set --CONFIG_X86_GENERIC=y --CONFIG_X86_CMPXCHG=y --CONFIG_X86_XADD=y --CONFIG_X86_L1_CACHE_SHIFT=7 --CONFIG_RWSEM_XCHGADD_ALGORITHM=y --CONFIG_GENERIC_CALIBRATE_DELAY=y --CONFIG_X86_PPRO_FENCE=y --CONFIG_X86_WP_WORKS_OK=y --CONFIG_X86_INVLPG=y --CONFIG_X86_BSWAP=y --CONFIG_X86_POPAD_OK=y --CONFIG_X86_CMPXCHG64=y --CONFIG_X86_ALIGNMENT_16=y --CONFIG_X86_INTEL_USERCOPY=y --CONFIG_NR_CPUS=8 - CONFIG_PREEMPT_NONE=y - # CONFIG_PREEMPT_VOLUNTARY is not set - # CONFIG_PREEMPT is not set - CONFIG_PREEMPT_BKL=y --CONFIG_X86_LOCAL_APIC=y --CONFIG_X86_IO_APIC=y --CONFIG_VM86=y --CONFIG_TOSHIBA=m --CONFIG_I8K=m --CONFIG_X86_REBOOTFIXUPS=y --CONFIG_MICROCODE=m --CONFIG_MICROCODE_OLD_INTERFACE=y --CONFIG_X86_CPUID=m --CONFIG_SWIOTLB=y -- --# --# Firmware Drivers --# --CONFIG_DELL_RBU=m --CONFIG_DCDBAS=m --# CONFIG_NOHIGHMEM is not set --CONFIG_HIGHMEM4G=y --# CONFIG_HIGHMEM64G is not set --CONFIG_PAGE_OFFSET=0xC0000000 --CONFIG_HIGHMEM=y --CONFIG_ARCH_POPULATES_NODE_MAP=y -+CONFIG_ARCH_FLATMEM_ENABLE=y - CONFIG_SELECT_MEMORY_MODEL=y - CONFIG_FLATMEM_MANUAL=y - # CONFIG_DISCONTIGMEM_MANUAL is not set -@@ -181,22 +140,29 @@ - CONFIG_FLAT_NODE_MEM_MAP=y - # CONFIG_SPARSEMEM_STATIC is not set - CONFIG_SPLIT_PTLOCK_CPUS=4096 --# CONFIG_RESOURCES_64BIT is not set --CONFIG_MTRR=y --# CONFIG_REGPARM is not set -+CONFIG_RESOURCES_64BIT=y -+CONFIG_NR_CPUS=8 -+CONFIG_HOTPLUG_CPU=y -+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -+# CONFIG_CALGARY_IOMMU is not set -+CONFIG_SWIOTLB=y -+# CONFIG_KEXEC is not set -+# CONFIG_CRASH_DUMP is not set -+CONFIG_PHYSICAL_START=0x200000 - CONFIG_SECCOMP=y -+# CONFIG_CC_STACKPROTECTOR is not set - # CONFIG_HZ_100 is not set - # CONFIG_HZ_250 is not set - CONFIG_HZ_1000=y - CONFIG_HZ=1000 --# CONFIG_KEXEC is not set --# CONFIG_CRASH_DUMP is not set --CONFIG_PHYSICAL_START=0x100000 --CONFIG_HOTPLUG_CPU=y --CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -+# CONFIG_REORDER is not set -+CONFIG_GENERIC_HARDIRQS=y -+CONFIG_GENERIC_IRQ_PROBE=y -+CONFIG_ISA_DMA_API=y -+CONFIG_GENERIC_PENDING_IRQ=y - - # --# Power management options (ACPI, APM) -+# Power management options - # - CONFIG_PM=y - -@@ -245,39 +211,22 @@ - # - # CPUFreq processor drivers - # --CONFIG_X86_ACPI_CPUFREQ=m --CONFIG_X86_POWERNOW_K6=m --CONFIG_X86_POWERNOW_K7=m --CONFIG_X86_POWERNOW_K7_ACPI=y - CONFIG_X86_POWERNOW_K8=m - CONFIG_X86_POWERNOW_K8_ACPI=y --CONFIG_X86_GX_SUSPMOD=m - CONFIG_X86_SPEEDSTEP_CENTRINO=m - CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y --CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y --CONFIG_X86_SPEEDSTEP_ICH=m --CONFIG_X86_SPEEDSTEP_SMI=m --CONFIG_X86_P4_CLOCKMOD=m --CONFIG_X86_CPUFREQ_NFORCE2=m --CONFIG_X86_LONGRUN=m --# CONFIG_X86_LONGHAUL is not set -+CONFIG_X86_ACPI_CPUFREQ=m - - # - # shared options - # - # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set --CONFIG_X86_SPEEDSTEP_LIB=m --# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set -+# CONFIG_X86_SPEEDSTEP_LIB is not set - - # --# Bus options (PCI, PCMCIA, EISA, MCA, ISA) -+# Bus options (PCI etc.) - # - CONFIG_PCI=y --# CONFIG_PCI_GOBIOS is not set --# CONFIG_PCI_GOMMCONFIG is not set --# CONFIG_PCI_GODIRECT is not set --# CONFIG_PCI_GOXEN_FE is not set --CONFIG_PCI_GOANY=y - CONFIG_PCI_DIRECT=y - CONFIG_PCI_MMCONFIG=y - CONFIG_XEN_PCIDEV_FRONTEND=y -@@ -286,9 +235,6 @@ - CONFIG_HOTPLUG_PCI_PCIE=m - # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set - CONFIG_PCIEAER=y --CONFIG_ISA_DMA_API=y --CONFIG_SCx200=m --CONFIG_K8_NB=y - - # - # PCCARD (PCMCIA/CardBus) support -@@ -325,11 +271,14 @@ - # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set - - # --# Executable file formats -+# Executable file formats / Emulations - # - CONFIG_BINFMT_ELF=y --CONFIG_BINFMT_AOUT=m - CONFIG_BINFMT_MISC=m -+CONFIG_IA32_EMULATION=y -+# CONFIG_IA32_AOUT is not set -+CONFIG_COMPAT=y -+CONFIG_SYSVIPC_COMPAT=y - - # - # Networking -@@ -716,7 +665,6 @@ - CONFIG_BAYCOM_SER_FDX=m - CONFIG_BAYCOM_SER_HDX=m - CONFIG_BAYCOM_PAR=m --CONFIG_BAYCOM_EPP=m - CONFIG_YAM=m - CONFIG_IRDA=m - -@@ -774,7 +722,6 @@ - CONFIG_SIGMATEL_FIR=m - CONFIG_NSC_FIR=m - CONFIG_WINBOND_FIR=m --CONFIG_TOSHIBA_FIR=m - CONFIG_SMC_IRCC_FIR=m - CONFIG_ALI_FIR=m - CONFIG_VLSI_FIR=m -@@ -898,7 +845,6 @@ - CONFIG_MTD_NETSC520=m - CONFIG_MTD_TS5500=m - CONFIG_MTD_SBC_GXX=m --CONFIG_MTD_SCx200_DOCFLASH=m - CONFIG_MTD_AMD76XROM=m - CONFIG_MTD_ICHXROM=m - CONFIG_MTD_SCB2_FLASH=m -@@ -998,7 +944,6 @@ - # - CONFIG_PARIDE_ATEN=m - CONFIG_PARIDE_BPCK=m --CONFIG_PARIDE_BPCK6=m - CONFIG_PARIDE_COMM=m - CONFIG_PARIDE_DSTR=m - CONFIG_PARIDE_FIT2=m -@@ -1087,7 +1032,6 @@ - CONFIG_BLK_DEV_CY82C693=y - CONFIG_BLK_DEV_CS5520=y - CONFIG_BLK_DEV_CS5530=y --CONFIG_BLK_DEV_CS5535=m - CONFIG_BLK_DEV_HPT34X=y - # CONFIG_HPT34X_AUTODMA is not set - CONFIG_BLK_DEV_HPT366=y -@@ -1169,8 +1113,6 @@ - CONFIG_AIC79XX_DEBUG_MASK=0 - # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set - # CONFIG_SCSI_AIC94XX is not set --CONFIG_SCSI_DPT_I2O=m --CONFIG_SCSI_ADVANSYS=m - # CONFIG_SCSI_ARCMSR is not set - # CONFIG_MEGARAID_NEWGEN is not set - CONFIG_MEGARAID_LEGACY=m -@@ -1205,15 +1147,12 @@ - CONFIG_SCSI_LPFC=m - CONFIG_SCSI_DC395x=m - CONFIG_SCSI_DC390T=m --CONFIG_SCSI_NSP32=m - CONFIG_SCSI_DEBUG=m - - # - # PCMCIA SCSI adapter support - # --CONFIG_PCMCIA_AHA152X=m - CONFIG_PCMCIA_FDOMAIN=m --CONFIG_PCMCIA_NINJA_SCSI=m - CONFIG_PCMCIA_QLOGIC=m - CONFIG_PCMCIA_SYM53C500=m - -@@ -1244,7 +1183,6 @@ - CONFIG_PATA_CMD64X=m - CONFIG_PATA_CS5520=m - CONFIG_PATA_CS5530=m --CONFIG_PATA_CS5535=m - # CONFIG_PATA_CYPRESS is not set - CONFIG_PATA_EFAR=m - CONFIG_ATA_GENERIC=m -@@ -1329,7 +1267,6 @@ - # - CONFIG_IEEE1394_VIDEO1394=m - CONFIG_IEEE1394_SBP2=m --# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set - CONFIG_IEEE1394_ETH1394=m - CONFIG_IEEE1394_DV1394=m - CONFIG_IEEE1394_RAWIO=m -@@ -1340,6 +1277,7 @@ - CONFIG_I2O=m - CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y - CONFIG_I2O_EXT_ADAPTEC=y -+CONFIG_I2O_EXT_ADAPTEC_DMA64=y - CONFIG_I2O_CONFIG=m - CONFIG_I2O_CONFIG_OLD_IOCTL=y - CONFIG_I2O_BUS=m -@@ -1442,7 +1380,6 @@ - CONFIG_EPIC100=m - CONFIG_SUNDANCE=m - # CONFIG_SUNDANCE_MMIO is not set --CONFIG_TLAN=m - CONFIG_VIA_RHINE=m - CONFIG_VIA_RHINE_MMIO=y - # CONFIG_VIA_RHINE_NAPI is not set -@@ -1490,7 +1427,6 @@ - # - CONFIG_TR=y - CONFIG_IBMOL=m --CONFIG_IBMLS=m - CONFIG_3C359=m - CONFIG_TMS380TR=m - CONFIG_TMSPCI=m -@@ -1579,7 +1515,6 @@ - CONFIG_PCMCIA_XIRC2PS=m - CONFIG_PCMCIA_AXNET=m - CONFIG_ARCNET_COM20020_CS=m --CONFIG_PCMCIA_IBMTR=m - - # - # Wan interfaces -@@ -1633,9 +1568,6 @@ - CONFIG_ATM_FIRESTREAM=m - CONFIG_ATM_ZATM=m - # CONFIG_ATM_ZATM_DEBUG is not set --CONFIG_ATM_NICSTAR=m --# CONFIG_ATM_NICSTAR_USE_SUNI is not set --# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set - CONFIG_ATM_IDT77252=m - # CONFIG_ATM_IDT77252_DEBUG is not set - # CONFIG_ATM_IDT77252_RCV_ALL is not set -@@ -1644,8 +1576,6 @@ - # CONFIG_ATM_AMBASSADOR_DEBUG is not set - CONFIG_ATM_HORIZON=m - # CONFIG_ATM_HORIZON_DEBUG is not set --CONFIG_ATM_IA=m --# CONFIG_ATM_IA_DEBUG is not set - CONFIG_ATM_FORE200E_MAYBE=m - # CONFIG_ATM_FORE200E_PCA is not set - CONFIG_ATM_HE=m -@@ -1803,7 +1733,6 @@ - # CONFIG_TOUCHSCREEN_TOUCHWIN is not set - CONFIG_INPUT_MISC=y - CONFIG_INPUT_PCSPKR=m --# CONFIG_INPUT_WISTRON_BTNS is not set - CONFIG_INPUT_UINPUT=m - - # -@@ -1911,7 +1840,6 @@ - CONFIG_I8XX_TCO=m - # CONFIG_ITCO_WDT is not set - CONFIG_SC1200_WDT=m --CONFIG_SCx200_WDT=m - CONFIG_60XX_WDT=m - CONFIG_SBC8360_WDT=m - CONFIG_CPU5_WDT=m -@@ -1938,28 +1866,20 @@ - CONFIG_HW_RANDOM_INTEL=y - CONFIG_HW_RANDOM_AMD=y - CONFIG_HW_RANDOM_GEODE=y --CONFIG_HW_RANDOM_VIA=y - CONFIG_NVRAM=m - CONFIG_RTC=y - CONFIG_DTLK=m - CONFIG_R3964=m - CONFIG_APPLICOM=m --CONFIG_SONYPI=m - - # - # Ftape, the floppy tape device driver - # - CONFIG_AGP=m --CONFIG_AGP_ALI=m --CONFIG_AGP_ATI=m --CONFIG_AGP_AMD=m --CONFIG_AGP_AMD64=m -+# CONFIG_AGP_AMD64 is not set - CONFIG_AGP_INTEL=m --CONFIG_AGP_NVIDIA=m - CONFIG_AGP_SIS=m --CONFIG_AGP_SWORKS=m - CONFIG_AGP_VIA=m --CONFIG_AGP_EFFICEON=m - CONFIG_DRM=m - CONFIG_DRM_TDFX=m - CONFIG_DRM_R128=m -@@ -1979,10 +1899,8 @@ - CONFIG_CARDMAN_4000=m - CONFIG_CARDMAN_4040=m - CONFIG_MWAVE=m --CONFIG_SCx200_GPIO=m - CONFIG_PC8736x_GPIO=m - CONFIG_NSC_GPIO=m --CONFIG_CS5535_GPIO=m - # CONFIG_RAW_DRIVER is not set - CONFIG_HPET=y - # CONFIG_HPET_RTC_IRQ is not set -@@ -2032,10 +1950,6 @@ - CONFIG_I2C_PARPORT_LIGHT=m - CONFIG_I2C_PROSAVAGE=m - CONFIG_I2C_SAVAGE4=m --CONFIG_SCx200_I2C=m --CONFIG_SCx200_I2C_SCL=12 --CONFIG_SCx200_I2C_SDA=13 --CONFIG_SCx200_ACB=m - CONFIG_I2C_SIS5595=m - CONFIG_I2C_SIS630=m - CONFIG_I2C_SIS96X=m -@@ -2207,7 +2121,6 @@ - CONFIG_VIDEO_ZORAN_LML33=m - CONFIG_VIDEO_ZORAN_LML33R10=m - CONFIG_VIDEO_ZORAN_AVS6EYES=m --CONFIG_VIDEO_MEYE=m - CONFIG_VIDEO_SAA7134=m - CONFIG_VIDEO_SAA7134_ALSA=m - CONFIG_VIDEO_SAA7134_DVB=m -@@ -2413,9 +2326,6 @@ - # CONFIG_FB_S1D13XXX is not set - # CONFIG_FB_NVIDIA is not set - # CONFIG_FB_RIVA is not set --CONFIG_FB_I810=m --CONFIG_FB_I810_GTF=y --# CONFIG_FB_I810_I2C is not set - CONFIG_FB_INTEL=m - # CONFIG_FB_INTEL_DEBUG is not set - CONFIG_FB_INTEL_I2C=y -@@ -2441,7 +2351,6 @@ - # CONFIG_FB_KYRO is not set - # CONFIG_FB_3DFX is not set - # CONFIG_FB_VOODOO1 is not set --# CONFIG_FB_CYBLA is not set - # CONFIG_FB_TRIDENT is not set - # CONFIG_FB_GEODE is not set - # CONFIG_FB_VIRTUAL is not set -@@ -2536,7 +2445,6 @@ - CONFIG_SND_CS4281=m - CONFIG_SND_CS46XX=m - CONFIG_SND_CS46XX_NEW_DSP=y --CONFIG_SND_CS5535AUDIO=m - CONFIG_SND_DARLA20=m - CONFIG_SND_GINA20=m - CONFIG_SND_LAYLA20=m -@@ -2856,7 +2764,6 @@ - # - # LED drivers - # --# CONFIG_LEDS_NET48XX is not set - - # - # LED Triggers -@@ -2930,6 +2837,12 @@ - # - - # -+# Firmware Drivers -+# -+CONFIG_DELL_RBU=m -+CONFIG_DCDBAS=m -+ -+# - # File systems - # - CONFIG_EXT2_FS=y -@@ -3180,13 +3093,8 @@ - CONFIG_UNUSED_SYMBOLS=y - # CONFIG_DEBUG_KERNEL is not set - CONFIG_LOG_BUF_SHIFT=15 --CONFIG_DEBUG_BUGVERBOSE=y - # CONFIG_DEBUG_FS is not set --# CONFIG_UNWIND_INFO is not set - # CONFIG_HEADERS_CHECK is not set --CONFIG_EARLY_PRINTK=y --CONFIG_X86_FIND_SMP_CONFIG=y --CONFIG_X86_MPPARSE=y - - # - # Security options -@@ -3222,10 +3130,10 @@ - CONFIG_CRYPTO_BLOWFISH=m - CONFIG_CRYPTO_TWOFISH=m - CONFIG_CRYPTO_TWOFISH_COMMON=m --# CONFIG_CRYPTO_TWOFISH_586 is not set -+# CONFIG_CRYPTO_TWOFISH_X86_64 is not set - CONFIG_CRYPTO_SERPENT=m - CONFIG_CRYPTO_AES=m --CONFIG_CRYPTO_AES_586=m -+# CONFIG_CRYPTO_AES_X86_64 is not set - CONFIG_CRYPTO_CAST5=m - CONFIG_CRYPTO_CAST6=m - CONFIG_CRYPTO_TEA=m -@@ -3240,9 +3148,6 @@ - # - # Hardware crypto devices - # --CONFIG_CRYPTO_DEV_PADLOCK=m --CONFIG_CRYPTO_DEV_PADLOCK_AES=m --CONFIG_CRYPTO_DEV_PADLOCK_SHA=m - CONFIG_XEN=y - CONFIG_XEN_INTERFACE_VERSION=0x00030203 - -@@ -3264,10 +3169,11 @@ - # CONFIG_XEN_PCIDEV_BACKEND_PASS is not set - # CONFIG_XEN_PCIDEV_BACKEND_SLOT is not set - # CONFIG_XEN_PCIDEV_BE_DEBUG is not set --CONFIG_XEN_TPMDEV_BACKEND=y -+# CONFIG_XEN_TPMDEV_BACKEND is not set - CONFIG_XEN_BLKDEV_FRONTEND=y - CONFIG_XEN_NETDEV_FRONTEND=y --# CONFIG_XEN_FRAMEBUFFER is not set -+CONFIG_XEN_FRAMEBUFFER=y -+CONFIG_XEN_KEYBOARD=y - CONFIG_XEN_SCRUB_PAGES=y - CONFIG_XEN_DISABLE_SERIAL=y - CONFIG_XEN_SYSFS=y -@@ -3299,12 +3205,3 @@ - CONFIG_TEXTSEARCH_BM=m - CONFIG_TEXTSEARCH_FSM=m - CONFIG_PLIST=y --CONFIG_GENERIC_HARDIRQS=y --CONFIG_GENERIC_IRQ_PROBE=y --CONFIG_GENERIC_PENDING_IRQ=y --CONFIG_X86_SMP=y --CONFIG_X86_BIOS_REBOOT=y --CONFIG_X86_TRAMPOLINE=y --CONFIG_X86_NO_TSS=y --CONFIG_X86_NO_IDT=y --CONFIG_KTIME_SCALAR=y From crazy at frugalware.org Fri Jun 6 15:11:20 2008 From: crazy at frugalware.org (crazy) Date: Fri Jun 6 15:11:22 2008 Subject: [Frugalware-git] frugalware-current: kernel-xenU Message-ID: <20080606131120.533241190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=153179ef0799063e4fbbcd013631ebf4da85f4d1 commit 153179ef0799063e4fbbcd013631ebf4da85f4d1 Author: crazy Date: Fri Jun 6 15:10:46 2008 +0200 kernel-xenU * removed from tree diff --git a/source/base-extra/kernel-xenU/FrugalBuild b/source/base-extra/kernel-xenU/FrugalBuild deleted file mode 100644 index de35159..0000000 --- a/source/base-extra/kernel-xenU/FrugalBuild +++ /dev/null @@ -1,25 +0,0 @@ -# Compiling Time: 15.39 SBU -# Maintainer: AlexExtreme - -pkgver=2.6.19 -pkgrel=2 -_F_kernel_vmlinuz="vmlinuz" -_F_kernel_name="-xenU" -_F_kernel_dontsedarch=1 -_F_kernel_stable=4 -_F_kernel_manualamd64=1 -srcurl="http://ftp.frugalware.org/pub/other/sources/xen" -[ "$CARCH" == "x86_64" ] && \ - _F_kernel_patches=(${_F_kernel_patches[@]} linux-$pkgver-x86_64_config.patch0) -_F_kernel_patches=(${_F_kernel_patches[@]} $srcurl/linux-$pkgver-xen.patch.bz2) -Finclude kernel -pkgdesc="The Xen domain U Linux Kernel and modules" -rodepends=('module-init-tools' 'xen') -groups=('base-extra') -unset install -options=('nobuild') -subgroups=('xapps-extra' 'xapps-extra') -suboptions=('nobuild' 'nobuild') -up2date="lynx -dump http://cvs.fedora.redhat.com/viewcvs/devel/kernel-xen-2.6/sources?view=markup | grep linux | Flasttarbz2" -archs=('i686') -subarchs=('i686' 'i686') diff --git a/source/base-extra/kernel-xenU/config b/source/base-extra/kernel-xenU/config deleted file mode 100644 index 8f23932..0000000 --- a/source/base-extra/kernel-xenU/config +++ /dev/null @@ -1,3211 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.19.4 -# Wed Feb 21 09:16:42 2007 -# -CONFIG_X86_32=y -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_SEMAPHORE_SLEEPERS=y -CONFIG_X86=y -CONFIG_MMU=y -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_IOMAP=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -CONFIG_DMI=y -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" - -# -# Code maturity level options -# -CONFIG_EXPERIMENTAL=y -CONFIG_LOCK_KERNEL=y -CONFIG_INIT_ENV_ARG_LIMIT=32 - -# -# General setup -# -CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -# CONFIG_IPC_NS is not set -CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -# CONFIG_BSD_PROCESS_ACCT_V3 is not set -# CONFIG_TASKSTATS is not set -# CONFIG_UTS_NS is not set -# CONFIG_AUDIT is not set -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_CPUSETS=y -# CONFIG_RELAY is not set -CONFIG_INITRAMFS_SOURCE="" -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_SYSCTL=y -# CONFIG_EMBEDDED is not set -CONFIG_UID16=y -CONFIG_SYSCTL_SYSCALL=y -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_EXTRA_PASS is not set -CONFIG_HOTPLUG=y -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_SHMEM=y -CONFIG_SLAB=y -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_RT_MUTEXES=y -# CONFIG_TINY_SHMEM is not set -CONFIG_BASE_SMALL=0 -# CONFIG_SLOB is not set - -# -# Loadable module support -# -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_MODVERSIONS=y -# CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_KMOD=y -CONFIG_STOP_MACHINE=y - -# -# Block layer -# -CONFIG_BLOCK=y -CONFIG_LBD=y -# CONFIG_BLK_DEV_IO_TRACE is not set -CONFIG_LSF=y - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -CONFIG_DEFAULT_AS=y -# CONFIG_DEFAULT_DEADLINE is not set -# CONFIG_DEFAULT_CFQ is not set -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="anticipatory" - -# -# Processor type and features -# -CONFIG_SMP=y -# CONFIG_X86_PC is not set -CONFIG_X86_XEN=y -# CONFIG_X86_ELAN is not set -# CONFIG_X86_VOYAGER is not set -# CONFIG_X86_NUMAQ is not set -# CONFIG_X86_SUMMIT is not set -# CONFIG_X86_BIGSMP is not set -# CONFIG_X86_VISWS is not set -# CONFIG_X86_GENERICARCH is not set -# CONFIG_X86_ES7000 is not set -# CONFIG_M386 is not set -# CONFIG_M486 is not set -CONFIG_M586=y -# CONFIG_M586TSC is not set -# CONFIG_M586MMX is not set -# CONFIG_M686 is not set -# CONFIG_MPENTIUMII is not set -# CONFIG_MPENTIUMIII is not set -# CONFIG_MPENTIUMM is not set -# CONFIG_MPENTIUM4 is not set -# CONFIG_MK6 is not set -# CONFIG_MK7 is not set -# CONFIG_MK8 is not set -# CONFIG_MCRUSOE is not set -# CONFIG_MEFFICEON is not set -# CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP2 is not set -# CONFIG_MWINCHIP3D is not set -# CONFIG_MGEODEGX1 is not set -# CONFIG_MGEODE_LX is not set -# CONFIG_MCYRIXIII is not set -# CONFIG_MVIAC3_2 is not set -CONFIG_X86_GENERIC=y -CONFIG_X86_CMPXCHG=y -CONFIG_X86_XADD=y -CONFIG_X86_L1_CACHE_SHIFT=7 -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_X86_PPRO_FENCE=y -CONFIG_X86_WP_WORKS_OK=y -CONFIG_X86_INVLPG=y -CONFIG_X86_BSWAP=y -CONFIG_X86_POPAD_OK=y -CONFIG_X86_CMPXCHG64=y -CONFIG_X86_ALIGNMENT_16=y -CONFIG_X86_INTEL_USERCOPY=y -CONFIG_NR_CPUS=8 -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set -# CONFIG_PREEMPT is not set -CONFIG_PREEMPT_BKL=y -CONFIG_VM86=y -CONFIG_TOSHIBA=m -CONFIG_I8K=m -CONFIG_X86_REBOOTFIXUPS=y -CONFIG_X86_CPUID=m -CONFIG_SWIOTLB=y - -# -# Firmware Drivers -# -CONFIG_DELL_RBU=m -CONFIG_DCDBAS=m -# CONFIG_NOHIGHMEM is not set -CONFIG_HIGHMEM4G=y -# CONFIG_HIGHMEM64G is not set -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_HIGHMEM=y -CONFIG_ARCH_POPULATES_NODE_MAP=y -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM_MANUAL=y -# CONFIG_DISCONTIGMEM_MANUAL is not set -# CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y -CONFIG_FLAT_NODE_MEM_MAP=y -# CONFIG_SPARSEMEM_STATIC is not set -CONFIG_SPLIT_PTLOCK_CPUS=4096 -# CONFIG_RESOURCES_64BIT is not set -# CONFIG_REGPARM is not set -CONFIG_SECCOMP=y -# CONFIG_HZ_100 is not set -# CONFIG_HZ_250 is not set -CONFIG_HZ_1000=y -CONFIG_HZ=1000 -# CONFIG_CRASH_DUMP is not set -CONFIG_PHYSICAL_START=0x100000 -CONFIG_HOTPLUG_CPU=y -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set - -# -# Bus options (PCI, PCMCIA, EISA, MCA, ISA) -# -CONFIG_PCI=y -# CONFIG_PCI_GOBIOS is not set -# CONFIG_PCI_GOMMCONFIG is not set -# CONFIG_PCI_GODIRECT is not set -# CONFIG_PCI_GOXEN_FE is not set -CONFIG_PCI_GOANY=y -CONFIG_PCI_DIRECT=y -CONFIG_XEN_PCIDEV_FRONTEND=y -# CONFIG_XEN_PCIDEV_FE_DEBUG is not set -CONFIG_PCIEPORTBUS=y -CONFIG_HOTPLUG_PCI_PCIE=m -# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set -CONFIG_ISA_DMA_API=y -CONFIG_SCx200=m -CONFIG_K8_NB=y - -# -# PCCARD (PCMCIA/CardBus) support -# -CONFIG_PCCARD=y -# CONFIG_PCMCIA_DEBUG is not set -CONFIG_PCMCIA=y -CONFIG_PCMCIA_LOAD_CIS=y -# CONFIG_PCMCIA_IOCTL is not set -CONFIG_CARDBUS=y - -# -# PC-card bridges -# -CONFIG_YENTA=m -CONFIG_YENTA_O2=y -CONFIG_YENTA_RICOH=y -CONFIG_YENTA_TI=y -CONFIG_YENTA_ENE_TUNE=y -CONFIG_YENTA_TOSHIBA=y -CONFIG_PD6729=m -CONFIG_I82092=m -CONFIG_PCCARD_NONSTATIC=m - -# -# PCI Hotplug Support -# -CONFIG_HOTPLUG_PCI=y -CONFIG_HOTPLUG_PCI_FAKE=m -# CONFIG_HOTPLUG_PCI_CPCI is not set -CONFIG_HOTPLUG_PCI_SHPC=m -# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set - -# -# Executable file formats -# -CONFIG_BINFMT_ELF=y -CONFIG_BINFMT_AOUT=m -CONFIG_BINFMT_MISC=m - -# -# Networking -# -CONFIG_NET=y - -# -# Networking options -# -# CONFIG_NETDEBUG is not set -CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=y -CONFIG_XFRM=y -CONFIG_XFRM_USER=y -# CONFIG_XFRM_SUB_POLICY is not set -CONFIG_NET_KEY=m -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_ASK_IP_FIB_HASH=y -# CONFIG_IP_FIB_TRIE is not set -CONFIG_IP_FIB_HASH=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_FWMARK=y -CONFIG_IP_ROUTE_MULTIPATH=y -# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set -CONFIG_IP_ROUTE_VERBOSE=y -# CONFIG_IP_PNP is not set -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE=m -CONFIG_NET_IPGRE_BROADCAST=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -# CONFIG_ARPD is not set -CONFIG_SYN_COOKIES=y -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INET_TUNNEL=m -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y -CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_BIC=y -CONFIG_TCP_CONG_CUBIC=m -CONFIG_TCP_CONG_WESTWOOD=m -CONFIG_TCP_CONG_HTCP=m -CONFIG_TCP_CONG_HSTCP=m -CONFIG_TCP_CONG_HYBLA=m -CONFIG_TCP_CONG_VEGAS=m -CONFIG_TCP_CONG_SCALABLE=m -# CONFIG_TCP_CONG_LP is not set -# CONFIG_TCP_CONG_VENO is not set -CONFIG_DEFAULT_BIC=y -# CONFIG_DEFAULT_CUBIC is not set -# CONFIG_DEFAULT_HTCP is not set -# CONFIG_DEFAULT_VEGAS is not set -# CONFIG_DEFAULT_WESTWOOD is not set -# CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="bic" - -# -# IP: Virtual Server Configuration -# -CONFIG_IP_VS=m -# CONFIG_IP_VS_DEBUG is not set -CONFIG_IP_VS_TAB_BITS=12 - -# -# IPVS transport protocol load balancing support -# -CONFIG_IP_VS_PROTO_TCP=y -CONFIG_IP_VS_PROTO_UDP=y -CONFIG_IP_VS_PROTO_ESP=y -CONFIG_IP_VS_PROTO_AH=y - -# -# IPVS scheduler -# -CONFIG_IP_VS_RR=m -CONFIG_IP_VS_WRR=m -CONFIG_IP_VS_LC=m -CONFIG_IP_VS_WLC=m -CONFIG_IP_VS_LBLC=m -CONFIG_IP_VS_LBLCR=m -CONFIG_IP_VS_DH=m -CONFIG_IP_VS_SH=m -CONFIG_IP_VS_SED=m -CONFIG_IP_VS_NQ=m - -# -# IPVS application helper -# -CONFIG_IP_VS_FTP=m -CONFIG_IPV6=m -CONFIG_IPV6_PRIVACY=y -# CONFIG_IPV6_ROUTER_PREF is not set -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -# CONFIG_IPV6_MIP6 is not set -CONFIG_INET6_XFRM_TUNNEL=m -CONFIG_INET6_TUNNEL=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=m -CONFIG_IPV6_TUNNEL=m -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_NETLABEL is not set -# CONFIG_NETWORK_SECMARK is not set -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -CONFIG_BRIDGE_NETFILTER=y - -# -# Core Netfilter Configuration -# -CONFIG_NETFILTER_NETLINK=m -CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_NETLINK_LOG=m -CONFIG_NETFILTER_XTABLES=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -# CONFIG_NETFILTER_XT_TARGET_DSCP is not set -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -# CONFIG_NETFILTER_XT_MATCH_DSCP is not set -# CONFIG_NETFILTER_XT_MATCH_ESP is not set -CONFIG_NETFILTER_XT_MATCH_HELPER=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -# CONFIG_NETFILTER_XT_MATCH_POLICY is not set -# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set -CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set -CONFIG_NETFILTER_XT_MATCH_REALM=m -CONFIG_NETFILTER_XT_MATCH_SCTP=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m - -# -# IP: Netfilter Configuration -# -CONFIG_IP_NF_CONNTRACK=m -CONFIG_IP_NF_CT_ACCT=y -CONFIG_IP_NF_CONNTRACK_MARK=y -CONFIG_IP_NF_CONNTRACK_EVENTS=y -CONFIG_IP_NF_CONNTRACK_NETLINK=m -CONFIG_IP_NF_CT_PROTO_SCTP=m -CONFIG_IP_NF_FTP=m -CONFIG_IP_NF_IRC=m -CONFIG_IP_NF_NETBIOS_NS=m -CONFIG_IP_NF_TFTP=m -CONFIG_IP_NF_AMANDA=m -CONFIG_IP_NF_PPTP=m -# CONFIG_IP_NF_H323 is not set -# CONFIG_IP_NF_SIP is not set -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_IPRANGE=m -CONFIG_IP_NF_MATCH_TOS=m -CONFIG_IP_NF_MATCH_RECENT=m -CONFIG_IP_NF_MATCH_ECN=m -# CONFIG_IP_NF_MATCH_AH is not set -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_MATCH_OWNER=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m -CONFIG_IP_NF_MATCH_HASHLIMIT=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_IP_NF_TARGET_TCPMSS=m -CONFIG_IP_NF_NAT=m -CONFIG_IP_NF_NAT_NEEDED=y -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_SAME=m -CONFIG_IP_NF_NAT_SNMP_BASIC=m -CONFIG_IP_NF_NAT_IRC=m -CONFIG_IP_NF_NAT_FTP=m -CONFIG_IP_NF_NAT_TFTP=m -CONFIG_IP_NF_NAT_AMANDA=m -CONFIG_IP_NF_NAT_PPTP=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_TOS=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m - -# -# IPv6: Netfilter Configuration (EXPERIMENTAL) -# -CONFIG_IP6_NF_QUEUE=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_OWNER=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -# CONFIG_IP6_NF_MATCH_AH is not set -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_LOG=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_RAW=m - -# -# DECnet: Netfilter Configuration -# -# CONFIG_DECNET_NF_GRABULATOR is not set - -# -# Bridge: Netfilter Configuration -# -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_802_3=m -CONFIG_BRIDGE_EBT_AMONG=m -CONFIG_BRIDGE_EBT_ARP=m -CONFIG_BRIDGE_EBT_IP=m -CONFIG_BRIDGE_EBT_LIMIT=m -CONFIG_BRIDGE_EBT_MARK=m -CONFIG_BRIDGE_EBT_PKTTYPE=m -CONFIG_BRIDGE_EBT_STP=m -CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_EBT_ARPREPLY=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_MARK_T=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_LOG=m -# CONFIG_BRIDGE_EBT_ULOG is not set - -# -# DCCP Configuration (EXPERIMENTAL) -# -# CONFIG_IP_DCCP is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# -CONFIG_IP_SCTP=m -# CONFIG_SCTP_DBG_MSG is not set -# CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_HMAC_NONE is not set -# CONFIG_SCTP_HMAC_SHA1 is not set -CONFIG_SCTP_HMAC_MD5=y - -# -# TIPC Configuration (EXPERIMENTAL) -# -# CONFIG_TIPC is not set -CONFIG_ATM=m -CONFIG_ATM_CLIP=m -# CONFIG_ATM_CLIP_NO_ICMP is not set -CONFIG_ATM_LANE=m -CONFIG_ATM_MPOA=m -CONFIG_ATM_BR2684=m -# CONFIG_ATM_BR2684_IPFILTER is not set -CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m -CONFIG_DECNET=m -# CONFIG_DECNET_ROUTER is not set -CONFIG_LLC=y -CONFIG_LLC2=m -CONFIG_IPX=m -# CONFIG_IPX_INTERN is not set -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_IPDDP_DECAP=y -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_ECONET is not set -CONFIG_WAN_ROUTER=m - -# -# QoS and/or fair queueing -# -CONFIG_NET_SCHED=y -CONFIG_NET_SCH_CLK_JIFFIES=y -# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set -# CONFIG_NET_SCH_CLK_CPU is not set - -# -# Queueing/Scheduling -# -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_SCH_INGRESS=m - -# -# Classification -# -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set -# CONFIG_CLS_U32_MARK is not set -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_EMATCH=y -CONFIG_NET_EMATCH_STACK=32 -CONFIG_NET_EMATCH_CMP=m -CONFIG_NET_EMATCH_NBYTE=m -CONFIG_NET_EMATCH_U32=m -CONFIG_NET_EMATCH_META=m -CONFIG_NET_EMATCH_TEXT=m -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=m -CONFIG_NET_ACT_GACT=m -CONFIG_GACT_PROB=y -CONFIG_NET_ACT_MIRRED=m -CONFIG_NET_ACT_IPT=m -CONFIG_NET_ACT_PEDIT=m -# CONFIG_NET_ACT_SIMP is not set -CONFIG_NET_CLS_IND=y -CONFIG_NET_ESTIMATOR=y - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set -CONFIG_HAMRADIO=y - -# -# Packet Radio protocols -# -CONFIG_AX25=m -# CONFIG_AX25_DAMA_SLAVE is not set -CONFIG_NETROM=m -CONFIG_ROSE=m - -# -# AX.25 network device drivers -# -# CONFIG_MKISS is not set -# CONFIG_6PACK is not set -CONFIG_BPQETHER=m -CONFIG_BAYCOM_SER_FDX=m -CONFIG_BAYCOM_SER_HDX=m -CONFIG_BAYCOM_PAR=m -CONFIG_BAYCOM_EPP=m -CONFIG_YAM=m -CONFIG_IRDA=m - -# -# IrDA protocols -# -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -# CONFIG_IRDA_ULTRA is not set - -# -# IrDA options -# -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -# CONFIG_IRDA_DEBUG is not set - -# -# Infrared-port device drivers -# - -# -# SIR device drivers -# -CONFIG_IRTTY_SIR=m - -# -# Dongle support -# -CONFIG_DONGLE=y -CONFIG_ESI_DONGLE=m -CONFIG_ACTISYS_DONGLE=m -CONFIG_TEKRAM_DONGLE=m -CONFIG_TOIM3232_DONGLE=m -CONFIG_LITELINK_DONGLE=m -CONFIG_MA600_DONGLE=m -CONFIG_GIRBIL_DONGLE=m -CONFIG_MCP2120_DONGLE=m -CONFIG_OLD_BELKIN_DONGLE=m -CONFIG_ACT200L_DONGLE=m - -# -# Old SIR device drivers -# - -# -# Old Serial dongle support -# - -# -# FIR device drivers -# -CONFIG_USB_IRDA=m -CONFIG_SIGMATEL_FIR=m -CONFIG_NSC_FIR=m -CONFIG_WINBOND_FIR=m -CONFIG_TOSHIBA_FIR=m -CONFIG_SMC_IRCC_FIR=m -CONFIG_ALI_FIR=m -CONFIG_VLSI_FIR=m -CONFIG_VIA_FIR=m -# CONFIG_MCS_FIR is not set -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_CMTP=m -CONFIG_BT_HIDP=m - -# -# Bluetooth device drivers -# -CONFIG_BT_HCIUSB=m -CONFIG_BT_HCIUSB_SCO=y -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIDTL1=m -CONFIG_BT_HCIBT3C=m -CONFIG_BT_HCIBLUECARD=m -CONFIG_BT_HCIBTUART=m -CONFIG_BT_HCIVHCI=m -CONFIG_IEEE80211=m -# CONFIG_IEEE80211_DEBUG is not set -CONFIG_IEEE80211_CRYPT_WEP=m -CONFIG_IEEE80211_CRYPT_CCMP=m -CONFIG_IEEE80211_CRYPT_TKIP=m -CONFIG_IEEE80211_SOFTMAC=m -# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set -CONFIG_WIRELESS_EXT=y -CONFIG_FIB_RULES=y - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=y -# CONFIG_SYS_HYPERVISOR is not set - -# -# Connector - unified userspace <-> kernelspace linker -# -CONFIG_CONNECTOR=m - -# -# Memory Technology Devices (MTD) -# -CONFIG_MTD=m -# CONFIG_MTD_DEBUG is not set -CONFIG_MTD_CONCAT=m -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_REDBOOT_PARTS=m -CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 -# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set -# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set - -# -# User Modules And Translation Layers -# -CONFIG_MTD_CHAR=m -CONFIG_MTD_BLOCK=m -CONFIG_MTD_BLOCK_RO=m -CONFIG_FTL=m -CONFIG_NFTL=m -CONFIG_NFTL_RW=y -CONFIG_INFTL=m -CONFIG_RFD_FTL=m -# CONFIG_SSFDC is not set - -# -# RAM/ROM/Flash chip drivers -# -CONFIG_MTD_CFI=m -CONFIG_MTD_JEDECPROBE=m -CONFIG_MTD_GEN_PROBE=m -# CONFIG_MTD_CFI_ADV_OPTIONS is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set -CONFIG_MTD_CFI_INTELEXT=m -CONFIG_MTD_CFI_AMDSTD=m -CONFIG_MTD_CFI_STAA=m -CONFIG_MTD_CFI_UTIL=m -CONFIG_MTD_RAM=m -CONFIG_MTD_ROM=m -CONFIG_MTD_ABSENT=m -# CONFIG_MTD_OBSOLETE_CHIPS is not set - -# -# Mapping drivers for chip access -# -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PHYSMAP=m -CONFIG_MTD_PHYSMAP_START=0x8000000 -CONFIG_MTD_PHYSMAP_LEN=0x4000000 -CONFIG_MTD_PHYSMAP_BANKWIDTH=2 -CONFIG_MTD_PNC2000=m -CONFIG_MTD_SC520CDP=m -CONFIG_MTD_NETSC520=m -CONFIG_MTD_TS5500=m -CONFIG_MTD_SBC_GXX=m -CONFIG_MTD_SCx200_DOCFLASH=m -CONFIG_MTD_AMD76XROM=m -CONFIG_MTD_ICHXROM=m -CONFIG_MTD_SCB2_FLASH=m -CONFIG_MTD_NETtel=m -CONFIG_MTD_DILNETPC=m -CONFIG_MTD_DILNETPC_BOOTSIZE=0x80000 -CONFIG_MTD_L440GX=m -CONFIG_MTD_PCI=m -CONFIG_MTD_PLATRAM=m - -# -# Self-contained MTD device drivers -# -CONFIG_MTD_PMC551=m -CONFIG_MTD_PMC551_BUGFIX=y -# CONFIG_MTD_PMC551_DEBUG is not set -CONFIG_MTD_DATAFLASH=m -CONFIG_MTD_M25P80=m -CONFIG_MTD_SLRAM=m -CONFIG_MTD_PHRAM=m -CONFIG_MTD_MTDRAM=m -CONFIG_MTDRAM_TOTAL_SIZE=4096 -CONFIG_MTDRAM_ERASE_SIZE=128 -CONFIG_MTD_BLOCK2MTD=m - -# -# Disk-On-Chip Device Drivers -# -# CONFIG_MTD_DOC2000 is not set -# CONFIG_MTD_DOC2001 is not set -CONFIG_MTD_DOC2001PLUS=m -CONFIG_MTD_DOCPROBE=m -CONFIG_MTD_DOCECC=m -# CONFIG_MTD_DOCPROBE_ADVANCED is not set -CONFIG_MTD_DOCPROBE_ADDRESS=0 - -# -# NAND Flash Device Drivers -# -CONFIG_MTD_NAND=m -CONFIG_MTD_NAND_VERIFY_WRITE=y -# CONFIG_MTD_NAND_ECC_SMC is not set -CONFIG_MTD_NAND_IDS=m -# CONFIG_MTD_NAND_DISKONCHIP is not set -CONFIG_MTD_NAND_NANDSIM=m - -# -# OneNAND Flash Device Drivers -# -CONFIG_MTD_ONENAND=m -CONFIG_MTD_ONENAND_VERIFY_WRITE=y -# CONFIG_MTD_ONENAND_OTP is not set - -# -# Parallel port support -# -CONFIG_PARPORT=m -CONFIG_PARPORT_PC=m -CONFIG_PARPORT_SERIAL=m -# CONFIG_PARPORT_PC_FIFO is not set -# CONFIG_PARPORT_PC_SUPERIO is not set -CONFIG_PARPORT_PC_PCMCIA=m -CONFIG_PARPORT_NOT_PC=y -# CONFIG_PARPORT_GSC is not set -# CONFIG_PARPORT_AX88796 is not set -CONFIG_PARPORT_1284=y - -# -# Plug and Play support -# - -# -# Block devices -# -CONFIG_BLK_DEV_FD=y -CONFIG_PARIDE=m -CONFIG_PARIDE_PARPORT=m - -# -# Parallel IDE high-level drivers -# -CONFIG_PARIDE_PD=m -CONFIG_PARIDE_PCD=m -CONFIG_PARIDE_PF=m -CONFIG_PARIDE_PT=m -CONFIG_PARIDE_PG=m - -# -# Parallel IDE protocol modules -# -CONFIG_PARIDE_ATEN=m -CONFIG_PARIDE_BPCK=m -CONFIG_PARIDE_BPCK6=m -CONFIG_PARIDE_COMM=m -CONFIG_PARIDE_DSTR=m -CONFIG_PARIDE_FIT2=m -CONFIG_PARIDE_FIT3=m -CONFIG_PARIDE_EPAT=m -CONFIG_PARIDE_EPATC8=y -CONFIG_PARIDE_EPIA=m -CONFIG_PARIDE_FRIQ=m -CONFIG_PARIDE_FRPW=m -CONFIG_PARIDE_KBIC=m -CONFIG_PARIDE_KTTI=m -CONFIG_PARIDE_ON20=m -CONFIG_PARIDE_ON26=m -CONFIG_BLK_CPQ_DA=m -CONFIG_BLK_CPQ_CISS_DA=m -CONFIG_CISS_SCSI_TAPE=y -CONFIG_BLK_DEV_DAC960=m -CONFIG_BLK_DEV_UMEM=m -# CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_SX8=m -# CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 -CONFIG_BLK_DEV_INITRD=y -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -CONFIG_CDROM_PKTCDVD_WCACHE=y -CONFIG_ATA_OVER_ETH=m - -# -# Misc devices -# -CONFIG_IBM_ASM=m -# CONFIG_SGI_IOC4 is not set -# CONFIG_TIFM_CORE is not set - -# -# ATA/ATAPI/MFM/RLL support -# -CONFIG_IDE=y -CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# -# CONFIG_BLK_DEV_IDE_SATA is not set -# CONFIG_BLK_DEV_HD_IDE is not set -CONFIG_BLK_DEV_IDEDISK=y -CONFIG_IDEDISK_MULTI_MODE=y -CONFIG_BLK_DEV_IDECS=m -CONFIG_BLK_DEV_IDECD=y -CONFIG_BLK_DEV_IDETAPE=m -CONFIG_BLK_DEV_IDEFLOPPY=m -# CONFIG_BLK_DEV_IDESCSI is not set -# CONFIG_IDE_TASK_IOCTL is not set - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_CMD640=y -CONFIG_BLK_DEV_CMD640_ENHANCED=y -CONFIG_BLK_DEV_IDEPCI=y -CONFIG_IDEPCI_SHARE_IRQ=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=y -CONFIG_BLK_DEV_OPTI621=y -CONFIG_BLK_DEV_RZ1000=y -CONFIG_BLK_DEV_IDEDMA_PCI=y -# CONFIG_BLK_DEV_IDEDMA_FORCED is not set -CONFIG_IDEDMA_PCI_AUTO=y -# CONFIG_IDEDMA_ONLYDISK is not set -CONFIG_BLK_DEV_AEC62XX=y -CONFIG_BLK_DEV_ALI15X3=y -# CONFIG_WDC_ALI15X3 is not set -CONFIG_BLK_DEV_AMD74XX=y -CONFIG_BLK_DEV_ATIIXP=y -CONFIG_BLK_DEV_CMD64X=y -CONFIG_BLK_DEV_TRIFLEX=y -CONFIG_BLK_DEV_CY82C693=y -CONFIG_BLK_DEV_CS5520=y -CONFIG_BLK_DEV_CS5530=y -CONFIG_BLK_DEV_CS5535=m -CONFIG_BLK_DEV_HPT34X=y -# CONFIG_HPT34X_AUTODMA is not set -CONFIG_BLK_DEV_HPT366=y -# CONFIG_BLK_DEV_JMICRON is not set -CONFIG_BLK_DEV_SC1200=y -CONFIG_BLK_DEV_PIIX=y -CONFIG_BLK_DEV_IT821X=m -CONFIG_BLK_DEV_NS87415=m -CONFIG_BLK_DEV_PDC202XX_OLD=y -CONFIG_PDC202XX_BURST=y -CONFIG_BLK_DEV_PDC202XX_NEW=y -CONFIG_BLK_DEV_SVWKS=y -CONFIG_BLK_DEV_SIIMAGE=y -CONFIG_BLK_DEV_SIS5513=y -CONFIG_BLK_DEV_SLC90E66=y -CONFIG_BLK_DEV_TRM290=y -CONFIG_BLK_DEV_VIA82CXXX=y -# CONFIG_IDE_ARM is not set -CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_IDEDMA_IVB is not set -CONFIG_IDEDMA_AUTO=y -# CONFIG_BLK_DEV_HD is not set - -# -# SCSI device support -# -# CONFIG_RAID_ATTRS is not set -CONFIG_SCSI=y -CONFIG_SCSI_NETLINK=y -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=y -CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SG=m -CONFIG_CHR_DEV_SCH=m - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y - -# -# SCSI Transports -# -CONFIG_SCSI_SPI_ATTRS=y -CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_SAS_ATTRS=m -# CONFIG_SCSI_SAS_LIBSAS is not set - -# -# SCSI low-level drivers -# -# CONFIG_ISCSI_TCP is not set -CONFIG_BLK_DEV_3W_XXXX_RAID=m -CONFIG_SCSI_3W_9XXX=m -CONFIG_SCSI_ACARD=m -CONFIG_SCSI_AACRAID=m -CONFIG_SCSI_AIC7XXX=y -CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 -CONFIG_AIC7XXX_RESET_DELAY_MS=15000 -# CONFIG_AIC7XXX_DEBUG_ENABLE is not set -CONFIG_AIC7XXX_DEBUG_MASK=0 -# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set -CONFIG_SCSI_AIC7XXX_OLD=m -CONFIG_SCSI_AIC79XX=m -CONFIG_AIC79XX_CMDS_PER_DEVICE=4 -CONFIG_AIC79XX_RESET_DELAY_MS=15000 -# CONFIG_AIC79XX_ENABLE_RD_STRM is not set -# CONFIG_AIC79XX_DEBUG_ENABLE is not set -CONFIG_AIC79XX_DEBUG_MASK=0 -# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set -# CONFIG_SCSI_AIC94XX is not set -CONFIG_SCSI_DPT_I2O=m -CONFIG_SCSI_ADVANSYS=m -# CONFIG_SCSI_ARCMSR is not set -# CONFIG_MEGARAID_NEWGEN is not set -CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m -# CONFIG_SCSI_HPTIOP is not set -CONFIG_SCSI_BUSLOGIC=y -# CONFIG_SCSI_OMIT_FLASHPOINT is not set -CONFIG_SCSI_DMX3191D=m -CONFIG_SCSI_EATA=m -# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set -# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set -CONFIG_SCSI_EATA_MAX_TAGS=16 -CONFIG_SCSI_FUTURE_DOMAIN=m -CONFIG_SCSI_GDTH=m -CONFIG_SCSI_IPS=y -CONFIG_SCSI_INITIO=m -CONFIG_SCSI_INIA100=m -CONFIG_SCSI_PPA=m -CONFIG_SCSI_IMM=m -# CONFIG_SCSI_IZIP_EPP16 is not set -# CONFIG_SCSI_IZIP_SLOW_CTR is not set -# CONFIG_SCSI_STEX is not set -CONFIG_SCSI_SYM53C8XX_2=m -CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 -CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 -CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 -CONFIG_SCSI_SYM53C8XX_MMIO=y -# CONFIG_SCSI_IPR is not set -CONFIG_SCSI_QLOGIC_1280=m -CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set -CONFIG_SCSI_LPFC=m -CONFIG_SCSI_DC395x=m -CONFIG_SCSI_DC390T=m -CONFIG_SCSI_NSP32=m -CONFIG_SCSI_DEBUG=m - -# -# PCMCIA SCSI adapter support -# -CONFIG_PCMCIA_AHA152X=m -CONFIG_PCMCIA_FDOMAIN=m -CONFIG_PCMCIA_NINJA_SCSI=m -CONFIG_PCMCIA_QLOGIC=m -CONFIG_PCMCIA_SYM53C500=m - -# -# Serial ATA (prod) and Parallel ATA (experimental) drivers -# -CONFIG_ATA=y -CONFIG_SATA_AHCI=y -CONFIG_SATA_SVW=m -CONFIG_ATA_PIIX=y -# CONFIG_SATA_MV is not set -CONFIG_SATA_NV=y -CONFIG_PDC_ADMA=m -CONFIG_SATA_QSTOR=m -CONFIG_SATA_PROMISE=y -CONFIG_SATA_SX4=y -CONFIG_SATA_SIL=y -CONFIG_SATA_SIL24=y -CONFIG_SATA_SIS=y -CONFIG_SATA_ULI=y -CONFIG_SATA_VIA=y -CONFIG_SATA_VITESSE=y -CONFIG_SATA_INTEL_COMBINED=y -CONFIG_PATA_ALI=m -CONFIG_PATA_AMD=m -CONFIG_PATA_ARTOP=m -CONFIG_PATA_ATIIXP=m -CONFIG_PATA_CMD64X=m -CONFIG_PATA_CS5520=m -CONFIG_PATA_CS5530=m -CONFIG_PATA_CS5535=m -# CONFIG_PATA_CYPRESS is not set -CONFIG_PATA_EFAR=m -CONFIG_ATA_GENERIC=m -CONFIG_PATA_HPT366=m -# CONFIG_PATA_HPT37X is not set -# CONFIG_PATA_HPT3X2N is not set -CONFIG_PATA_HPT3X3=m -CONFIG_PATA_IT821X=m -CONFIG_PATA_JMICRON=y -CONFIG_PATA_TRIFLEX=m -CONFIG_PATA_MPIIX=m -CONFIG_PATA_OLDPIIX=m -CONFIG_PATA_NETCELL=m -CONFIG_PATA_NS87410=m -# CONFIG_PATA_OPTI is not set -# CONFIG_PATA_OPTIDMA is not set -CONFIG_PATA_PCMCIA=m -# CONFIG_PATA_PDC_OLD is not set -# CONFIG_PATA_RADISYS is not set -CONFIG_PATA_RZ1000=m -CONFIG_PATA_SC1200=m -CONFIG_PATA_SERVERWORKS=m -CONFIG_PATA_PDC2027X=m -CONFIG_PATA_SIL680=m -CONFIG_PATA_SIS=m -CONFIG_PATA_VIA=m -CONFIG_PATA_WINBOND=m - -# -# Multi-device support (RAID and LVM) -# -CONFIG_MD=y -CONFIG_BLK_DEV_MD=y -CONFIG_MD_LINEAR=m -CONFIG_MD_RAID0=y -CONFIG_MD_RAID1=y -# CONFIG_MD_RAID10 is not set -# CONFIG_MD_RAID456 is not set -CONFIG_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -CONFIG_BLK_DEV_DM=m -# CONFIG_DM_DEBUG is not set -CONFIG_DM_CRYPT=m -# CONFIG_DM_SNAPSHOT is not set -# CONFIG_DM_MIRROR is not set -# CONFIG_DM_ZERO is not set -# CONFIG_DM_MULTIPATH is not set - -# -# Fusion MPT device support -# -CONFIG_FUSION=y -CONFIG_FUSION_SPI=m -CONFIG_FUSION_FC=m -CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=128 -CONFIG_FUSION_CTL=m -CONFIG_FUSION_LAN=m - -# -# IEEE 1394 (FireWire) support -# -CONFIG_IEEE1394=y - -# -# Subsystem Options -# -# CONFIG_IEEE1394_VERBOSEDEBUG is not set -# CONFIG_IEEE1394_OUI_DB is not set -CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y -CONFIG_IEEE1394_CONFIG_ROM_IP1394=y -# CONFIG_IEEE1394_EXPORT_FULL_API is not set - -# -# Device Drivers -# -CONFIG_IEEE1394_PCILYNX=m -CONFIG_IEEE1394_OHCI1394=m - -# -# Protocol Drivers -# -CONFIG_IEEE1394_VIDEO1394=m -CONFIG_IEEE1394_SBP2=m -# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set -CONFIG_IEEE1394_ETH1394=m -CONFIG_IEEE1394_DV1394=m -CONFIG_IEEE1394_RAWIO=m - -# -# I2O device support -# -CONFIG_I2O=m -CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y -CONFIG_I2O_EXT_ADAPTEC=y -CONFIG_I2O_CONFIG=m -CONFIG_I2O_CONFIG_OLD_IOCTL=y -CONFIG_I2O_BUS=m -CONFIG_I2O_BLOCK=m -CONFIG_I2O_SCSI=m -CONFIG_I2O_PROC=m - -# -# Network device support -# -CONFIG_NETDEVICES=y -CONFIG_IFB=m -CONFIG_DUMMY=m -CONFIG_BONDING=m -CONFIG_EQUALIZER=m -CONFIG_TUN=m - -# -# ARCnet devices -# -CONFIG_ARCNET=m -CONFIG_ARCNET_1201=m -CONFIG_ARCNET_1051=m -CONFIG_ARCNET_RAW=m -CONFIG_ARCNET_CAP=m -CONFIG_ARCNET_COM90xx=m -CONFIG_ARCNET_COM90xxIO=m -CONFIG_ARCNET_RIM_I=m -CONFIG_ARCNET_COM20020=m -CONFIG_ARCNET_COM20020_PCI=m - -# -# PHY device support -# -CONFIG_PHYLIB=m - -# -# MII PHY device drivers -# -CONFIG_MARVELL_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_LXT_PHY=m -CONFIG_CICADA_PHY=m -# CONFIG_VITESSE_PHY is not set -# CONFIG_SMSC_PHY is not set -# CONFIG_FIXED_PHY is not set - -# -# Ethernet (10 or 100Mbit) -# -CONFIG_NET_ETHERNET=y -CONFIG_MII=m -CONFIG_HAPPYMEAL=m -CONFIG_SUNGEM=m -CONFIG_CASSINI=m -CONFIG_NET_VENDOR_3COM=y -CONFIG_VORTEX=m -CONFIG_TYPHOON=m - -# -# Tulip family network device support -# -CONFIG_NET_TULIP=y -CONFIG_DE2104X=m -CONFIG_TULIP=m -# CONFIG_TULIP_MWI is not set -CONFIG_TULIP_MMIO=y -# CONFIG_TULIP_NAPI is not set -CONFIG_DE4X5=m -CONFIG_WINBOND_840=m -CONFIG_DM9102=m -CONFIG_ULI526X=m -CONFIG_PCMCIA_XIRCOM=m -CONFIG_HP100=m -CONFIG_NET_PCI=y -CONFIG_PCNET32=m -# CONFIG_PCNET32_NAPI is not set -CONFIG_AMD8111_ETH=m -# CONFIG_AMD8111E_NAPI is not set -CONFIG_ADAPTEC_STARFIRE=m -CONFIG_ADAPTEC_STARFIRE_NAPI=y -CONFIG_B44=m -CONFIG_FORCEDETH=m -# CONFIG_FORCEDETH_NAPI is not set -CONFIG_DGRS=m -CONFIG_EEPRO100=m -CONFIG_E100=m -CONFIG_FEALNX=m -CONFIG_NATSEMI=m -CONFIG_NE2K_PCI=m -CONFIG_8139CP=m -CONFIG_8139TOO=m -CONFIG_8139TOO_PIO=y -# CONFIG_8139TOO_TUNE_TWISTER is not set -CONFIG_8139TOO_8129=y -# CONFIG_8139_OLD_RX_RESET is not set -CONFIG_SIS900=m -CONFIG_EPIC100=m -CONFIG_SUNDANCE=m -# CONFIG_SUNDANCE_MMIO is not set -CONFIG_TLAN=m -CONFIG_VIA_RHINE=m -CONFIG_VIA_RHINE_MMIO=y -# CONFIG_VIA_RHINE_NAPI is not set -CONFIG_NET_POCKET=y -CONFIG_ATP=m -CONFIG_DE600=m -CONFIG_DE620=m - -# -# Ethernet (1000 Mbit) -# -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_E1000_NAPI=y -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -# CONFIG_R8169_NAPI is not set -# CONFIG_R8169_VLAN is not set -CONFIG_SIS190=m -CONFIG_SKGE=m -CONFIG_SKY2=m -CONFIG_SK98LIN=m -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m -# CONFIG_QLA3XXX is not set - -# -# Ethernet (10000 Mbit) -# -CONFIG_CHELSIO_T1=m -CONFIG_IXGB=m -CONFIG_IXGB_NAPI=y -CONFIG_S2IO=m -CONFIG_S2IO_NAPI=y -# CONFIG_MYRI10GE is not set - -# -# Token Ring devices -# -CONFIG_TR=y -CONFIG_IBMOL=m -CONFIG_IBMLS=m -CONFIG_3C359=m -CONFIG_TMS380TR=m -CONFIG_TMSPCI=m -CONFIG_ABYSS=m - -# -# Wireless LAN (non-hamradio) -# -CONFIG_NET_RADIO=y -CONFIG_NET_WIRELESS_RTNETLINK=y - -# -# Obsolete Wireless cards support (pre-802.11) -# -CONFIG_STRIP=m -CONFIG_PCMCIA_WAVELAN=m -CONFIG_PCMCIA_NETWAVE=m - -# -# Wireless 802.11 Frequency Hopping cards support -# -CONFIG_PCMCIA_RAYCS=m - -# -# Wireless 802.11b ISA/PCI cards support -# -CONFIG_IPW2100=m -CONFIG_IPW2100_MONITOR=y -# CONFIG_IPW2100_DEBUG is not set -CONFIG_IPW2200=m -CONFIG_IPW2200_MONITOR=y -# CONFIG_IPW2200_RADIOTAP is not set -# CONFIG_IPW2200_PROMISCUOUS is not set -# CONFIG_IPW2200_QOS is not set -# CONFIG_IPW2200_DEBUG is not set -CONFIG_AIRO=m -CONFIG_HERMES=m -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCI_HERMES=m -CONFIG_ATMEL=m -CONFIG_PCI_ATMEL=m - -# -# Wireless 802.11b Pcmcia/Cardbus cards support -# -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_AIRO_CS=m -CONFIG_PCMCIA_ATMEL=m -CONFIG_PCMCIA_WL3501=m - -# -# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support -# -CONFIG_PRISM54=m -CONFIG_USB_ZD1201=m -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_PCI=m -CONFIG_HOSTAP_CS=m -CONFIG_BCM43XX=m -# CONFIG_BCM43XX_DEBUG is not set -CONFIG_BCM43XX_DMA=y -CONFIG_BCM43XX_PIO=y -CONFIG_BCM43XX_DMA_AND_PIO_MODE=y -# CONFIG_BCM43XX_DMA_MODE is not set -# CONFIG_BCM43XX_PIO_MODE is not set -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_NET_WIRELESS=y - -# -# PCMCIA network device support -# -CONFIG_NET_PCMCIA=y -CONFIG_PCMCIA_3C589=m -CONFIG_PCMCIA_3C574=m -CONFIG_PCMCIA_FMVJ18X=m -CONFIG_PCMCIA_PCNET=m -CONFIG_PCMCIA_NMCLAN=m -CONFIG_PCMCIA_SMC91C92=m -CONFIG_PCMCIA_XIRC2PS=m -CONFIG_PCMCIA_AXNET=m -CONFIG_ARCNET_COM20020_CS=m -CONFIG_PCMCIA_IBMTR=m - -# -# Wan interfaces -# -CONFIG_WAN=y -CONFIG_DSCC4=m -# CONFIG_DSCC4_PCISYNC is not set -# CONFIG_DSCC4_PCI_RST is not set -CONFIG_LANMEDIA=m -CONFIG_HDLC=m -CONFIG_HDLC_RAW=m -CONFIG_HDLC_RAW_ETH=m -CONFIG_HDLC_CISCO=m -CONFIG_HDLC_FR=m -CONFIG_HDLC_PPP=m - -# -# X.25/LAPB support is disabled -# -CONFIG_PCI200SYN=m -CONFIG_WANXL=m -CONFIG_PC300=m -CONFIG_PC300_MLPPP=y - -# -# Cyclades-PC300 MLPPP support is disabled. -# - -# -# Refer to the file README.mlppp, provided by PC300 package. -# -CONFIG_FARSYNC=m -CONFIG_DLCI=m -CONFIG_DLCI_COUNT=24 -CONFIG_DLCI_MAX=8 -CONFIG_WAN_ROUTER_DRIVERS=y -CONFIG_CYCLADES_SYNC=m -CONFIG_CYCLOMX_X25=y -CONFIG_SBNI=m -# CONFIG_SBNI_MULTILINE is not set - -# -# ATM drivers -# -# CONFIG_ATM_DUMMY is not set -CONFIG_ATM_TCP=m -CONFIG_ATM_LANAI=m -CONFIG_ATM_ENI=m -# CONFIG_ATM_ENI_DEBUG is not set -# CONFIG_ATM_ENI_TUNE_BURST is not set -CONFIG_ATM_FIRESTREAM=m -CONFIG_ATM_ZATM=m -# CONFIG_ATM_ZATM_DEBUG is not set -CONFIG_ATM_NICSTAR=m -# CONFIG_ATM_NICSTAR_USE_SUNI is not set -# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set -CONFIG_ATM_IDT77252=m -# CONFIG_ATM_IDT77252_DEBUG is not set -# CONFIG_ATM_IDT77252_RCV_ALL is not set -CONFIG_ATM_IDT77252_USE_SUNI=y -CONFIG_ATM_AMBASSADOR=m -# CONFIG_ATM_AMBASSADOR_DEBUG is not set -CONFIG_ATM_HORIZON=m -# CONFIG_ATM_HORIZON_DEBUG is not set -CONFIG_ATM_IA=m -# CONFIG_ATM_IA_DEBUG is not set -CONFIG_ATM_FORE200E_MAYBE=m -# CONFIG_ATM_FORE200E_PCA is not set -CONFIG_ATM_HE=m -# CONFIG_ATM_HE_USE_SUNI is not set -CONFIG_FDDI=y -CONFIG_DEFXX=m -CONFIG_SKFP=m -CONFIG_HIPPI=y -CONFIG_ROADRUNNER=m -# CONFIG_ROADRUNNER_LARGE_RINGS is not set -CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOE=m -CONFIG_PPPOATM=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLHC=m -CONFIG_SLIP_SMART=y -# CONFIG_SLIP_MODE_SLIP6 is not set -CONFIG_NET_FC=y -CONFIG_SHAPER=m -CONFIG_NETCONSOLE=m -CONFIG_NETPOLL=y -# CONFIG_NETPOLL_RX is not set -# CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y - -# -# ISDN subsystem -# -CONFIG_ISDN=m - -# -# Old ISDN4Linux -# -# CONFIG_ISDN_I4L is not set - -# -# CAPI subsystem -# -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_CAPI_CAPI20=m -CONFIG_ISDN_CAPI_CAPIFS_BOOL=y -CONFIG_ISDN_CAPI_CAPIFS=m - -# -# CAPI hardware drivers -# - -# -# Active AVM cards -# -CONFIG_CAPI_AVM=y -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_AVMB1_C4=m - -# -# Active Eicon DIVA Server cards -# -CONFIG_CAPI_EICON=y -CONFIG_ISDN_DIVAS=m -CONFIG_ISDN_DIVAS_BRIPCI=y -CONFIG_ISDN_DIVAS_PRIPCI=y -CONFIG_ISDN_DIVAS_DIVACAPI=m -CONFIG_ISDN_DIVAS_USERIDI=m -CONFIG_ISDN_DIVAS_MAINT=m - -# -# Telephony Support -# -CONFIG_PHONE=m -CONFIG_PHONE_IXJ=m -CONFIG_PHONE_IXJ_PCMCIA=m - -# -# Input device support -# -CONFIG_INPUT=y -CONFIG_INPUT_FF_MEMLESS=y - -# -# Userland interfaces -# -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -CONFIG_INPUT_JOYDEV=m -CONFIG_INPUT_TSDEV=m -CONFIG_INPUT_TSDEV_SCREEN_X=240 -CONFIG_INPUT_TSDEV_SCREEN_Y=320 -CONFIG_INPUT_EVDEV=m -# CONFIG_INPUT_EVBUG is not set - -# -# Input Device Drivers -# -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set -# CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_KEYBOARD_STOWAWAY is not set -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=y -CONFIG_MOUSE_SERIAL=m -CONFIG_MOUSE_VSXXXAA=m -CONFIG_INPUT_JOYSTICK=y -CONFIG_JOYSTICK_ANALOG=m -CONFIG_JOYSTICK_A3D=m -CONFIG_JOYSTICK_ADI=m -CONFIG_JOYSTICK_COBRA=m -CONFIG_JOYSTICK_GF2K=m -CONFIG_JOYSTICK_GRIP=m -CONFIG_JOYSTICK_GRIP_MP=m -CONFIG_JOYSTICK_GUILLEMOT=m -CONFIG_JOYSTICK_INTERACT=m -CONFIG_JOYSTICK_SIDEWINDER=m -CONFIG_JOYSTICK_TMDC=m -CONFIG_JOYSTICK_IFORCE=m -CONFIG_JOYSTICK_IFORCE_USB=y -CONFIG_JOYSTICK_IFORCE_232=y -CONFIG_JOYSTICK_WARRIOR=m -CONFIG_JOYSTICK_MAGELLAN=m -CONFIG_JOYSTICK_SPACEORB=m -CONFIG_JOYSTICK_SPACEBALL=m -CONFIG_JOYSTICK_STINGER=m -CONFIG_JOYSTICK_TWIDJOY=m -CONFIG_JOYSTICK_DB9=m -CONFIG_JOYSTICK_GAMECON=m -CONFIG_JOYSTICK_TURBOGRAFX=m -# CONFIG_JOYSTICK_JOYDUMP is not set -CONFIG_INPUT_TOUCHSCREEN=y -# CONFIG_TOUCHSCREEN_ADS7846 is not set -CONFIG_TOUCHSCREEN_GUNZE=m -CONFIG_TOUCHSCREEN_ELO=m -CONFIG_TOUCHSCREEN_MTOUCH=m -CONFIG_TOUCHSCREEN_MK712=m -# CONFIG_TOUCHSCREEN_PENMOUNT is not set -# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set -# CONFIG_TOUCHSCREEN_TOUCHWIN is not set -CONFIG_INPUT_MISC=y -CONFIG_INPUT_PCSPKR=m -# CONFIG_INPUT_WISTRON_BTNS is not set -CONFIG_INPUT_UINPUT=m - -# -# Hardware I/O ports -# -CONFIG_SERIO=y -CONFIG_SERIO_I8042=y -CONFIG_SERIO_SERPORT=m -CONFIG_SERIO_CT82C710=m -CONFIG_SERIO_PARKBD=m -CONFIG_SERIO_PCIPS2=m -CONFIG_SERIO_LIBPS2=y -# CONFIG_SERIO_RAW is not set -CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m -CONFIG_GAMEPORT_EMU10K1=m -CONFIG_GAMEPORT_FM801=m - -# -# Character devices -# -CONFIG_VT=y -CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y -# CONFIG_VT_HW_CONSOLE_BINDING is not set -CONFIG_SERIAL_NONSTANDARD=y -CONFIG_COMPUTONE=m -CONFIG_ROCKETPORT=m -CONFIG_CYCLADES=m -# CONFIG_CYZ_INTR is not set -CONFIG_DIGIEPCA=m -CONFIG_MOXA_INTELLIO=m -CONFIG_MOXA_SMARTIO=m -# CONFIG_ISI is not set -CONFIG_SYNCLINK=m -CONFIG_SYNCLINKMP=m -CONFIG_SYNCLINK_GT=m -CONFIG_N_HDLC=m -CONFIG_SPECIALIX=m -CONFIG_SPECIALIX_RTSCTS=y -CONFIG_SX=m -CONFIG_RIO=m -# CONFIG_RIO_OLDPCI is not set -CONFIG_STALDRV=y - -# -# Serial drivers -# -CONFIG_SERIAL_8250=m -CONFIG_SERIAL_8250_PCI=m -CONFIG_SERIAL_8250_CS=m -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_8250_DETECT_IRQ=y -CONFIG_SERIAL_8250_RSA=y - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_CORE=m -CONFIG_SERIAL_JSM=m -CONFIG_UNIX98_PTYS=y -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 -CONFIG_PRINTER=m -CONFIG_LP_CONSOLE=y -CONFIG_PPDEV=m -CONFIG_TIPAR=m - -# -# IPMI -# -CONFIG_IPMI_HANDLER=m -# CONFIG_IPMI_PANIC_EVENT is not set -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_WATCHDOG=m -CONFIG_IPMI_POWEROFF=m - -# -# Watchdog Cards -# -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -CONFIG_ACQUIRE_WDT=m -CONFIG_ADVANTECH_WDT=m -CONFIG_ALIM1535_WDT=m -CONFIG_ALIM7101_WDT=m -CONFIG_SC520_WDT=m -CONFIG_EUROTECH_WDT=m -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m -CONFIG_WAFER_WDT=m -CONFIG_I6300ESB_WDT=m -CONFIG_I8XX_TCO=m -# CONFIG_ITCO_WDT is not set -CONFIG_SC1200_WDT=m -CONFIG_SCx200_WDT=m -CONFIG_60XX_WDT=m -CONFIG_SBC8360_WDT=m -CONFIG_CPU5_WDT=m -# CONFIG_SMSC37B787_WDT is not set -CONFIG_W83627HF_WDT=m -# CONFIG_W83697HF_WDT is not set -CONFIG_W83877F_WDT=m -CONFIG_W83977F_WDT=m -CONFIG_MACHZ_WDT=m -CONFIG_SBC_EPX_C3_WATCHDOG=m - -# -# PCI-based Watchdog Cards -# -CONFIG_PCIPCWATCHDOG=m -CONFIG_WDTPCI=m -CONFIG_WDT_501_PCI=y - -# -# USB-based Watchdog Cards -# -CONFIG_USBPCWATCHDOG=m -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_INTEL=y -CONFIG_HW_RANDOM_AMD=y -CONFIG_HW_RANDOM_GEODE=y -CONFIG_HW_RANDOM_VIA=y -CONFIG_NVRAM=m -CONFIG_RTC=y -CONFIG_DTLK=m -CONFIG_R3964=m -CONFIG_APPLICOM=m -CONFIG_SONYPI=m - -# -# Ftape, the floppy tape device driver -# -CONFIG_AGP=m -CONFIG_AGP_ALI=m -CONFIG_AGP_ATI=m -CONFIG_AGP_AMD=m -CONFIG_AGP_AMD64=m -CONFIG_AGP_INTEL=m -CONFIG_AGP_NVIDIA=m -CONFIG_AGP_SIS=m -CONFIG_AGP_SWORKS=m -CONFIG_AGP_VIA=m -CONFIG_AGP_EFFICEON=m -CONFIG_DRM=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m -CONFIG_DRM_I810=m -CONFIG_DRM_I830=m -CONFIG_DRM_I915=m -CONFIG_DRM_MGA=m -CONFIG_DRM_SIS=m -CONFIG_DRM_VIA=m -CONFIG_DRM_SAVAGE=m - -# -# PCMCIA character devices -# -CONFIG_SYNCLINK_CS=m -CONFIG_CARDMAN_4000=m -CONFIG_CARDMAN_4040=m -CONFIG_MWAVE=m -CONFIG_SCx200_GPIO=m -CONFIG_PC8736x_GPIO=m -CONFIG_NSC_GPIO=m -CONFIG_CS5535_GPIO=m -# CONFIG_RAW_DRIVER is not set -CONFIG_HANGCHECK_TIMER=m - -# -# TPM devices -# -CONFIG_TCG_TPM=m -CONFIG_TCG_ATMEL=m -# CONFIG_TCG_XEN is not set -CONFIG_TELCLOCK=m - -# -# I2C support -# -CONFIG_I2C=m -CONFIG_I2C_CHARDEV=m - -# -# I2C Algorithms -# -CONFIG_I2C_ALGOBIT=m -CONFIG_I2C_ALGOPCF=m -CONFIG_I2C_ALGOPCA=m - -# -# I2C Hardware Bus support -# -CONFIG_I2C_ALI1535=m -CONFIG_I2C_ALI1563=m -CONFIG_I2C_ALI15X3=m -CONFIG_I2C_AMD756=m -CONFIG_I2C_AMD756_S4882=m -CONFIG_I2C_AMD8111=m -CONFIG_I2C_I801=m -CONFIG_I2C_I810=m -CONFIG_I2C_PIIX4=m -CONFIG_I2C_ISA=m -CONFIG_I2C_NFORCE2=m -# CONFIG_I2C_OCORES is not set -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_PROSAVAGE=m -CONFIG_I2C_SAVAGE4=m -CONFIG_SCx200_I2C=m -CONFIG_SCx200_I2C_SCL=12 -CONFIG_SCx200_I2C_SDA=13 -CONFIG_SCx200_ACB=m -CONFIG_I2C_SIS5595=m -CONFIG_I2C_SIS630=m -CONFIG_I2C_SIS96X=m -# CONFIG_I2C_STUB is not set -CONFIG_I2C_VIA=m -CONFIG_I2C_VIAPRO=m -CONFIG_I2C_VOODOO3=m -CONFIG_I2C_PCA_ISA=m - -# -# Miscellaneous I2C Chip support -# -CONFIG_SENSORS_DS1337=m -CONFIG_SENSORS_DS1374=m -CONFIG_SENSORS_EEPROM=m -CONFIG_SENSORS_PCF8574=m -CONFIG_SENSORS_PCA9539=m -CONFIG_SENSORS_PCF8591=m -CONFIG_SENSORS_MAX6875=m -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set - -# -# SPI support -# -CONFIG_SPI=y -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -CONFIG_SPI_BITBANG=m -# CONFIG_SPI_BUTTERFLY is not set - -# -# SPI Protocol Masters -# - -# -# Dallas's 1-wire bus -# -CONFIG_W1=m -CONFIG_W1_CON=y - -# -# 1-wire Bus Masters -# -CONFIG_W1_MASTER_MATROX=m -# CONFIG_W1_MASTER_DS2490 is not set -CONFIG_W1_MASTER_DS2482=m - -# -# 1-wire Slaves -# -CONFIG_W1_SLAVE_THERM=m -CONFIG_W1_SLAVE_SMEM=m -CONFIG_W1_SLAVE_DS2433=m -# CONFIG_W1_SLAVE_DS2433_CRC is not set - -# -# Hardware Monitoring support -# -CONFIG_HWMON=y -CONFIG_HWMON_VID=m -# CONFIG_SENSORS_ABITUGURU is not set -CONFIG_SENSORS_ADM1021=m -CONFIG_SENSORS_ADM1025=m -CONFIG_SENSORS_ADM1026=m -CONFIG_SENSORS_ADM1031=m -CONFIG_SENSORS_ADM9240=m -# CONFIG_SENSORS_K8TEMP is not set -CONFIG_SENSORS_ASB100=m -CONFIG_SENSORS_ATXP1=m -CONFIG_SENSORS_DS1621=m -CONFIG_SENSORS_F71805F=m -CONFIG_SENSORS_FSCHER=m -CONFIG_SENSORS_FSCPOS=m -CONFIG_SENSORS_GL518SM=m -CONFIG_SENSORS_GL520SM=m -CONFIG_SENSORS_IT87=m -CONFIG_SENSORS_LM63=m -# CONFIG_SENSORS_LM70 is not set -CONFIG_SENSORS_LM75=m -CONFIG_SENSORS_LM77=m -CONFIG_SENSORS_LM78=m -CONFIG_SENSORS_LM80=m -CONFIG_SENSORS_LM83=m -CONFIG_SENSORS_LM85=m -CONFIG_SENSORS_LM87=m -CONFIG_SENSORS_LM90=m -CONFIG_SENSORS_LM92=m -CONFIG_SENSORS_MAX1619=m -CONFIG_SENSORS_PC87360=m -CONFIG_SENSORS_SIS5595=m -CONFIG_SENSORS_SMSC47M1=m -# CONFIG_SENSORS_SMSC47M192 is not set -CONFIG_SENSORS_SMSC47B397=m -CONFIG_SENSORS_VIA686A=m -# CONFIG_SENSORS_VT1211 is not set -CONFIG_SENSORS_VT8231=m -CONFIG_SENSORS_W83781D=m -# CONFIG_SENSORS_W83791D is not set -CONFIG_SENSORS_W83792D=m -CONFIG_SENSORS_W83L785TS=m -CONFIG_SENSORS_W83627HF=m -CONFIG_SENSORS_W83627EHF=m -CONFIG_SENSORS_HDAPS=m -# CONFIG_HWMON_DEBUG_CHIP is not set - -# -# Multimedia devices -# -CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L1=y -CONFIG_VIDEO_V4L1_COMPAT=y -CONFIG_VIDEO_V4L2=y - -# -# Video Capture Adapters -# - -# -# Video Capture Adapters -# -# CONFIG_VIDEO_ADV_DEBUG is not set -CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TDA9875=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA7111=m -CONFIG_VIDEO_SAA7114=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_VPX3220=m -CONFIG_VIDEO_CX2341X=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m -CONFIG_VIDEO_VIVI=m -CONFIG_VIDEO_BT848=m -CONFIG_VIDEO_BT848_DVB=y -CONFIG_VIDEO_SAA6588=m -CONFIG_VIDEO_BWQCAM=m -CONFIG_VIDEO_CQCAM=m -CONFIG_VIDEO_W9966=m -CONFIG_VIDEO_CPIA=m -CONFIG_VIDEO_CPIA_PP=m -CONFIG_VIDEO_CPIA_USB=m -CONFIG_VIDEO_CPIA2=m -CONFIG_VIDEO_SAA5246A=m -CONFIG_VIDEO_SAA5249=m -CONFIG_TUNER_3036=m -CONFIG_VIDEO_STRADIS=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m -CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_SAA7134=m -CONFIG_VIDEO_SAA7134_ALSA=m -CONFIG_VIDEO_SAA7134_DVB=m -CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_DPC=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_CX88=m -CONFIG_VIDEO_CX88_ALSA=m -CONFIG_VIDEO_CX88_BLACKBIRD=m -CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88_VP3054=m - -# -# V4L USB devices -# -CONFIG_VIDEO_PVRUSB2=m -# CONFIG_VIDEO_PVRUSB2_29XXX is not set -# CONFIG_VIDEO_PVRUSB2_24XXX is not set -CONFIG_VIDEO_PVRUSB2_SYSFS=y -# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_USBVIDEO=m -CONFIG_USB_VICAM=m -CONFIG_USB_IBMCAM=m -CONFIG_USB_KONICAWC=m -CONFIG_USB_QUICKCAM_MESSENGER=m -CONFIG_USB_ET61X251=m -CONFIG_VIDEO_OVCAMCHIP=m -CONFIG_USB_W9968CF=m -CONFIG_USB_OV511=m -CONFIG_USB_SE401=m -CONFIG_USB_SN9C102=m -CONFIG_USB_STV680=m -CONFIG_USB_ZC0301=m -CONFIG_USB_PWC=m -# CONFIG_USB_PWC_DEBUG is not set - -# -# Radio Adapters -# -CONFIG_RADIO_GEMTEK_PCI=m -CONFIG_RADIO_MAXIRADIO=m -CONFIG_RADIO_MAESTRO=m -CONFIG_USB_DSBR=m - -# -# Digital Video Broadcasting Devices -# -CONFIG_DVB=y -CONFIG_DVB_CORE=m -# CONFIG_DVB_CORE_ATTACH is not set - -# -# Supported SAA7146 based PCI Adapters -# -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m - -# -# Supported USB Adapters -# -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set -CONFIG_DVB_USB_DIBUSB_MC=m -# CONFIG_DVB_USB_DIB0700 is not set -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_DVB_CINERGYT2=m -# CONFIG_DVB_CINERGYT2_TUNING is not set - -# -# Supported FlexCopII (B2C2) Adapters -# -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set - -# -# Supported BT878 Adapters -# -CONFIG_DVB_BT8XX=m - -# -# Supported Pluto2 Adapters -# -CONFIG_DVB_PLUTO2=m - -# -# Supported DVB Frontends -# - -# -# Customise DVB Frontends -# -# CONFIG_DVB_FE_CUSTOMISE is not set - -# -# DVB-S (satellite) frontends -# -CONFIG_DVB_STV0299=m -CONFIG_DVB_CX24110=m -CONFIG_DVB_CX24123=m -CONFIG_DVB_TDA8083=m -CONFIG_DVB_MT312=m -CONFIG_DVB_VES1X93=m -CONFIG_DVB_S5H1420=m -CONFIG_DVB_TDA10086=m - -# -# DVB-T (terrestrial) frontends -# -CONFIG_DVB_SP8870=m -CONFIG_DVB_SP887X=m -CONFIG_DVB_CX22700=m -CONFIG_DVB_CX22702=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m -CONFIG_DVB_MT352=m -CONFIG_DVB_ZL10353=m -CONFIG_DVB_DIB3000MB=m -CONFIG_DVB_DIB3000MC=m - -# -# DVB-C (cable) frontends -# -CONFIG_DVB_VES1820=m -CONFIG_DVB_TDA10021=m -CONFIG_DVB_STV0297=m - -# -# ATSC (North American/Korean Terrestrial/Cable DTV) frontends -# -CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m -CONFIG_DVB_OR51132=m -CONFIG_DVB_BCM3510=m -CONFIG_DVB_LGDT330X=m - -# -# Tuners/PLL support -# -CONFIG_DVB_PLL=m -CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUNER_MT2060=m - -# -# Miscellaneous devices -# -CONFIG_DVB_LNBP21=m -CONFIG_DVB_ISL6421=m -CONFIG_DVB_TUA6100=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_VIDEO_VIDEOBUF=m -CONFIG_VIDEO_TUNER=m -CONFIG_VIDEO_BUF=m -CONFIG_VIDEO_BUF_DVB=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_IR=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_USB_DABUSB=m - -# -# Graphics support -# -CONFIG_FIRMWARE_EDID=y -CONFIG_FB=y -CONFIG_FB_DDC=m -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -# CONFIG_FB_MACMODES is not set -# CONFIG_FB_BACKLIGHT is not set -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y -# CONFIG_FB_CIRRUS is not set -# CONFIG_FB_PM2 is not set -# CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_ARC is not set -# CONFIG_FB_ASILIANT is not set -# CONFIG_FB_IMSTT is not set -CONFIG_FB_VGA16=m -CONFIG_FB_VESA=y -# CONFIG_FB_HGA is not set -# CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set -CONFIG_FB_I810=m -CONFIG_FB_I810_GTF=y -# CONFIG_FB_I810_I2C is not set -CONFIG_FB_INTEL=m -# CONFIG_FB_INTEL_DEBUG is not set -CONFIG_FB_INTEL_I2C=y -CONFIG_FB_MATROX=m -# CONFIG_FB_MATROX_MILLENIUM is not set -# CONFIG_FB_MATROX_MYSTIQUE is not set -CONFIG_FB_MATROX_G=y -CONFIG_FB_MATROX_I2C=m -CONFIG_FB_MATROX_MAVEN=m -CONFIG_FB_MATROX_MULTIHEAD=y -CONFIG_FB_RADEON=m -CONFIG_FB_RADEON_I2C=y -# CONFIG_FB_RADEON_DEBUG is not set -CONFIG_FB_ATY128=m -CONFIG_FB_ATY=m -# CONFIG_FB_ATY_CT is not set -# CONFIG_FB_ATY_GX is not set -# CONFIG_FB_SAVAGE is not set -CONFIG_FB_SIS=m -CONFIG_FB_SIS_300=y -CONFIG_FB_SIS_315=y -# CONFIG_FB_NEOMAGIC is not set -# CONFIG_FB_KYRO is not set -# CONFIG_FB_3DFX is not set -# CONFIG_FB_VOODOO1 is not set -# CONFIG_FB_CYBLA is not set -# CONFIG_FB_TRIDENT is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_VIRTUAL is not set - -# -# Console display driver support -# -CONFIG_VGA_CONSOLE=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set -CONFIG_VIDEO_SELECT=y -CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -# CONFIG_FONT_6x11 is not set -# CONFIG_FONT_7x14 is not set -# CONFIG_FONT_PEARL_8x8 is not set -# CONFIG_FONT_ACORN_8x8 is not set -# CONFIG_FONT_MINI_4x6 is not set -# CONFIG_FONT_SUN8x16 is not set -# CONFIG_FONT_SUN12x22 is not set -# CONFIG_FONT_10x18 is not set - -# -# Logo configuration -# -# CONFIG_LOGO is not set -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set - -# -# Sound -# -CONFIG_SOUND=y - -# -# Advanced Linux Sound Architecture -# -CONFIG_SND=y -CONFIG_SND_TIMER=y -CONFIG_SND_PCM=y -CONFIG_SND_HWDEP=m -CONFIG_SND_RAWMIDI=m -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m -CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y -CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_SEQUENCER_OSS=y -CONFIG_SND_RTCTIMER=m -CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y -# CONFIG_SND_DYNAMIC_MINORS is not set -CONFIG_SND_SUPPORT_OLD_API=y -# CONFIG_SND_VERBOSE_PROCFS is not set -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set - -# -# Generic devices -# -CONFIG_SND_MPU401_UART=m -CONFIG_SND_OPL3_LIB=m -CONFIG_SND_VX_LIB=m -CONFIG_SND_AC97_CODEC=m -CONFIG_SND_AC97_BUS=m -CONFIG_SND_DUMMY=m -CONFIG_SND_VIRMIDI=m -CONFIG_SND_MTPAV=m -# CONFIG_SND_MTS64 is not set -CONFIG_SND_SERIAL_U16550=m -CONFIG_SND_MPU401=m - -# -# PCI devices -# -CONFIG_SND_AD1889=m -CONFIG_SND_ALS300=m -CONFIG_SND_ALS4000=m -CONFIG_SND_ALI5451=m -CONFIG_SND_ATIIXP=m -CONFIG_SND_ATIIXP_MODEM=m -CONFIG_SND_AU8810=m -CONFIG_SND_AU8820=m -CONFIG_SND_AU8830=m -CONFIG_SND_AZT3328=m -CONFIG_SND_BT87X=m -# CONFIG_SND_BT87X_OVERCLOCK is not set -CONFIG_SND_CA0106=m -CONFIG_SND_CMIPCI=m -CONFIG_SND_CS4281=m -CONFIG_SND_CS46XX=m -CONFIG_SND_CS46XX_NEW_DSP=y -CONFIG_SND_CS5535AUDIO=m -CONFIG_SND_DARLA20=m -CONFIG_SND_GINA20=m -CONFIG_SND_LAYLA20=m -CONFIG_SND_DARLA24=m -CONFIG_SND_GINA24=m -CONFIG_SND_LAYLA24=m -CONFIG_SND_MONA=m -CONFIG_SND_MIA=m -CONFIG_SND_ECHO3G=m -CONFIG_SND_INDIGO=m -CONFIG_SND_INDIGOIO=m -CONFIG_SND_INDIGODJ=m -CONFIG_SND_EMU10K1=m -CONFIG_SND_EMU10K1X=m -CONFIG_SND_ENS1370=m -CONFIG_SND_ENS1371=m -CONFIG_SND_ES1938=m -CONFIG_SND_ES1968=m -CONFIG_SND_FM801=m -CONFIG_SND_FM801_TEA575X_BOOL=y -CONFIG_SND_FM801_TEA575X=m -CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDSP=m -CONFIG_SND_HDSPM=m -CONFIG_SND_ICE1712=m -CONFIG_SND_ICE1724=m -CONFIG_SND_INTEL8X0=m -CONFIG_SND_INTEL8X0M=m -CONFIG_SND_KORG1212=m -CONFIG_SND_MAESTRO3=m -CONFIG_SND_MIXART=m -CONFIG_SND_NM256=m -CONFIG_SND_PCXHR=m -CONFIG_SND_RIPTIDE=m -CONFIG_SND_RME32=m -CONFIG_SND_RME96=m -CONFIG_SND_RME9652=m -CONFIG_SND_SONICVIBES=m -CONFIG_SND_TRIDENT=m -CONFIG_SND_VIA82XX=m -CONFIG_SND_VIA82XX_MODEM=m -CONFIG_SND_VX222=m -CONFIG_SND_YMFPCI=m -# CONFIG_SND_AC97_POWER_SAVE is not set - -# -# USB devices -# -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_USX2Y=m - -# -# PCMCIA devices -# -CONFIG_SND_VXPOCKET=m -CONFIG_SND_PDAUDIOCF=m - -# -# Open Sound System -# -# CONFIG_SOUND_PRIME is not set - -# -# USB support -# -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB_ARCH_HAS_EHCI=y -CONFIG_USB=y -# CONFIG_USB_DEBUG is not set - -# -# Miscellaneous USB options -# -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_BANDWIDTH is not set -# CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_OTG is not set - -# -# USB Host Controller Drivers -# -CONFIG_USB_EHCI_HCD=m -CONFIG_USB_EHCI_SPLIT_ISO=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -# CONFIG_USB_EHCI_TT_NEWSCHED is not set -CONFIG_USB_ISP116X_HCD=m -CONFIG_USB_OHCI_HCD=m -# CONFIG_USB_OHCI_BIG_ENDIAN is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_UHCI_HCD=m -CONFIG_USB_SL811_HCD=m -CONFIG_USB_SL811_CS=m - -# -# USB Device Class drivers -# -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m - -# -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' -# - -# -# may also be needed; see USB_STORAGE Help for more information -# -CONFIG_USB_STORAGE=m -# CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_DPCM=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -# CONFIG_USB_STORAGE_ONETOUCH is not set -# CONFIG_USB_STORAGE_KARMA is not set -# CONFIG_USB_LIBUSUAL is not set - -# -# USB Input Devices -# -CONFIG_USB_HID=y -CONFIG_USB_HIDINPUT=y -# CONFIG_USB_HIDINPUT_POWERBOOK is not set -CONFIG_HID_FF=y -CONFIG_HID_PID=y -CONFIG_LOGITECH_FF=y -CONFIG_THRUSTMASTER_FF=y -# CONFIG_ZEROPLUS_FF is not set -CONFIG_USB_HIDDEV=y -CONFIG_USB_AIPTEK=m -CONFIG_USB_WACOM=m -CONFIG_USB_ACECAD=m -CONFIG_USB_KBTAB=m -CONFIG_USB_POWERMATE=m -CONFIG_USB_TOUCHSCREEN=m -CONFIG_USB_TOUCHSCREEN_EGALAX=y -CONFIG_USB_TOUCHSCREEN_PANJIT=y -CONFIG_USB_TOUCHSCREEN_3M=y -CONFIG_USB_TOUCHSCREEN_ITM=y -CONFIG_USB_TOUCHSCREEN_ETURBO=y -CONFIG_USB_TOUCHSCREEN_GUNZE=y -CONFIG_USB_YEALINK=m -CONFIG_USB_XPAD=m -CONFIG_USB_ATI_REMOTE=m -CONFIG_USB_ATI_REMOTE2=m -# CONFIG_USB_KEYSPAN_REMOTE is not set -CONFIG_USB_APPLETOUCH=m - -# -# USB Imaging devices -# -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m - -# -# USB Network Adapters -# -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET_MII=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m -# CONFIG_USB_NET_MCS7830 is not set -# CONFIG_USB_NET_RNDIS_HOST is not set -CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -# CONFIG_USB_EPSON2888 is not set -CONFIG_USB_NET_ZAURUS=m -# CONFIG_USB_MON is not set - -# -# USB port drivers -# -CONFIG_USB_USS720=m - -# -# USB Serial Converter support -# -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -# CONFIG_USB_SERIAL_AIRCABLE is not set -CONFIG_USB_SERIAL_AIRPRIME=m -CONFIG_USB_SERIAL_ARK3116=m -CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_WHITEHEAT=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_CP2101=m -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_FUNSOFT=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -# CONFIG_USB_SERIAL_MOS7720 is not set -# CONFIG_USB_SERIAL_MOS7840 is not set -CONFIG_USB_SERIAL_NAVMAN=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_SERIAL_HP4X=m -CONFIG_USB_SERIAL_SAFE=m -CONFIG_USB_SERIAL_SAFE_PADDED=y -# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set -CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_EZUSB=y - -# -# USB Miscellaneous drivers -# -CONFIG_USB_EMI62=m -CONFIG_USB_EMI26=m -# CONFIG_USB_ADUTUX is not set -CONFIG_USB_AUERSWALD=m -CONFIG_USB_RIO500=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_LCD=m -CONFIG_USB_LED=m -# CONFIG_USB_CYPRESS_CY7C63 is not set -CONFIG_USB_CYTHERM=m -# CONFIG_USB_PHIDGET is not set -CONFIG_USB_IDMOUSE=m -# CONFIG_USB_FTDI_ELAN is not set -# CONFIG_USB_APPLEDISPLAY is not set -CONFIG_USB_SISUSBVGA=m -# CONFIG_USB_SISUSBVGA_CON is not set -CONFIG_USB_LD=m -# CONFIG_USB_TRANCEVIBRATOR is not set -CONFIG_USB_TEST=m - -# -# USB DSL modem support -# -CONFIG_USB_ATM=m -CONFIG_USB_SPEEDTOUCH=m -CONFIG_USB_CXACRU=m -CONFIG_USB_UEAGLEATM=m -CONFIG_USB_XUSBATM=m - -# -# USB Gadget Support -# -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG_FILES is not set -CONFIG_USB_GADGET_SELECTED=y -CONFIG_USB_GADGET_NET2280=y -CONFIG_USB_NET2280=m -# CONFIG_USB_GADGET_PXA2XX is not set -# CONFIG_USB_GADGET_GOKU is not set -# CONFIG_USB_GADGET_LH7A40X is not set -# CONFIG_USB_GADGET_OMAP is not set -# CONFIG_USB_GADGET_AT91 is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set -CONFIG_USB_GADGET_DUALSPEED=y -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=m -# CONFIG_USB_ETH_RNDIS is not set -# CONFIG_USB_GADGETFS is not set -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_G_SERIAL=m -# CONFIG_USB_MIDI_GADGET is not set - -# -# MMC/SD Card support -# -CONFIG_MMC=m -# CONFIG_MMC_DEBUG is not set -CONFIG_MMC_BLOCK=m -CONFIG_MMC_SDHCI=m -CONFIG_MMC_WBSD=m -# CONFIG_MMC_TIFM_SD is not set - -# -# LED devices -# -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m - -# -# LED drivers -# -# CONFIG_LEDS_NET48XX is not set - -# -# LED Triggers -# -# CONFIG_LEDS_TRIGGERS is not set - -# -# InfiniBand support -# -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -# CONFIG_INFINIBAND_AMSO1100 is not set -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -# CONFIG_INFINIBAND_ISER is not set - -# -# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) -# -# CONFIG_EDAC is not set - -# -# Real Time Clock -# -CONFIG_RTC_LIB=m -CONFIG_RTC_CLASS=m - -# -# RTC interfaces -# -CONFIG_RTC_INTF_SYSFS=m -CONFIG_RTC_INTF_PROC=m -CONFIG_RTC_INTF_DEV=m -# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set - -# -# RTC drivers -# -CONFIG_RTC_DRV_X1205=m -# CONFIG_RTC_DRV_DS1307 is not set -# CONFIG_RTC_DRV_DS1553 is not set -# CONFIG_RTC_DRV_ISL1208 is not set -CONFIG_RTC_DRV_DS1672=m -# CONFIG_RTC_DRV_DS1742 is not set -CONFIG_RTC_DRV_PCF8563=m -# CONFIG_RTC_DRV_PCF8583 is not set -# CONFIG_RTC_DRV_RS5C348 is not set -CONFIG_RTC_DRV_RS5C372=m -CONFIG_RTC_DRV_M48T86=m -CONFIG_RTC_DRV_TEST=m -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_V3020 is not set - -# -# DMA Engine support -# -# CONFIG_DMA_ENGINE is not set - -# -# DMA Clients -# - -# -# DMA Devices -# - -# -# File systems -# -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -# CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=y -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -# CONFIG_EXT4DEV_FS is not set -CONFIG_JBD=y -# CONFIG_JBD_DEBUG is not set -CONFIG_FS_MBCACHE=y -CONFIG_REISERFS_FS=y -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -CONFIG_REISERFS_FS_SECURITY=y -CONFIG_JFS_FS=m -CONFIG_JFS_POSIX_ACL=y -CONFIG_JFS_SECURITY=y -# CONFIG_JFS_DEBUG is not set -CONFIG_JFS_STATISTICS=y -CONFIG_FS_POSIX_ACL=y -CONFIG_XFS_FS=y -CONFIG_XFS_QUOTA=y -CONFIG_XFS_SECURITY=y -CONFIG_XFS_POSIX_ACL=y -# CONFIG_XFS_RT is not set -# CONFIG_GFS2_FS is not set -# CONFIG_OCFS2_FS is not set -# CONFIG_MINIX_FS is not set -CONFIG_ROMFS_FS=m -CONFIG_INOTIFY=y -CONFIG_INOTIFY_USER=y -CONFIG_QUOTA=y -CONFIG_QFMT_V1=m -CONFIG_QFMT_V2=m -CONFIG_QUOTACTL=y -CONFIG_DNOTIFY=y -CONFIG_AUTOFS_FS=m -CONFIG_AUTOFS4_FS=m -CONFIG_FUSE_FS=m - -# -# CD-ROM/DVD Filesystems -# -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_ZISOFS_FS=m -CONFIG_UDF_FS=m -CONFIG_UDF_NLS=y - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=m -# CONFIG_MSDOS_FS is not set -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_PROC_KCORE=y -CONFIG_PROC_SYSCTL=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_HUGETLB_PAGE is not set -CONFIG_RAMFS=y -# CONFIG_CONFIGFS_FS is not set - -# -# Miscellaneous filesystems -# -CONFIG_ADFS_FS=m -# CONFIG_ADFS_FS_RW is not set -CONFIG_AFFS_FS=m -# CONFIG_ECRYPT_FS is not set -CONFIG_HFS_FS=m -CONFIG_HFSPLUS_FS=m -CONFIG_BEFS_FS=m -# CONFIG_BEFS_DEBUG is not set -CONFIG_BFS_FS=m -CONFIG_EFS_FS=m -CONFIG_JFFS_FS=m -CONFIG_JFFS_FS_VERBOSE=0 -# CONFIG_JFFS_PROC_FS is not set -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_SUMMARY is not set -# CONFIG_JFFS2_FS_XATTR is not set -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_ZLIB=y -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set -# CONFIG_JFFS2_CMODE_NONE is not set -CONFIG_JFFS2_CMODE_PRIORITY=y -# CONFIG_JFFS2_CMODE_SIZE is not set -CONFIG_CRAMFS=m -CONFIG_VXFS_FS=m -CONFIG_HPFS_FS=m -CONFIG_QNX4FS_FS=m -CONFIG_SYSV_FS=m -CONFIG_UFS_FS=m -# CONFIG_UFS_FS_WRITE is not set -# CONFIG_UFS_DEBUG is not set - -# -# Network File Systems -# -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -# CONFIG_NFS_V3_ACL is not set -CONFIG_NFS_V4=y -CONFIG_NFS_DIRECTIO=y -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -# CONFIG_NFSD_V3_ACL is not set -CONFIG_NFSD_V4=y -CONFIG_NFSD_TCP=y -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_RPCSEC_GSS_KRB5=m -# CONFIG_RPCSEC_GSS_SPKM3 is not set -CONFIG_SMB_FS=m -# CONFIG_SMB_NLS_DEFAULT is not set -CONFIG_CIFS=m -# CONFIG_CIFS_STATS is not set -# CONFIG_CIFS_WEAK_PW_HASH is not set -# CONFIG_CIFS_XATTR is not set -# CONFIG_CIFS_DEBUG2 is not set -# CONFIG_CIFS_EXPERIMENTAL is not set -CONFIG_NCP_FS=m -CONFIG_NCPFS_PACKET_SIGNING=y -CONFIG_NCPFS_IOCTL_LOCKING=y -CONFIG_NCPFS_STRONG=y -CONFIG_NCPFS_NFS_NS=y -CONFIG_NCPFS_OS2_NS=y -CONFIG_NCPFS_SMALLDOS=y -CONFIG_NCPFS_NLS=y -CONFIG_NCPFS_EXTRAS=y -CONFIG_CODA_FS=m -# CONFIG_CODA_FS_OLD_API is not set -CONFIG_AFS_FS=m -CONFIG_RXRPC=m -# CONFIG_9P_FS is not set - -# -# Partition Types -# -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -CONFIG_MAC_PARTITION=y -CONFIG_MSDOS_PARTITION=y -CONFIG_BSD_DISKLABEL=y -# CONFIG_MINIX_SUBPARTITION is not set -CONFIG_SOLARIS_X86_PARTITION=y -# CONFIG_UNIXWARE_DISKLABEL is not set -CONFIG_LDM_PARTITION=y -# CONFIG_LDM_DEBUG is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -# CONFIG_KARMA_PARTITION is not set -# CONFIG_EFI_PARTITION is not set - -# -# Native Language Support -# -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=m - -# -# Distributed Lock Manager -# -# CONFIG_DLM is not set - -# -# Instrumentation Support -# -# CONFIG_PROFILING is not set -# CONFIG_KPROBES is not set - -# -# Kernel hacking -# -CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set -CONFIG_ENABLE_MUST_CHECK=y -# CONFIG_MAGIC_SYSRQ is not set -CONFIG_UNUSED_SYMBOLS=y -# CONFIG_DEBUG_KERNEL is not set -CONFIG_LOG_BUF_SHIFT=15 -CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_FS is not set -# CONFIG_UNWIND_INFO is not set -# CONFIG_HEADERS_CHECK is not set -CONFIG_EARLY_PRINTK=y - -# -# Security options -# -CONFIG_KEYS=y -CONFIG_KEYS_DEBUG_PROC_KEYS=y -CONFIG_SECURITY=y -CONFIG_SECURITY_NETWORK=y -# CONFIG_SECURITY_NETWORK_XFRM is not set -CONFIG_SECURITY_CAPABILITIES=m -CONFIG_SECURITY_ROOTPLUG=m - -# -# Cryptographic options -# -CONFIG_CRYPTO=y -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=m -# CONFIG_CRYPTO_TWOFISH_586 is not set -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_AES_586=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_TEST=m - -# -# Hardware crypto devices -# -CONFIG_CRYPTO_DEV_PADLOCK=m -CONFIG_CRYPTO_DEV_PADLOCK_AES=m -CONFIG_CRYPTO_DEV_PADLOCK_SHA=m -CONFIG_XEN=y -CONFIG_XEN_INTERFACE_VERSION=0x00030203 - -# -# XEN -# -# CONFIG_XEN_PRIVILEGED_GUEST is not set -CONFIG_XEN_UNPRIVILEGED_GUEST=y -CONFIG_XEN_PRIVCMD=y -CONFIG_XEN_XENBUS_DEV=y -CONFIG_XEN_BACKEND=y -CONFIG_XEN_BLKDEV_BACKEND=y -CONFIG_XEN_BLKDEV_TAP=y -CONFIG_XEN_NETDEV_BACKEND=y -# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set -CONFIG_XEN_NETDEV_LOOPBACK=y -CONFIG_XEN_PCIDEV_BACKEND=y -CONFIG_XEN_PCIDEV_BACKEND_VPCI=y -# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set -# CONFIG_XEN_PCIDEV_BACKEND_SLOT is not set -# CONFIG_XEN_PCIDEV_BE_DEBUG is not set -CONFIG_XEN_TPMDEV_BACKEND=y -CONFIG_XEN_BLKDEV_FRONTEND=y -CONFIG_XEN_NETDEV_FRONTEND=y -CONFIG_XEN_FRAMEBUFFER=y -CONFIG_XEN_KEYBOARD=y -CONFIG_XEN_SCRUB_PAGES=y -CONFIG_XEN_DISABLE_SERIAL=y -CONFIG_XEN_SYSFS=y -CONFIG_XEN_COMPAT_030002_AND_LATER=y -# CONFIG_XEN_COMPAT_LATEST_ONLY is not set -CONFIG_XEN_COMPAT_030002=y -CONFIG_HAVE_ARCH_ALLOC_SKB=y -CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y -CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y -CONFIG_NO_IDLE_HZ=y -CONFIG_XEN_UTIL=y -CONFIG_XEN_BALLOON=y -CONFIG_XEN_DEVMEM=y -CONFIG_XEN_SKBUFF=y -CONFIG_XEN_REBOOT=y -CONFIG_XEN_SMPBOOT=y - -# -# Library routines -# -CONFIG_CRC_CCITT=m -CONFIG_CRC16=m -CONFIG_CRC32=y -CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=m -CONFIG_ZLIB_DEFLATE=m -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m -CONFIG_PLIST=y -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_X86_SMP=y -CONFIG_X86_BIOS_REBOOT=y -CONFIG_X86_TRAMPOLINE=y -CONFIG_X86_NO_TSS=y -CONFIG_X86_NO_IDT=y -CONFIG_KTIME_SCALAR=y diff --git a/source/base-extra/kernel-xenU/linux-2.6.19-x86_64_config.patch0 b/source/base-extra/kernel-xenU/linux-2.6.19-x86_64_config.patch0 deleted file mode 100644 index 72afc43..0000000 --- a/source/base-extra/kernel-xenU/linux-2.6.19-x86_64_config.patch0 +++ /dev/null @@ -1,520 +0,0 @@ ---- .config.old 2007-02-21 09:18:47.000000000 +0000 -+++ .config 2007-02-21 09:18:41.000000000 +0000 -@@ -1,19 +1,26 @@ - # - # Automatically generated make config: don't edit - # Linux kernel version: 2.6.19.4 --# Wed Feb 21 09:16:42 2007 -+# Wed Feb 21 09:18:41 2007 - # --CONFIG_X86_32=y -+CONFIG_X86_64=y -+CONFIG_64BIT=y -+CONFIG_X86=y -+CONFIG_ZONE_DMA32=y - CONFIG_LOCKDEP_SUPPORT=y --CONFIG_STACKTRACE_SUPPORT=y - CONFIG_SEMAPHORE_SLEEPERS=y --CONFIG_X86=y - CONFIG_MMU=y -+CONFIG_RWSEM_GENERIC_SPINLOCK=y -+CONFIG_GENERIC_HWEIGHT=y -+CONFIG_GENERIC_CALIBRATE_DELAY=y -+CONFIG_X86_CMPXCHG=y -+CONFIG_EARLY_PRINTK=y - CONFIG_GENERIC_ISA_DMA=y - CONFIG_GENERIC_IOMAP=y --CONFIG_GENERIC_HWEIGHT=y - CONFIG_ARCH_MAY_HAVE_PC_FDC=y -+CONFIG_ARCH_POPULATES_NODE_MAP=y - CONFIG_DMI=y -+CONFIG_AUDIT_ARCH=y - CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" - - # -@@ -99,76 +106,28 @@ - # - # Processor type and features - # -+CONFIG_X86_PC=y -+# CONFIG_X86_VSMP is not set -+CONFIG_MK8=y -+# CONFIG_MPSC is not set -+# CONFIG_GENERIC_CPU is not set -+CONFIG_X86_64_XEN=y -+CONFIG_X86_NO_TSS=y -+CONFIG_X86_NO_IDT=y -+CONFIG_X86_L1_CACHE_BYTES=64 -+CONFIG_X86_L1_CACHE_SHIFT=6 -+CONFIG_X86_INTERNODE_CACHE_BYTES=64 -+CONFIG_X86_GOOD_APIC=y -+# CONFIG_MICROCODE is not set -+# CONFIG_X86_MSR is not set -+CONFIG_X86_CPUID=m -+CONFIG_X86_XEN_GENAPIC=y - CONFIG_SMP=y --# CONFIG_X86_PC is not set --CONFIG_X86_XEN=y --# CONFIG_X86_ELAN is not set --# CONFIG_X86_VOYAGER is not set --# CONFIG_X86_NUMAQ is not set --# CONFIG_X86_SUMMIT is not set --# CONFIG_X86_BIGSMP is not set --# CONFIG_X86_VISWS is not set --# CONFIG_X86_GENERICARCH is not set --# CONFIG_X86_ES7000 is not set --# CONFIG_M386 is not set --# CONFIG_M486 is not set --CONFIG_M586=y --# CONFIG_M586TSC is not set --# CONFIG_M586MMX is not set --# CONFIG_M686 is not set --# CONFIG_MPENTIUMII is not set --# CONFIG_MPENTIUMIII is not set --# CONFIG_MPENTIUMM is not set --# CONFIG_MPENTIUM4 is not set --# CONFIG_MK6 is not set --# CONFIG_MK7 is not set --# CONFIG_MK8 is not set --# CONFIG_MCRUSOE is not set --# CONFIG_MEFFICEON is not set --# CONFIG_MWINCHIPC6 is not set --# CONFIG_MWINCHIP2 is not set --# CONFIG_MWINCHIP3D is not set --# CONFIG_MGEODEGX1 is not set --# CONFIG_MGEODE_LX is not set --# CONFIG_MCYRIXIII is not set --# CONFIG_MVIAC3_2 is not set --CONFIG_X86_GENERIC=y --CONFIG_X86_CMPXCHG=y --CONFIG_X86_XADD=y --CONFIG_X86_L1_CACHE_SHIFT=7 --CONFIG_RWSEM_XCHGADD_ALGORITHM=y --CONFIG_GENERIC_CALIBRATE_DELAY=y --CONFIG_X86_PPRO_FENCE=y --CONFIG_X86_WP_WORKS_OK=y --CONFIG_X86_INVLPG=y --CONFIG_X86_BSWAP=y --CONFIG_X86_POPAD_OK=y --CONFIG_X86_CMPXCHG64=y --CONFIG_X86_ALIGNMENT_16=y --CONFIG_X86_INTEL_USERCOPY=y --CONFIG_NR_CPUS=8 - CONFIG_PREEMPT_NONE=y - # CONFIG_PREEMPT_VOLUNTARY is not set - # CONFIG_PREEMPT is not set - CONFIG_PREEMPT_BKL=y --CONFIG_VM86=y --CONFIG_TOSHIBA=m --CONFIG_I8K=m --CONFIG_X86_REBOOTFIXUPS=y --CONFIG_X86_CPUID=m --CONFIG_SWIOTLB=y -- --# --# Firmware Drivers --# --CONFIG_DELL_RBU=m --CONFIG_DCDBAS=m --# CONFIG_NOHIGHMEM is not set --CONFIG_HIGHMEM4G=y --# CONFIG_HIGHMEM64G is not set --CONFIG_PAGE_OFFSET=0xC0000000 --CONFIG_HIGHMEM=y --CONFIG_ARCH_POPULATES_NODE_MAP=y -+CONFIG_ARCH_FLATMEM_ENABLE=y - CONFIG_SELECT_MEMORY_MODEL=y - CONFIG_FLATMEM_MANUAL=y - # CONFIG_DISCONTIGMEM_MANUAL is not set -@@ -177,38 +136,36 @@ - CONFIG_FLAT_NODE_MEM_MAP=y - # CONFIG_SPARSEMEM_STATIC is not set - CONFIG_SPLIT_PTLOCK_CPUS=4096 --# CONFIG_RESOURCES_64BIT is not set --# CONFIG_REGPARM is not set -+CONFIG_RESOURCES_64BIT=y -+CONFIG_NR_CPUS=8 -+CONFIG_HOTPLUG_CPU=y -+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -+# CONFIG_CALGARY_IOMMU is not set -+CONFIG_SWIOTLB=y -+# CONFIG_CRASH_DUMP is not set -+CONFIG_PHYSICAL_START=0x200000 - CONFIG_SECCOMP=y -+# CONFIG_CC_STACKPROTECTOR is not set - # CONFIG_HZ_100 is not set - # CONFIG_HZ_250 is not set - CONFIG_HZ_1000=y - CONFIG_HZ=1000 --# CONFIG_CRASH_DUMP is not set --CONFIG_PHYSICAL_START=0x100000 --CONFIG_HOTPLUG_CPU=y --CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y --# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set --# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -+# CONFIG_REORDER is not set -+CONFIG_GENERIC_HARDIRQS=y -+CONFIG_GENERIC_IRQ_PROBE=y -+CONFIG_ISA_DMA_API=y -+CONFIG_GENERIC_PENDING_IRQ=y - - # --# Bus options (PCI, PCMCIA, EISA, MCA, ISA) -+# Bus options (PCI etc.) - # - CONFIG_PCI=y --# CONFIG_PCI_GOBIOS is not set --# CONFIG_PCI_GOMMCONFIG is not set --# CONFIG_PCI_GODIRECT is not set --# CONFIG_PCI_GOXEN_FE is not set --CONFIG_PCI_GOANY=y - CONFIG_PCI_DIRECT=y - CONFIG_XEN_PCIDEV_FRONTEND=y - # CONFIG_XEN_PCIDEV_FE_DEBUG is not set - CONFIG_PCIEPORTBUS=y - CONFIG_HOTPLUG_PCI_PCIE=m - # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set --CONFIG_ISA_DMA_API=y --CONFIG_SCx200=m --CONFIG_K8_NB=y - - # - # PCCARD (PCMCIA/CardBus) support -@@ -243,11 +200,14 @@ - # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set - - # --# Executable file formats -+# Executable file formats / Emulations - # - CONFIG_BINFMT_ELF=y --CONFIG_BINFMT_AOUT=m - CONFIG_BINFMT_MISC=m -+CONFIG_IA32_EMULATION=y -+# CONFIG_IA32_AOUT is not set -+CONFIG_COMPAT=y -+CONFIG_SYSVIPC_COMPAT=y - - # - # Networking -@@ -634,7 +594,6 @@ - CONFIG_BAYCOM_SER_FDX=m - CONFIG_BAYCOM_SER_HDX=m - CONFIG_BAYCOM_PAR=m --CONFIG_BAYCOM_EPP=m - CONFIG_YAM=m - CONFIG_IRDA=m - -@@ -692,7 +651,6 @@ - CONFIG_SIGMATEL_FIR=m - CONFIG_NSC_FIR=m - CONFIG_WINBOND_FIR=m --CONFIG_TOSHIBA_FIR=m - CONFIG_SMC_IRCC_FIR=m - CONFIG_ALI_FIR=m - CONFIG_VLSI_FIR=m -@@ -816,7 +774,6 @@ - CONFIG_MTD_NETSC520=m - CONFIG_MTD_TS5500=m - CONFIG_MTD_SBC_GXX=m --CONFIG_MTD_SCx200_DOCFLASH=m - CONFIG_MTD_AMD76XROM=m - CONFIG_MTD_ICHXROM=m - CONFIG_MTD_SCB2_FLASH=m -@@ -909,7 +866,6 @@ - # - CONFIG_PARIDE_ATEN=m - CONFIG_PARIDE_BPCK=m --CONFIG_PARIDE_BPCK6=m - CONFIG_PARIDE_COMM=m - CONFIG_PARIDE_DSTR=m - CONFIG_PARIDE_FIT2=m -@@ -997,7 +953,6 @@ - CONFIG_BLK_DEV_CY82C693=y - CONFIG_BLK_DEV_CS5520=y - CONFIG_BLK_DEV_CS5530=y --CONFIG_BLK_DEV_CS5535=m - CONFIG_BLK_DEV_HPT34X=y - # CONFIG_HPT34X_AUTODMA is not set - CONFIG_BLK_DEV_HPT366=y -@@ -1079,8 +1034,6 @@ - CONFIG_AIC79XX_DEBUG_MASK=0 - # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set - # CONFIG_SCSI_AIC94XX is not set --CONFIG_SCSI_DPT_I2O=m --CONFIG_SCSI_ADVANSYS=m - # CONFIG_SCSI_ARCMSR is not set - # CONFIG_MEGARAID_NEWGEN is not set - CONFIG_MEGARAID_LEGACY=m -@@ -1115,15 +1068,12 @@ - CONFIG_SCSI_LPFC=m - CONFIG_SCSI_DC395x=m - CONFIG_SCSI_DC390T=m --CONFIG_SCSI_NSP32=m - CONFIG_SCSI_DEBUG=m - - # - # PCMCIA SCSI adapter support - # --CONFIG_PCMCIA_AHA152X=m - CONFIG_PCMCIA_FDOMAIN=m --CONFIG_PCMCIA_NINJA_SCSI=m - CONFIG_PCMCIA_QLOGIC=m - CONFIG_PCMCIA_SYM53C500=m - -@@ -1154,7 +1104,6 @@ - CONFIG_PATA_CMD64X=m - CONFIG_PATA_CS5520=m - CONFIG_PATA_CS5530=m --CONFIG_PATA_CS5535=m - # CONFIG_PATA_CYPRESS is not set - CONFIG_PATA_EFAR=m - CONFIG_ATA_GENERIC=m -@@ -1239,7 +1188,6 @@ - # - CONFIG_IEEE1394_VIDEO1394=m - CONFIG_IEEE1394_SBP2=m --# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set - CONFIG_IEEE1394_ETH1394=m - CONFIG_IEEE1394_DV1394=m - CONFIG_IEEE1394_RAWIO=m -@@ -1250,6 +1198,7 @@ - CONFIG_I2O=m - CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y - CONFIG_I2O_EXT_ADAPTEC=y -+CONFIG_I2O_EXT_ADAPTEC_DMA64=y - CONFIG_I2O_CONFIG=m - CONFIG_I2O_CONFIG_OLD_IOCTL=y - CONFIG_I2O_BUS=m -@@ -1351,7 +1300,6 @@ - CONFIG_EPIC100=m - CONFIG_SUNDANCE=m - # CONFIG_SUNDANCE_MMIO is not set --CONFIG_TLAN=m - CONFIG_VIA_RHINE=m - CONFIG_VIA_RHINE_MMIO=y - # CONFIG_VIA_RHINE_NAPI is not set -@@ -1399,7 +1347,6 @@ - # - CONFIG_TR=y - CONFIG_IBMOL=m --CONFIG_IBMLS=m - CONFIG_3C359=m - CONFIG_TMS380TR=m - CONFIG_TMSPCI=m -@@ -1488,7 +1435,6 @@ - CONFIG_PCMCIA_XIRC2PS=m - CONFIG_PCMCIA_AXNET=m - CONFIG_ARCNET_COM20020_CS=m --CONFIG_PCMCIA_IBMTR=m - - # - # Wan interfaces -@@ -1542,9 +1488,6 @@ - CONFIG_ATM_FIRESTREAM=m - CONFIG_ATM_ZATM=m - # CONFIG_ATM_ZATM_DEBUG is not set --CONFIG_ATM_NICSTAR=m --# CONFIG_ATM_NICSTAR_USE_SUNI is not set --# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set - CONFIG_ATM_IDT77252=m - # CONFIG_ATM_IDT77252_DEBUG is not set - # CONFIG_ATM_IDT77252_RCV_ALL is not set -@@ -1553,8 +1496,6 @@ - # CONFIG_ATM_AMBASSADOR_DEBUG is not set - CONFIG_ATM_HORIZON=m - # CONFIG_ATM_HORIZON_DEBUG is not set --CONFIG_ATM_IA=m --# CONFIG_ATM_IA_DEBUG is not set - CONFIG_ATM_FORE200E_MAYBE=m - # CONFIG_ATM_FORE200E_PCA is not set - CONFIG_ATM_HE=m -@@ -1712,7 +1653,6 @@ - # CONFIG_TOUCHSCREEN_TOUCHWIN is not set - CONFIG_INPUT_MISC=y - CONFIG_INPUT_PCSPKR=m --# CONFIG_INPUT_WISTRON_BTNS is not set - CONFIG_INPUT_UINPUT=m - - # -@@ -1819,7 +1759,6 @@ - CONFIG_I8XX_TCO=m - # CONFIG_ITCO_WDT is not set - CONFIG_SC1200_WDT=m --CONFIG_SCx200_WDT=m - CONFIG_60XX_WDT=m - CONFIG_SBC8360_WDT=m - CONFIG_CPU5_WDT=m -@@ -1846,28 +1785,20 @@ - CONFIG_HW_RANDOM_INTEL=y - CONFIG_HW_RANDOM_AMD=y - CONFIG_HW_RANDOM_GEODE=y --CONFIG_HW_RANDOM_VIA=y - CONFIG_NVRAM=m - CONFIG_RTC=y - CONFIG_DTLK=m - CONFIG_R3964=m - CONFIG_APPLICOM=m --CONFIG_SONYPI=m - - # - # Ftape, the floppy tape device driver - # - CONFIG_AGP=m --CONFIG_AGP_ALI=m --CONFIG_AGP_ATI=m --CONFIG_AGP_AMD=m --CONFIG_AGP_AMD64=m -+# CONFIG_AGP_AMD64 is not set - CONFIG_AGP_INTEL=m --CONFIG_AGP_NVIDIA=m - CONFIG_AGP_SIS=m --CONFIG_AGP_SWORKS=m - CONFIG_AGP_VIA=m --CONFIG_AGP_EFFICEON=m - CONFIG_DRM=m - CONFIG_DRM_TDFX=m - CONFIG_DRM_R128=m -@@ -1887,10 +1818,8 @@ - CONFIG_CARDMAN_4000=m - CONFIG_CARDMAN_4040=m - CONFIG_MWAVE=m --CONFIG_SCx200_GPIO=m - CONFIG_PC8736x_GPIO=m - CONFIG_NSC_GPIO=m --CONFIG_CS5535_GPIO=m - # CONFIG_RAW_DRIVER is not set - CONFIG_HANGCHECK_TIMER=m - -@@ -1934,10 +1863,6 @@ - CONFIG_I2C_PARPORT_LIGHT=m - CONFIG_I2C_PROSAVAGE=m - CONFIG_I2C_SAVAGE4=m --CONFIG_SCx200_I2C=m --CONFIG_SCx200_I2C_SCL=12 --CONFIG_SCx200_I2C_SDA=13 --CONFIG_SCx200_ACB=m - CONFIG_I2C_SIS5595=m - CONFIG_I2C_SIS630=m - CONFIG_I2C_SIS96X=m -@@ -2109,7 +2034,6 @@ - CONFIG_VIDEO_ZORAN_LML33=m - CONFIG_VIDEO_ZORAN_LML33R10=m - CONFIG_VIDEO_ZORAN_AVS6EYES=m --CONFIG_VIDEO_MEYE=m - CONFIG_VIDEO_SAA7134=m - CONFIG_VIDEO_SAA7134_ALSA=m - CONFIG_VIDEO_SAA7134_DVB=m -@@ -2315,9 +2239,6 @@ - # CONFIG_FB_S1D13XXX is not set - # CONFIG_FB_NVIDIA is not set - # CONFIG_FB_RIVA is not set --CONFIG_FB_I810=m --CONFIG_FB_I810_GTF=y --# CONFIG_FB_I810_I2C is not set - CONFIG_FB_INTEL=m - # CONFIG_FB_INTEL_DEBUG is not set - CONFIG_FB_INTEL_I2C=y -@@ -2343,7 +2264,6 @@ - # CONFIG_FB_KYRO is not set - # CONFIG_FB_3DFX is not set - # CONFIG_FB_VOODOO1 is not set --# CONFIG_FB_CYBLA is not set - # CONFIG_FB_TRIDENT is not set - # CONFIG_FB_GEODE is not set - # CONFIG_FB_VIRTUAL is not set -@@ -2438,7 +2358,6 @@ - CONFIG_SND_CS4281=m - CONFIG_SND_CS46XX=m - CONFIG_SND_CS46XX_NEW_DSP=y --CONFIG_SND_CS5535AUDIO=m - CONFIG_SND_DARLA20=m - CONFIG_SND_GINA20=m - CONFIG_SND_LAYLA20=m -@@ -2758,7 +2677,6 @@ - # - # LED drivers - # --# CONFIG_LEDS_NET48XX is not set - - # - # LED Triggers -@@ -2832,6 +2750,12 @@ - # - - # -+# Firmware Drivers -+# -+CONFIG_DELL_RBU=m -+CONFIG_DCDBAS=m -+ -+# - # File systems - # - CONFIG_EXT2_FS=y -@@ -3082,11 +3006,8 @@ - CONFIG_UNUSED_SYMBOLS=y - # CONFIG_DEBUG_KERNEL is not set - CONFIG_LOG_BUF_SHIFT=15 --CONFIG_DEBUG_BUGVERBOSE=y - # CONFIG_DEBUG_FS is not set --# CONFIG_UNWIND_INFO is not set - # CONFIG_HEADERS_CHECK is not set --CONFIG_EARLY_PRINTK=y - - # - # Security options -@@ -3122,10 +3043,10 @@ - CONFIG_CRYPTO_BLOWFISH=m - CONFIG_CRYPTO_TWOFISH=m - CONFIG_CRYPTO_TWOFISH_COMMON=m --# CONFIG_CRYPTO_TWOFISH_586 is not set -+# CONFIG_CRYPTO_TWOFISH_X86_64 is not set - CONFIG_CRYPTO_SERPENT=m - CONFIG_CRYPTO_AES=m --CONFIG_CRYPTO_AES_586=m -+# CONFIG_CRYPTO_AES_X86_64 is not set - CONFIG_CRYPTO_CAST5=m - CONFIG_CRYPTO_CAST6=m - CONFIG_CRYPTO_TEA=m -@@ -3140,9 +3061,6 @@ - # - # Hardware crypto devices - # --CONFIG_CRYPTO_DEV_PADLOCK=m --CONFIG_CRYPTO_DEV_PADLOCK_AES=m --CONFIG_CRYPTO_DEV_PADLOCK_SHA=m - CONFIG_XEN=y - CONFIG_XEN_INTERFACE_VERSION=0x00030203 - -@@ -3155,7 +3073,7 @@ - CONFIG_XEN_XENBUS_DEV=y - CONFIG_XEN_BACKEND=y - CONFIG_XEN_BLKDEV_BACKEND=y --CONFIG_XEN_BLKDEV_TAP=y -+# CONFIG_XEN_BLKDEV_TAP is not set - CONFIG_XEN_NETDEV_BACKEND=y - # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set - CONFIG_XEN_NETDEV_LOOPBACK=y -@@ -3164,7 +3082,7 @@ - # CONFIG_XEN_PCIDEV_BACKEND_PASS is not set - # CONFIG_XEN_PCIDEV_BACKEND_SLOT is not set - # CONFIG_XEN_PCIDEV_BE_DEBUG is not set --CONFIG_XEN_TPMDEV_BACKEND=y -+# CONFIG_XEN_TPMDEV_BACKEND is not set - CONFIG_XEN_BLKDEV_FRONTEND=y - CONFIG_XEN_NETDEV_FRONTEND=y - CONFIG_XEN_FRAMEBUFFER=y -@@ -3200,12 +3118,3 @@ - CONFIG_TEXTSEARCH_BM=m - CONFIG_TEXTSEARCH_FSM=m - CONFIG_PLIST=y --CONFIG_GENERIC_HARDIRQS=y --CONFIG_GENERIC_IRQ_PROBE=y --CONFIG_GENERIC_PENDING_IRQ=y --CONFIG_X86_SMP=y --CONFIG_X86_BIOS_REBOOT=y --CONFIG_X86_TRAMPOLINE=y --CONFIG_X86_NO_TSS=y --CONFIG_X86_NO_IDT=y --CONFIG_KTIME_SCALAR=y From vmiklos at frugalware.org Fri Jun 6 16:46:47 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 6 16:46:48 2008 Subject: [Frugalware-git] frugalware-current: elinks-0.11.3-6-i686 Message-ID: <20080606144647.51B851190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3994f339cfc96e8cc54254ecb9f41e7de85c5ffd commit 3994f339cfc96e8cc54254ecb9f41e7de85c5ffd Author: Miklos Vajna Date: Fri Jun 6 16:46:14 2008 +0200 elinks-0.11.3-6-i686 - rebuilt with newer gpm diff --git a/source/network/elinks/FrugalBuild b/source/network/elinks/FrugalBuild index dad02df..b74d0d2 100644 --- a/source/network/elinks/FrugalBuild +++ b/source/network/elinks/FrugalBuild @@ -4,10 +4,10 @@ pkgname=elinks pkgver=0.11.3 -pkgrel=5 +pkgrel=6 pkgdesc="An advanced and well-established feature-rich text mode web browser" url="http://elinks.or.cz/" -depends=('openssl>=0.9.8-12' 'glibc>=2.7-3' 'gpm>=1.20.1-14' 'zlib>=1.2.3-5' \ +depends=('openssl>=0.9.8-12' 'glibc>=2.7-3' 'gpm>=1.20.4' 'zlib>=1.2.3-5' \ 'bzip2>=1.0.4-2' 'libidn>=0.5.20-3' 'expat>=2.0.1-2' 'ncurses>=5.6-3' 'perl>=5.10.0-4') #makedepends=('samba') # smb support is disabled by upstream (security reasons) groups=('network' 'chroot-core') From vmiklos at frugalware.org Fri Jun 6 16:52:03 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 6 16:52:05 2008 Subject: [Frugalware-git] frugalware-current: star-1.5a89-2-i686 Message-ID: <20080606145203.D4FC71190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=022ca74bf5e86c3499bab9df7195005a87bc9f0f commit 022ca74bf5e86c3499bab9df7195005a87bc9f0f Author: Miklos Vajna Date: Fri Jun 6 16:51:52 2008 +0200 star-1.5a89-2-i686 - fixup for the etc test diff --git a/source/apps-extra/star/FrugalBuild b/source/apps-extra/star/FrugalBuild index 80919e5..d938af0 100644 --- a/source/apps-extra/star/FrugalBuild +++ b/source/apps-extra/star/FrugalBuild @@ -4,7 +4,7 @@ pkgname=star pkgver=1.5a89 -pkgrel=1 +pkgrel=2 pkgdesc="very fast and Posix 1003.1 compliant tar" url="http://cdrecord.berlios.de/old/private/star.html" license="CDDL" @@ -23,4 +23,5 @@ build() Frm usr/include/{align,avoffset}.h Frm usr/lib/lib{deflt,schily}.a Frm usr/bin/tar + Fmv /usr/etc /etc } From vmiklos at frugalware.org Fri Jun 6 16:57:33 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 6 16:57:34 2008 Subject: [Frugalware-git] frugalware-current: splashy-creator-2.0-1-i686 Message-ID: <20080606145733.1ECF61190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=907a355ed4a5a119646e253be6823b2d3ac4c570 commit 907a355ed4a5a119646e253be6823b2d3ac4c570 Author: Miklos Vajna Date: Fri Jun 6 16:57:19 2008 +0200 splashy-creator-2.0-1-i686 - new package from jedifox diff --git a/source/xapps-extra/splashy-creator/FrugalBuild b/source/xapps-extra/splashy-creator/FrugalBuild new file mode 100644 index 0000000..97f6c19 --- /dev/null +++ b/source/xapps-extra/splashy-creator/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.01 SBU +# Maintainer: VMiklos +# Contributor: jedifox + +pkgname=splashy-creator +pkgver=2.0 +pkgrel=1 +pkgdesc="Creator manager to create custom Splashy theme" +url="http://www.nanolx.org" +depends=('splashy' 'sed' 'pygtk>=2.4' 'python>=2.4') +options=('scriptlet') +groups=('xapps-extra') +archs=('i686') +up2date="lynx -dump http://www.nanolx.org/free/ |Flasttar" +source=($url/free/$pkgname-$pkgver.tar.bz2) +sha1sums=('b930f3f91abbb89cbd280a0e7994309d21c96fee') +_F_cd_path="$pkgname" From vmiklos at frugalware.org Fri Jun 6 18:15:52 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 6 18:15:53 2008 Subject: [Frugalware-git] frugalware-current: busybox-1.10.3-1-i686 Message-ID: <20080606161552.B18411190ACA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=78201fe073c5d0e20a0373b8f7bc1ff2e8a523a6 commit 78201fe073c5d0e20a0373b8f7bc1ff2e8a523a6 Author: Miklos Vajna Date: Fri Jun 6 18:07:00 2008 +0200 busybox-1.10.3-1-i686 - version bump diff --git a/source/apps-extra/busybox/FrugalBuild b/source/apps-extra/busybox/FrugalBuild index 3c30d93..c404b24 100644 --- a/source/apps-extra/busybox/FrugalBuild +++ b/source/apps-extra/busybox/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=busybox -pkgver=1.10.2 +pkgver=1.10.3 pkgrel=1 pkgdesc="Utilities for rescue and embedded systems." url="http://www.busybox.net/" @@ -12,7 +12,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump 'http://busybox.net/'|grep '(stable)'|sed 's/[^,]*BusyBox \([0-9.]*\) (.*/\1/'|Fsort|tail -n 1" source=(http://www.busybox.net/downloads/busybox-$pkgver.tar.bz2 config) # NOTE: we can't use signatures() here as the author signes only the checksums -sha1sums=('48a7eaf931522c9e555af3cf46b5a19de4bed17b' \ +sha1sums=('2da07929319a57140b806a696df8c9c412ce157c' \ 'c8669745a7becb54c759fc4d9e63e43f30d9b1bf') build() From vmiklos at frugalware.org Fri Jun 6 18:15:52 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 6 18:15:54 2008 Subject: [Frugalware-git] frugalware-current: bochs-2.3.7-1-i686 Message-ID: <20080606161552.BE37E1190ACB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d38223d345cb64122607e4ea1cedc87d10d9dedf commit d38223d345cb64122607e4ea1cedc87d10d9dedf Author: Miklos Vajna Date: Fri Jun 6 18:15:44 2008 +0200 bochs-2.3.7-1-i686 - version bump diff --git a/source/xapps-extra/bochs/FrugalBuild b/source/xapps-extra/bochs/FrugalBuild index 45e8f98..e3d7d1a 100644 --- a/source/xapps-extra/bochs/FrugalBuild +++ b/source/xapps-extra/bochs/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=bochs -pkgver=2.3.6 +pkgver=2.3.7 pkgrel=1 pkgdesc="A highly portable open source IA-32 (x86) PC emulator." depends=('sdl' 'wxgtk>=2.8.7' 'libx11' 'libxpm') @@ -13,7 +13,7 @@ options=('scriptlet') Finclude sourceforge source=($source build-fix.patch) up2date="lynx -dump http://bochs.sourceforge.net/|grep -1 Current|sed -n 's/.*s \(.*\)/\1/;3 p'" -sha1sums=('3675b1c5a324854b998bb7518c7279db2fecd8c3' \ +sha1sums=('e687c697a8be8396ae75106d0cd6149bd52ca67d' \ '3e37675ce43d953fd801b07b759c4bfd01916db3') [ "$CARCH" == "x86_64" ] && Fconfopts="$Fconfopts --enable-sse=2 --enable-3dnow --enable-x86-64" From vmiklos at frugalware.org Fri Jun 6 18:15:52 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 6 18:15:55 2008 Subject: [Frugalware-git] frugalware-current: valgrind-3.3.1-1-i686 Message-ID: <20080606161552.923711190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b5e7664b7fb7eed63cffa1155f690b8954756089 commit b5e7664b7fb7eed63cffa1155f690b8954756089 Author: Miklos Vajna Date: Fri Jun 6 18:06:12 2008 +0200 valgrind-3.3.1-1-i686 - version bump diff --git a/source/devel-extra/valgrind/FrugalBuild b/source/devel-extra/valgrind/FrugalBuild index 7419bb2..626f3dd 100644 --- a/source/devel-extra/valgrind/FrugalBuild +++ b/source/devel-extra/valgrind/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=valgrind -pkgver=3.3.0 +pkgver=3.3.1 pkgrel=1 pkgdesc="Tools for debugging and profiling Linux programs." url="http://valgrind.org/" @@ -11,7 +11,7 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="Flasttar $url/downloads/current.html" source=($url/downloads/$pkgname-$pkgver.tar.bz2) -sha1sums=('e2d0f3bcb4e6dd4638ceeddc9da8603b32efdf11') +sha1sums=('3a64ee5f6439815fa6c5200dcfd0399f9dc83348') if [ "$CARCH" == "x86_64" ]; then Fconfopts="$Fconfopts --enable-only64bit" From devil505linux at gmail.com Fri Jun 6 18:55:38 2008 From: devil505linux at gmail.com (Devil505) Date: Fri Jun 6 18:55:40 2008 Subject: [Frugalware-git] frugalware-current: gecko-mediaplayer-0.6.2-1-i686 Message-ID: <20080606165538.8B4CB1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b0318187bd463715cfda4c3440dec48fa0354f94 commit b0318187bd463715cfda4c3440dec48fa0354f94 Author: Devil505 Date: Fri Jun 6 18:50:09 2008 +0200 gecko-mediaplayer-0.6.2-1-i686 * new package diff --git a/source/gnome-extra/gecko-mediaplayer/FrugalBuild b/source/gnome-extra/gecko-mediaplayer/FrugalBuild new file mode 100644 index 0000000..45c3f4e --- /dev/null +++ b/source/gnome-extra/gecko-mediaplayer/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.11 SBU +# Maintainer: Devil505 + +pkgname=gecko-mediaplayer +pkgver=0.6.2 +pkgrel=1 +pkgdesc="browser plugin that uses GNOME MPlayer to play media in a browser (Mozilla, Firefox, Opera, etc.)." +url="http://dekorte.homeip.net/download/gecko-mediaplayer/" +depends=('gnome-mplayer>=0.6.2' 'dbus-glib' 'gconf' 'libstdc++') +makedepends=('xulrunner' 'pkgconfig') +Finclude googlecode +_F_gnome_schemas=('/etc/gconf/schemas/gecko-mediaplayer.schemas') +Finclude gnome-scriptlet +groups=(gnome-extra) +archs=('i686') +sha1sums=('3e5ea272804a96c35a15c0e8407cb02b0f3092ad') + +# optimization OK From vmiklos at frugalware.org Fri Jun 6 18:57:20 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 6 18:57:21 2008 Subject: [Frugalware-git] homepage-ng: FSA463-openssl Message-ID: <20080606165720.ACB5B1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=5d652642228516378fa8171968ec2c990ba475ee commit 5d652642228516378fa8171968ec2c990ba475ee Author: Miklos Vajna Date: Fri Jun 6 18:57:14 2008 +0200 FSA463-openssl diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 04d0f33..4610382 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,20 @@ + 463 + 2008-06-06 + openssl + 0.9.8-11 + 0.9.8-12kalgan1 + http://bugs.frugalware.org/task/3114 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0891 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1672 + Two vulnerabilities have been reported in OpenSSL, which can be exploited by malicious people to cause a DoS (Denial of Service). + 1) A double-free error in the handling of server name extension data if "server_name" set to 0x00 can be exploited to crash a server application using OpenSSL by sending a specially crafted TLS 1.0 Client Hello packet. + Successful exploitation requires that OpenSSL is compiled using the TLS server name extensions. + 2) A NULL pointer dereference error can be exploited by a malicious server to crash a client application when the "Server Key exchange message" is omitted from a TLS handshake and anonymous Diffie-Hellman key exchange is used. + + 462 2008-05-26 libxslt From vmiklos at frugalware.org Fri Jun 6 19:06:56 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 6 19:06:57 2008 Subject: [Frugalware-git] homepage-ng: FSA464-horde-webmail Message-ID: <20080606170656.CE2FC1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=97145cba4ac8ab380e146cf9654c7fb6422ce38a commit 97145cba4ac8ab380e146cf9654c7fb6422ce38a Author: Miklos Vajna Date: Fri Jun 6 19:06:52 2008 +0200 FSA464-horde-webmail diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 4610382..f0622f6 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,18 @@ + 464 + 2008-06-06 + horde-webmail + 1.0.6-1kalgan1 + 1.1-1kalgan1 + http://bugs.frugalware.org/task/3120 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-6018 + Secunia Research has discovered a vulnerability in IMP Webmail Client and Horde Groupware Webmail Edition, which can be exploited by malicious people to bypass certain security restrictions and manipulate data. + The HTML filter does not filter out frame and frameset HTML elements. Additionally, the application allows users to perform certain actions via HTTP requests without performing any validity checks to verify the request. This can be exploited to (a) delete an arbitrary number of e-mail messages by referencing their numeric IDs and (b) purge deleted mails, when the victim opens a malicious HTML mail. + Successful exploitation requires that the victim opens the HTML part of a malicious message. + + 463 2008-06-06 openssl From vmiklos at frugalware.org Fri Jun 6 22:12:55 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 6 22:12:57 2008 Subject: [Frugalware-git] frugalware-current: mysql-connector-net-5.1.6-1-i686 *new package Message-ID: <20080606201255.10CED1190ACA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d57774838c24a882047ed6cb1f868e826aec92f9 commit d57774838c24a882047ed6cb1f868e826aec92f9 Author: bouleetbil Date: Thu Jun 5 00:23:39 2008 +0200 mysql-connector-net-5.1.6-1-i686 *new package diff --git a/source/devel-extra/mysql-connector-net/FrugalBuild b/source/devel-extra/mysql-connector-net/FrugalBuild new file mode 100644 index 0000000..b10c6c1 --- /dev/null +++ b/source/devel-extra/mysql-connector-net/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: 0.01 SBU +# Maintainer: bouleetbil + +pkgname=mysql-connector-net +pkgver=5.1.6 +pkgrel=1 +pkgdesc="MySql ADO.NET connector" +url="http://www.mysql.com/" +depends=(mono) +makedepends=('nant') +groups=('devel-extra') +archs=('i686') +up2date="lynx -dump -source http://dev.mysql.com/|grep 'MySQL Connector/NET' | grep 'GA' | \ + cut -d'(' -f2 | cut -d')' -f1 | sed 's/GA //'" +mirror="http://mysql.mirrors.crysys.hit.bme.hu/" +source=($mirror/Downloads/Connector-Net/$pkgname-$pkgver-src.zip) +Finclude mono +_F_cd_path="./" +sha1sums=('2102bf549128e2a8646c64ef3e3b7b743b4d62d4') + +build() { + Fmonoexport + nant -buildfile:Client.build mono-2.0 || Fdie + gacutil -i Driver/bin/mono-2.0/release/MySql.Data.dll -f -package $pkgname -root $Fdestdir/usr/lib || Fdie + Fmonocleanup +} From vmiklos at frugalware.org Fri Jun 6 22:12:54 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 6 22:12:58 2008 Subject: [Frugalware-git] frugalware-current: mono.sh: export XDG_CONFIG_HOME in Fmonoexport() as well Message-ID: <20080606201254.E91F21190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b3a0c66bee1a1647c337e4e52f5ee2a9d013dc69 commit b3a0c66bee1a1647c337e4e52f5ee2a9d013dc69 Author: Miklos Vajna Date: Fri Jun 6 22:00:19 2008 +0200 mono.sh: export XDG_CONFIG_HOME in Fmonoexport() as well diff --git a/source/include/mono.sh b/source/include/mono.sh index 55cec67..b4fb06b 100644 --- a/source/include/mono.sh +++ b/source/include/mono.sh @@ -39,6 +39,7 @@ fi Fmonoexport() { Fmessage "Exporting weird MONO_SHARED_DIR..." export MONO_SHARED_DIR=$Fdestdir/weird + export XDG_CONFIG_HOME=$Fdestdir/weird mkdir -p $MONO_SHARED_DIR } From bouleetbil at frogdev.info Fri Jun 6 22:41:11 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Jun 6 22:41:12 2008 Subject: [Frugalware-git] frugalware-current: evince-2.22.2-1-i686 Message-ID: <20080606204111.890071190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d2a7df6f0a92e1119eabc5463c459aabc9823553 commit d2a7df6f0a92e1119eabc5463c459aabc9823553 Author: bouleetbil Date: Fri Jun 6 21:56:41 2008 +0200 evince-2.22.2-1-i686 *version bump diff --git a/source/gnome/evince/FrugalBuild b/source/gnome/evince/FrugalBuild index 4bad923..af9cf6b 100644 --- a/source/gnome/evince/FrugalBuild +++ b/source/gnome/evince/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix pkgname=evince -pkgver=2.22.1.1 +pkgver=2.22.2 pkgrel=1 pkgdesc="A document viewer for GNOME" -depends=('libgnomeui>=2.22.0' 'poppler-glib>=0.8.0' 'ghostscript' 'rarian' 'desktop-file-utils' \ - 't1lib' 'dbus-glib>=0.74' 'tetex-kpathsea' 'djvulibre') -makedepends=('intltool' 'gnome-doc-utils' 'perl-xml-parser' 'tetex' 'nautilus>=2.22.0') +depends=('libgnomeui>=2.22.1' 'poppler-glib>=0.8.2' 'ghostscript' 'rarian' 'desktop-file-utils' \ + 't1lib' 'dbus-glib>=0.76' 'tetex-kpathsea' 'djvulibre') +makedepends=('intltool' 'gnome-doc-utils' 'perl-xml-parser' 'tetex' 'nautilus>=2.22.3') replaces=('gpdf') groups=('gnome') archs=('i686' 'x86_64') @@ -22,7 +22,7 @@ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet url="http://www.gnome.org/projects/evince/" -sha1sums=('8564efb17ec8d87b8f7fe0524ba18cb90121cc56') +sha1sums=('c1be08426c8d7220021d20502a7ffafbe82108b4') subpkgs=('evince-nautilus') subdescs=('Evince plugin for Nautilus') From bouleetbil at frogdev.info Fri Jun 6 23:42:00 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Jun 6 23:42:03 2008 Subject: [Frugalware-git] frugalware-current: banshee-1.0.0-1-i686 Message-ID: <20080606214200.881321190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=80b85a864dc628484d9bdbf25b32f50f3228843b commit 80b85a864dc628484d9bdbf25b32f50f3228843b Author: bouleetbil Date: Fri Jun 6 23:35:13 2008 +0200 banshee-1.0.0-1-i686 *version bump *delete _F_gnome_schemas *add new depends *delete option nofakeroot *add mono to Finclude diff --git a/source/gnome-extra/banshee/FrugalBuild b/source/gnome-extra/banshee/FrugalBuild index 52d4db1..cafa8a5 100644 --- a/source/gnome-extra/banshee/FrugalBuild +++ b/source/gnome-extra/banshee/FrugalBuild @@ -3,44 +3,40 @@ # Contributor: AlexExtreme pkgname=banshee -pkgver=0.13.2 +_F_archive_name=$pkgname-1 +pkgver=1.0.0 pkgrel=1 pkgdesc="Banshee is a Mono based media player for Gnome" url="http://banshee-project.org" -depends=('gnome-sharp' 'ipod-sharp>=0.8.0' 'sqlite3' 'hal' 'libmusicbrainz' 'nautilus-cd-burner' \ - 'mono-zeroconf>=0.7.5' 'gst-plugins-base-cdparanoia' 'gst-plugins-base-gnomevfs' 'gst-plugins-good-gconf' 'gst-plugins-base-oil' \ - 'karma-sharp>=0.1.0-3' 'libmtp' 'ndesk-dbus-glib' 'njb-sharp') +depends=('gnome-sharp' 'ipod-sharp>=0.8.0' 'sqlite3' 'hal' 'libmusicbrainz' 'brasero' \ + 'mono-zeroconf>=0.7.6' 'gst-plugins-base-cdparanoia' 'gst-plugins-base-gnomevfs' \ + 'gst-plugins-good-gconf' 'gst-plugins-base-oil' 'podsleuth' \ + 'karma-sharp>=0.1.0-4' 'libmtp' 'ndesk-dbus-glib' 'njb-sharp' 'taglib-sharp' 'mono-addins') conflicts=('banshee-official-plugins') provides=('banshee-official-plugins') replaces=('banshee-official-plugins') -makedepends=('perl-xml-parser' 'intltool') +makedepends=('perl-xml-parser') groups=('gnome-extra') archs=('i686' 'x86_64') -_F_gnome_schemas=( \ - '/etc/gconf/schemas/banshee-core.schemas' \ - '/etc/gconf/schemas/banshee-interface.schemas' \ - '/etc/gconf/schemas/banshee-plugin-audioscrobbler.schemas' \ - '/etc/gconf/schemas/banshee-plugin-bookmarks.schemas' \ - '/etc/gconf/schemas/banshee-plugin-daap.schemas' \ - '/etc/gconf/schemas/banshee-plugin-lastfm.schemas' \ - '/etc/gconf/schemas/banshee-plugin-metadatasearcher.schemas' \ - '/etc/gconf/schemas/banshee-plugin-minimode.schemas' \ - '/etc/gconf/schemas/banshee-plugin-mmkeys.schemas' \ - '/etc/gconf/schemas/banshee-plugin-notificationarea.schemas' \ - '/etc/gconf/schemas/banshee-plugin-podcast.schemas' \ - '/etc/gconf/schemas/banshee-plugin-radio.schemas' \ - '/etc/gconf/schemas/banshee-plugin-recommendation.schemas') _F_gnome_desktop=y _F_gnome_iconcache=y -options=('scriptlet' 'nofakeroot') +options=('scriptlet') _F_mono_aot=0 -Finclude gnome-scriptlet +Finclude mono gnome-scriptlet up2date="lynx -dump $url | grep 'The latest version'|sed 's/The latest version of Banshee is //g' |sed 's/,.*$//g' | sed 's/ //g'" -source=(http://banshee-project.org/files/$pkgname/$pkgname-$pkgver.tar.bz2) +source=(http://banshee-project.org/files/$pkgname/$_F_archive_name-$pkgver.tar.bz2) Fconfopts="$Fconfopts --disable-docs --enable-avahi --enable-ipod \ --enable-karma --enable-mtp --enable-external-ndesk-dbus \ --enable-njb --disable-debug" -sha1sums=('81093fe364b9bcac37d88595feb690c0a537a134') +sha1sums=('8467e114d6857cc1f37b3364cbde9618a2067e30') +_F_cd_path=$_F_archive_name-$pkgver + +build() { + unset MAKEFLAGS + Fmonoexport + Fbuild + Fmonocleanup + Fbuild_gnome_scriptlet +} -unset MAKEFLAGS # optimization OK From bouleetbil at frogdev.info Fri Jun 6 23:58:03 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Jun 6 23:58:05 2008 Subject: [Frugalware-git] frugalware-current: monodevelop-database-1.0-3-i686 Message-ID: <20080606215803.399241190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=63fcea1dad0fbb2b3b7db2d10c2dcf2009280b55 commit 63fcea1dad0fbb2b3b7db2d10c2dcf2009280b55 Author: bouleetbil Date: Fri Jun 6 23:52:20 2008 +0200 monodevelop-database-1.0-3-i686 *rebuild with mysql-connector-net diff --git a/source/gnome-extra/monodevelop-database/FrugalBuild b/source/gnome-extra/monodevelop-database/FrugalBuild index b25ed9c..c707abd 100644 --- a/source/gnome-extra/monodevelop-database/FrugalBuild +++ b/source/gnome-extra/monodevelop-database/FrugalBuild @@ -3,10 +3,10 @@ pkgname=monodevelop-database pkgver=1.0 -pkgrel=2 +pkgrel=3 pkgdesc="Database Extension for MonoDevelop" url="http://www.mono-project.com/" -depends=('monodevelop>=1.0' 'sqlite3') +depends=('monodevelop>=1.0' 'sqlite3' 'mysql-connector-net') makedepends=('intltool' 'perl-xml-parser') groups=('gnome-extra') archs=('i686' 'x86_64') @@ -15,5 +15,4 @@ source=(http://www.go-mono.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) options=('scriptlet') _F_mono_aot=0 Finclude mono -#for now disable mysql requiert mysql-connector-net sha1sums=('238fe15bc15118560e99ee6e0d9fc51c36dae645') From vmiklos at frugalware.org Sat Jun 7 00:17:28 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 7 00:17:29 2008 Subject: [Frugalware-git] frugalware-current: mysql-connector-net-5.1.6-1-x86_64 Message-ID: <20080606221728.572A91190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=95bffcbf0aa9048a123a46f34740d77cf99cbdb3 commit 95bffcbf0aa9048a123a46f34740d77cf99cbdb3 Author: Miklos Vajna Date: Sat Jun 7 00:17:06 2008 +0200 mysql-connector-net-5.1.6-1-x86_64 added x86_64 to archs() diff --git a/source/devel-extra/mysql-connector-net/FrugalBuild b/source/devel-extra/mysql-connector-net/FrugalBuild index b10c6c1..41e0483 100644 --- a/source/devel-extra/mysql-connector-net/FrugalBuild +++ b/source/devel-extra/mysql-connector-net/FrugalBuild @@ -9,7 +9,7 @@ url="http://www.mysql.com/" depends=(mono) makedepends=('nant') groups=('devel-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump -source http://dev.mysql.com/|grep 'MySQL Connector/NET' | grep 'GA' | \ cut -d'(' -f2 | cut -d')' -f1 | sed 's/GA //'" mirror="http://mysql.mirrors.crysys.hit.bme.hu/" From devil505linux at gmail.com Sat Jun 7 08:18:32 2008 From: devil505linux at gmail.com (Devil505) Date: Sat Jun 7 08:18:35 2008 Subject: [Frugalware-git] frugalware-current: screenlets-0.1.2-1-i686 Message-ID: <20080607061832.80C3D1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d8389647170d7d6cb457c6e521358e6f75672f01 commit d8389647170d7d6cb457c6e521358e6f75672f01 Author: Devil505 Date: Sat Jun 7 08:18:07 2008 +0200 screenlets-0.1.2-1-i686 * version bump diff --git a/source/gnome-extra/screenlets/FrugalBuild b/source/gnome-extra/screenlets/FrugalBuild index 8d56f9e..287a463 100644 --- a/source/gnome-extra/screenlets/FrugalBuild +++ b/source/gnome-extra/screenlets/FrugalBuild @@ -3,17 +3,18 @@ # Contributor: AlexExtreme pkgname=screenlets -pkgver=0.1.1 +pkgver=0.1.2 pkgrel=1 pkgdesc="Screenlets are small applications that can be described as the virtual representation of things lying/standing around on your desk" url="http://www.screenlets.org" depends=('pycairo' 'pygtk' 'pyxdg' 'dbus-python' 'gnome-python-desktop' 'libnotify' 'notification-daemon' 'xdg-utils' 'gnome-python-desktop-keyring' 'gnome-python-extras-mozembed') +options=('scriptlet') groups=('gnome-extra') archs=('i686' 'x86_64') up2date="elinks -dump 'https://launchpad.net/screenlets/+download' | Flasttar" -source=(http://code.launchpad.net/screenlets/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz) +source=(http://code.launchpad.net/screenlets/trunk/$pkgver/+download/$pkgname-$pkgver.tar.bz2) _F_cd_path="$pkgname" -sha1sums=('f8936a1b59c353adcad5e82a276fb6c8aa3c90fb') +sha1sums=('de5a9776afbbd283a7fc83c63816f3f750b72baf') build() { From devil505linux at gmail.com Sat Jun 7 08:26:44 2008 From: devil505linux at gmail.com (Devil505) Date: Sat Jun 7 08:26:46 2008 Subject: [Frugalware-git] frugalware-current: man-pages-fr-2.80.0-1-i686 Message-ID: <20080607062644.F2BCB1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=08708a0eee18b1614dd28574569a40a9e0d7e256 commit 08708a0eee18b1614dd28574569a40a9e0d7e256 Author: Devil505 Date: Sat Jun 7 08:26:34 2008 +0200 man-pages-fr-2.80.0-1-i686 * version bump diff --git a/source/locale-extra/man-pages-fr/FrugalBuild b/source/locale-extra/man-pages-fr/FrugalBuild index e5c2427..6e06eb5 100644 --- a/source/locale-extra/man-pages-fr/FrugalBuild +++ b/source/locale-extra/man-pages-fr/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=man-pages-fr -pkgver=2.79.0 +pkgver=2.80.0 pkgrel=1 pkgdesc="French man pages are online documentation for Linux" url="http://manpagesfr.free.fr/" From devil505linux at gmail.com Sat Jun 7 08:29:54 2008 From: devil505linux at gmail.com (Devil505) Date: Sat Jun 7 08:29:56 2008 Subject: [Frugalware-git] frugalware-current: man-pages-extras-fr-0.8.1-1-i686 Message-ID: <20080607062954.F20A21190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4c9c18d21cd8e9f32160ebed9eee78dab3dc4e1b commit 4c9c18d21cd8e9f32160ebed9eee78dab3dc4e1b Author: Devil505 Date: Sat Jun 7 08:29:47 2008 +0200 man-pages-extras-fr-0.8.1-1-i686 * version bump diff --git a/source/locale-extra/man-pages-extras-fr/FrugalBuild b/source/locale-extra/man-pages-extras-fr/FrugalBuild index 0c2912c..1e2b369 100644 --- a/source/locale-extra/man-pages-extras-fr/FrugalBuild +++ b/source/locale-extra/man-pages-extras-fr/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=man-pages-extras-fr -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=1 pkgdesc="French man pages are online documentation for Linux" url="http://manpagesfr.free.fr/" From devil505linux at gmail.com Sat Jun 7 08:36:53 2008 From: devil505linux at gmail.com (Devil505) Date: Sat Jun 7 08:36:55 2008 Subject: [Frugalware-git] frugalware-current: verbiste-0.1.23-1-i686 Message-ID: <20080607063653.509721190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5c6056f798694a9adc99d350179013b08512c89f commit 5c6056f798694a9adc99d350179013b08512c89f Author: Devil505 Date: Sat Jun 7 08:36:42 2008 +0200 verbiste-0.1.23-1-i686 * version bump diff --git a/source/xapps-extra/verbiste/FrugalBuild b/source/xapps-extra/verbiste/FrugalBuild index e7c3404..2e9ea7b 100644 --- a/source/xapps-extra/verbiste/FrugalBuild +++ b/source/xapps-extra/verbiste/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=verbiste -pkgver=0.1.22 +pkgver=0.1.23 pkgrel=1 pkgdesc="generates conjugations of french verbs" url="http://perso.b2b2c.ca/sarrazip/dev/verbiste.html" @@ -13,7 +13,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url | Flasttar" source=(http://perso.b2b2c.ca/sarrazip/dev/$pkgname-$pkgver.tar.gz) Fconfopts="${Fconfopts[@]} --prefix=/usr --with-gtk-app " -sha1sums=('3695060c6ff8d8a963640dafc07e79544304342f') +sha1sums=('5d1040b0ca459b65caaba684fcadef30ee7cec84') build() { From boobaa at frugalware.org Sat Jun 7 08:57:34 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Sat Jun 7 08:57:35 2008 Subject: [Frugalware-git] frugalware-current: drupal-link-5.x_2.2-1-i686 Message-ID: <20080607065734.062E51190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cfbd79e8892cba733ab727925fb5f425a12913c9 commit cfbd79e8892cba733ab727925fb5f425a12913c9 Author: CSCSY Lszl Date: Sat Jun 7 08:57:25 2008 +0200 drupal-link-5.x_2.2-1-i686 version bump diff --git a/source/network-extra/drupal-link/FrugalBuild b/source/network-extra/drupal-link/FrugalBuild index 074630a..2333418 100644 --- a/source/network-extra/drupal-link/FrugalBuild +++ b/source/network-extra/drupal-link/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: CSCSY Lszl _F_drupal_module=link -pkgver=5.x_2.1 +pkgver=5.x_2.2 pkgrel=1 pkgdesc="This Drupal module provides a CCK field which lets you add a complete link to your content types" rodepends=('drupal-cck') Finclude drupal -sha1sums=('aed5ffa6cd7e4e8aa7d505dd8c93f2a1b10e68e3') +sha1sums=('b24840941f7ba51a20c66b17969afec2b02ac7b8') From boobaa at frugalware.org Sat Jun 7 09:17:47 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Sat Jun 7 09:17:48 2008 Subject: [Frugalware-git] frugalware-current: man-pages-2.80-1-i686 Message-ID: <20080607071747.289561190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ffbefc6ae051b08f51e70ca2802c59175504f79b commit ffbefc6ae051b08f51e70ca2802c59175504f79b Author: CSCSY Lszl Date: Sat Jun 7 09:17:39 2008 +0200 man-pages-2.80-1-i686 version bump diff --git a/source/apps/man-pages/FrugalBuild b/source/apps/man-pages/FrugalBuild index 4df4f1b..7d279f4 100644 --- a/source/apps/man-pages/FrugalBuild +++ b/source/apps/man-pages/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=man-pages -pkgver=2.79 +pkgver=2.80 pkgrel=1 pkgdesc="Man pages are online documentation for Linux" url="http://www.win.tue.nl/~aeb/linux/man" @@ -41,4 +41,4 @@ build() Frm /usr/share/man/man4/mouse.4 } -sha1sums=('d5a4c69a2305236b89226437b207eaceb4a87c18') +sha1sums=('8efb6478e017250641593440ee26b0ee6c233d7a') From devil505linux at gmail.com Sat Jun 7 09:21:12 2008 From: devil505linux at gmail.com (Devil505) Date: Sat Jun 7 09:21:14 2008 Subject: [Frugalware-git] frugalware-current: snes9x-gtk-31-1-x86_64 Message-ID: <20080607072112.23B2C1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4020abacf8f1321ca266a970f9aa95260635ae62 commit 4020abacf8f1321ca266a970f9aa95260635ae62 Author: Devil505 Date: Sat Jun 7 09:20:46 2008 +0200 snes9x-gtk-31-1-x86_64 * new package diff --git a/source/games-extra/snes9x-gtk/FrugalBuild b/source/games-extra/snes9x-gtk/FrugalBuild new file mode 100644 index 0000000..8281d0c --- /dev/null +++ b/source/games-extra/snes9x-gtk/FrugalBuild @@ -0,0 +1,34 @@ +# Compiling Time: 0.72 SBU +# Maintainer: Devil505 + +pkgname=snes9x-gtk +_F_archive_name="snes9x-1.51-src-gtk" +pkgver=31 +pkgrel=1 +pkgdesc="GTK+ Version of snes9x, a portable Emulator for the Super Nintento Entertainment System" +url="http://snes9x.com/phpbb2/viewtopic.php?t=3703" +depends=('freetype2' 'libxdmcp' 'libglade' 'portaudio' 'libxv' 'gtkglext' 'mesa' 'sdl' 'libstdc++') +options=('scriptlet') +groups=('games-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump $url | Flasttar" +source=(http://bearoso.googlepages.com/$_F_archive_name-$pkgver.tar.bz2) +Fconfopts="${Fconfopts[@]} -with-gtk --with-opengl --with-netplay" +_F_cd_path="snes9x-1.51-src" +sha1sums=('3c5ae6147de11d1b9d8a25b122edb436bd0b410c') + +_F_desktop_name="Snes9X GTK+" +_F_desktop_desc="SNES Emulator" +_F_desktop_icon="snes9x.svg" +_F_desktop_categories="Application;Game" + +build() +{ + Fmkdir usr/bin + Fconf + Fmake + Fexerel snes9x-gtk usr/bin/snes9x-gtk + Fdocrel doc/*.* + Ficonrel gtk/snes9x.svg + Fdesktop2 +} From ryuo at frugalware.org Sat Jun 7 09:34:16 2008 From: ryuo at frugalware.org (James Buren) Date: Sat Jun 7 09:34:17 2008 Subject: [Frugalware-git] frugalware-current: bsnes-032a-2-i686 Message-ID: <20080607073416.7846D1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ecf013ab20fed71648081e088936020f83545c81 commit ecf013ab20fed71648081e088936020f83545c81 Author: James Buren Date: Sat Jun 7 02:31:05 2008 -0500 bsnes-032a-2-i686 * removed $CFLAGS, appeared to be causing segfaults diff --git a/source/games-extra/bsnes/FrugalBuild b/source/games-extra/bsnes/FrugalBuild index a68c16e..4fba938 100644 --- a/source/games-extra/bsnes/FrugalBuild +++ b/source/games-extra/bsnes/FrugalBuild @@ -3,7 +3,7 @@ pkgname=bsnes pkgver=032a -pkgrel=1 +pkgrel=2 pkgdesc="A newer snes emulator designed with accuracy in mind." url="http://byuu.cinnamonpirate.com/bsnes/" depends=('gtk+2' 'freetype2' 'libxdmcp' 'libxtst' 'libgl' 'libxv' 'libao' 'openal' 'libstdc++' 'libxdamage' 'libxml2' 'sdl') @@ -19,12 +19,9 @@ sha1sums=('aa6ed49eed3bd44bb638ce549cb1591c50ead72f') build() { - make -C src platform=x compiler=gcc enable_gzip=true enable_jma=true \ - flags="$CFLAGS -Ilib -DGZIP_SUPPORT -DJMA_SUPPORT" || Fdie + make -C src platform=x compiler=gcc enable_gzip=true enable_jma=true || Fdie Fexe /usr/bin/$pkgname Fdoc {readme,license}.txt Ficon src/data/$pkgname.png Fdesktop2 } - -# optimization OK From bouleetbil at frogdev.info Sat Jun 7 10:07:42 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Jun 7 10:07:43 2008 Subject: [Frugalware-git] frugalware-current: contacts-eds-0.9-1-i686 Message-ID: <20080607080742.3C2D01190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ac8e7592b7939efeef27d72474d752912bcfc17c commit ac8e7592b7939efeef27d72474d752912bcfc17c Author: bouleetbil Date: Sat Jun 7 08:41:45 2008 +0200 contacts-eds-0.9-1-i686 *version bump *use _F_archive_name diff --git a/source/gnome-extra/contacts-eds/FrugalBuild b/source/gnome-extra/contacts-eds/FrugalBuild index 4b1fc25..3f03281 100644 --- a/source/gnome-extra/contacts-eds/FrugalBuild +++ b/source/gnome-extra/contacts-eds/FrugalBuild @@ -2,26 +2,24 @@ # Maintainer: bouleetbil pkgname=contacts-eds -pkgver=0.8 +pkgver=0.9 pkgrel=1 pkgdesc="Contacts is a small, lightweight addressbook that uses libebook, part of EDS" url="http://pimlico-project.org" -realname=contacts +_F_archive_name=contacts depends=('atk' 'pango' 'freetype2' 'libxau' 'libxdmcp' 'evolution-data-server' \ 'libgnome' 'popt' 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' \ 'libxcursor' 'nspr' 'openssl' 'e2fsprogs') makedepends=('perl-xml-parser' 'intltool') groups=('gnome-extra') -up2date="lynx -dump $url/sources/$realname/ \ - | grep $realname | tail -1 | cut -d '-' -f 3 |sed 's/.tar.gz//'" -source=($url/sources/$realname/$realname-$pkgver.tar.gz) +up2date="lynx -dump $url/sources/$_F_archive_name/ | Flasttar " +source=($url/sources/$realname/$_F_archive_name-$pkgver.tar.gz) options=('scriptlet') _F_gnome_schemas=('/etc/gconf/schemas/contacts.schemas') _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome-scriptlet archs=('i686' 'x86_64') -sha1sums=('313737fb6f665404f81eae8586b315dd0c499048') -_F_cd_path=$realname-$pkgver +sha1sums=('340d6af2b2241c9eca8bc15ea7bc41878db24567') -# optimization OK +# optimization OK \ No newline at end of file From bouleetbil at frogdev.info Sat Jun 7 10:18:35 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Jun 7 10:18:37 2008 Subject: [Frugalware-git] frugalware-current: contacts-eds-0.9-1-i686 Message-ID: <20080607081836.023571190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ad6c7c971deda74b178b2c276aa00d4ac04c2de4 commit ad6c7c971deda74b178b2c276aa00d4ac04c2de4 Author: bouleetbil Date: Sat Jun 7 10:12:45 2008 +0200 contacts-eds-0.9-1-i686 *correction of source diff --git a/source/gnome-extra/contacts-eds/FrugalBuild b/source/gnome-extra/contacts-eds/FrugalBuild index 3f03281..dd8e12f 100644 --- a/source/gnome-extra/contacts-eds/FrugalBuild +++ b/source/gnome-extra/contacts-eds/FrugalBuild @@ -13,7 +13,7 @@ depends=('atk' 'pango' 'freetype2' 'libxau' 'libxdmcp' 'evolution-data-server' \ makedepends=('perl-xml-parser' 'intltool') groups=('gnome-extra') up2date="lynx -dump $url/sources/$_F_archive_name/ | Flasttar " -source=($url/sources/$realname/$_F_archive_name-$pkgver.tar.gz) +source=($url/sources/$_F_archive_name/$_F_archive_name-$pkgver.tar.gz) options=('scriptlet') _F_gnome_schemas=('/etc/gconf/schemas/contacts.schemas') _F_gnome_iconcache="y" @@ -22,4 +22,4 @@ Finclude gnome-scriptlet archs=('i686' 'x86_64') sha1sums=('340d6af2b2241c9eca8bc15ea7bc41878db24567') -# optimization OK \ No newline at end of file +# optimization OK From devil505linux at gmail.com Sat Jun 7 10:24:02 2008 From: devil505linux at gmail.com (Devil505) Date: Sat Jun 7 10:24:04 2008 Subject: [Frugalware-git] frugalware-current: bouml-4.3.5-1-x86_64 Message-ID: <20080607082402.C698C1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d4cd1e2292597baa809502e748fd085604b74010 commit d4cd1e2292597baa809502e748fd085604b74010 Author: Devil505 Date: Sat Jun 7 10:23:49 2008 +0200 bouml-4.3.5-1-x86_64 * version bump diff --git a/source/xapps-extra/bouml/FrugalBuild b/source/xapps-extra/bouml/FrugalBuild index 8c69e69..4db68dc 100644 --- a/source/xapps-extra/bouml/FrugalBuild +++ b/source/xapps-extra/bouml/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=bouml -pkgver=4.3.1 +pkgver=4.3.5 pkgrel=1 pkgdesc="Free UML 2 tool box with C++, Java and Idl code generation" _F_sourceforge_sep="_" @@ -14,6 +14,6 @@ options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') _F_cd_path="${pkgname}_${pkgver}" -sha1sums=('3121e8f7f587058dad3119f74136dd0810859e60') +sha1sums=('73c40df173bdecfefe035e462cc84cc55929b353') # optimization OK From krics at linuxforum.hu Sat Jun 7 11:57:23 2008 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Jun 7 11:57:25 2008 Subject: [Frugalware-git] frugalware-current: fribidi-0.19.1-1-x86_64 Message-ID: <20080607095723.65EE11190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=11ac20205447be572075651b9ad9bdd816a5b458 commit 11ac20205447be572075651b9ad9bdd816a5b458 Author: Christian Hamar alias krix Date: Sat Jun 7 11:57:14 2008 +0200 fribidi-0.19.1-1-x86_64 * Version bump diff --git a/source/lib/fribidi/FrugalBuild b/source/lib/fribidi/FrugalBuild index de10c46..1a528c8 100644 --- a/source/lib/fribidi/FrugalBuild +++ b/source/lib/fribidi/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=fribidi -pkgver=0.10.9 +pkgver=0.19.1 pkgrel=1 pkgdesc="A Free Implementation of the Unicode BiDirectional algorithm" url="http://www.fribidi.org" @@ -12,6 +12,7 @@ license=('GPL2.1') archs=('i686' 'x86_64') up2date="lynx -dump $url/download/|grep '.tar.gz$'|sort -n -r|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" source=(http://www.fribidi.org/download/$pkgname-$pkgver.tar.gz) -sha1sums=('f9aae2d2084eaccbc87760401c4521e96a92a436') +sha1sums=('94ed54d597cf5f3dd1690857f7a2f604c4b7dee3') +Fconfopts="$Fconfopts --with-glib=no" # optimization OK From devil505linux at gmail.com Sat Jun 7 12:40:36 2008 From: devil505linux at gmail.com (Devil505) Date: Sat Jun 7 12:40:38 2008 Subject: [Frugalware-git] frugalware-current: gecko-mediaplayer-0.6.2-1-x86_64 Message-ID: <20080607104036.1718B1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=89bdd49daddfffc7994438b5e365d680cd92c4e7 commit 89bdd49daddfffc7994438b5e365d680cd92c4e7 Author: Devil505 Date: Sat Jun 7 12:39:51 2008 +0200 gecko-mediaplayer-0.6.2-1-x86_64 * added x86_64 to archs diff --git a/source/gnome-extra/gecko-mediaplayer/FrugalBuild b/source/gnome-extra/gecko-mediaplayer/FrugalBuild index 45c3f4e..3f39a59 100644 --- a/source/gnome-extra/gecko-mediaplayer/FrugalBuild +++ b/source/gnome-extra/gecko-mediaplayer/FrugalBuild @@ -12,7 +12,7 @@ Finclude googlecode _F_gnome_schemas=('/etc/gconf/schemas/gecko-mediaplayer.schemas') Finclude gnome-scriptlet groups=(gnome-extra) -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('3e5ea272804a96c35a15c0e8407cb02b0f3092ad') # optimization OK From crazy at frugalware.org Sat Jun 7 12:41:18 2008 From: crazy at frugalware.org (crazy) Date: Sat Jun 7 12:41:20 2008 Subject: [Frugalware-git] frugalware-current: glibc-2.7-3-x86_64 Message-ID: <20080607104118.C14701190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8ad1643101475c1fc23cea47f4f2172f8ca8f773 commit 8ad1643101475c1fc23cea47f4f2172f8ca8f773 Author: crazy Date: Sat Jun 7 12:39:25 2008 +0200 glibc-2.7-3-x86_64 * cleanup xen stuff * merged _build() / build() in only build() again * added note about the 'tarball' situation and link to the thread * add --libdir=/usr/lib diff --git a/source/base/glibc/FrugalBuild b/source/base/glibc/FrugalBuild index 06b8abd..d23a064 100644 --- a/source/base/glibc/FrugalBuild +++ b/source/base/glibc/FrugalBuild @@ -12,23 +12,17 @@ rodepends=('tzdata') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') Fup2gnugz +## probably no releases as tarball anymore , see : +## http://sources.redhat.com/ml/libc-alpha/2008-05/msg00069.html source=(http://ftp.gnu.org/pub/gnu/glibc/glibc-$pkgver.tar.bz2 \ glibc-2.7-fnstsw.diff) signatures=("$source.sig" '') -## XEN disabled for 0.7 -#if [ "$CARCH" == "i686" ]; then -# subpkgs=('glibc-xen') -# subdescs=('GNU C Library for Xen.') -# subdepends=() -# subconflicts=('glibc') -# subprovides=('glibc') -# subgroups=('base-extra') -# subarchs=('i686') -#fi - -_build() +build() { + Fcd + Fsed 'x86_64 \| ' '' sysdeps/unix/sysv/linux/configure{,.in} + Fpatchall Ffilerel nscd/nscd.conf /etc/nscd.conf ## use Fdie here and kill the build ## if we get any errors. -- crazy -- @@ -38,6 +32,7 @@ _build() CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" CXX="g++" CC="gcc" \ ../glibc-$pkgver/configure \ --prefix=/usr \ + --libdir=/usr/lib \ --with-tls \ --with-__thread \ --enable-add-ons=nptl \ @@ -65,22 +60,4 @@ _build() cd - >/dev/null } -build() -{ - # no multilib thanks - Fsed 'x86_64 \| ' '' sysdeps/unix/sysv/linux/configure{,.in} - Fpatchall - export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" - export CFLAGS="$CFLAGS -fno-strict-aliasing" - ## XEN stuff disable for 0.7 - #if [ "$CARCH" == "i686" ]; then - # xenflag="-mno-tls-direct-seg-refs" - # export CFLAGS="$CFLAGS $xenflag" - # _build || return 1 - # Fsplit glibc-xen /etc /lib /sbin /usr - # export CFLAGS="${CFLAGS/ $xenflag}" - #fi - _build || Fdie -} - # optimization ok From vmiklos at frugalware.org Sat Jun 7 15:31:24 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 7 15:31:26 2008 Subject: [Frugalware-git] frugalware-current: docs/translations Message-ID: <20080607133124.349B01190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=287d45f567f9d3a7736ba6ed1c849b8a4344f590 commit 287d45f567f9d3a7736ba6ed1c849b8a4344f590 Author: Miklos Vajna Date: Sat Jun 7 15:30:54 2008 +0200 docs/translations - document what permissions do we set for people with pootle commit rights diff --git a/docs/translations.txt b/docs/translations.txt index 24c61dd..c91d598 100644 --- a/docs/translations.txt +++ b/docs/translations.txt @@ -36,6 +36,10 @@ There are not many, at the moment. manpages, docbook does it already and asciidoc fails to create the manpage if it's already translated. +- The first translator for a language (this can be changed if requested) + receives all rights for a given project, except: Suggest, Overwrite, Assign, + Administrate. + == Goals When we created the current mechanism of handling translations, we had the From crazy at frugalware.org Sat Jun 7 15:45:52 2008 From: crazy at frugalware.org (crazy) Date: Sat Jun 7 15:45:54 2008 Subject: [Frugalware-git] frugalware-current: gcc-4.3.1-1-x86_64 Message-ID: <20080607134552.C7D711190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=52b867349ef1ef3cca8b788fb512b6000c268f37 commit 52b867349ef1ef3cca8b788fb512b6000c268f37 Author: crazy Date: Sat Jun 7 15:18:28 2008 +0200 gcc-4.3.1-1-x86_64 * Version bump * replaced patches by Fsed since autoconf is broken and does not work * updated man pages to latest snapshot * first step for FS#3131 diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index 8030187..4581700 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -2,23 +2,23 @@ # Maintainer: VMiklos pkgname=gcc -pkgver=4.3.0 -pkgrel=5 +pkgver=4.3.1 +pkgrel=1 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" depends=('binutils>=2.18.50.0.4-2' 'libstdc++' 'glibc>=2.7-3' 'mpfr>=2.3.1-2') makedepends=('mpfr' 'gcc-gnat' 'gtk+2' 'libart_lgpl' 'libxtst' 'zip' 'xulrunner' 'grep>=2.5.3-2' \ 'ecj' 'libxml2' 'freetype2' 'libice' 'libxtst' 'libxau' 'libxdmcp' \ - 'libxdamage' 'alsa-lib' 'fastjar>=0.95') + 'libxdamage' 'alsa-lib' 'fastjar>=0.95' 'libtool') provides=('c-compiler') groups=('devel' 'devel-core') archs=('i686' 'x86_64') options=('scriptlet') up2date="lynx -dump $url|grep Current|sed 's/.*GCC //'" source=(http://ftp.gnu.org/pub/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2 \ - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man-20080211.tar.bz2 \ - README.Frugalware remove_broken_class_loader_test.patch fastjar-only.patch) -signatures=("$source.sig" '' '' '' '') + ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.20080508.tar.bz2 \ + README.Frugalware) +signatures=("$source.sig" '' '') subpkgs=('libgcc' 'libstdc++' \ 'libgnat' 'gcc-gnat' \ @@ -64,17 +64,14 @@ subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' build() { + Fcd Fsed 'lib64' 'lib' gcc/config/i386/t-linux64 # no fixincludes, thanks Fsed '\./fixinc\.sh' '-c true' gcc/Makefile.in - # fix for newer xulrunner Fpatchall - Fsed 'xulrunner-plugin' 'xulrunner-plugin xulrunner-xpcom' libjava/classpath/configure.ac - cd libjava/classpath || Fdie - autoconf || return 1 - cd .. || Fdie - autoconf || return 1 - cd .. || Fdie + ## well reconf / autoreconf is br0ken in gcc .. so do it that way heh + Fsed '--with-fastjar=$JAR' '--with-fastjar=/usr/bin/fastjar' libjava/configure + mkdir ../$pkgname-build || Fdie cd ../$pkgname-build || Fdie CC="$FCC gcc" CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" XCFLAGS="$CFLAGS" \ @@ -86,6 +83,7 @@ build() --enable-threads=posix \ --enable-__cxa_atexit \ --enable-java-awt=gtk \ + --with-fastjar=/usr/bin/fastjar \ --with-ecj \ --with-ecj-jar=/usr/share/java/eclipse-ecj.jar \ --enable-gtk-cairo \ @@ -164,7 +162,7 @@ build() Fdoc README.Frugalware Fmkdir /usr/man/man3 # Note: man snapshots are called man.$snapshot and released tarballs are man-$the_version - cp $Fsrcdir/man.20080211/man3/* $Fdestdir/usr/man/man3/ || Fdie + cp $Fsrcdir/libstdc++-man.20080508/man3/* $Fdestdir/usr/man/man3/ || Fdie # split the pkg # libgcc diff --git a/source/devel/gcc/fastjar-only.patch b/source/devel/gcc/fastjar-only.patch deleted file mode 100644 index 507729f..0000000 --- a/source/devel/gcc/fastjar-only.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur gcc-4.3.0/libjava/configure.ac gcc-4.3.0-p/libjava/configure.ac ---- gcc-4.3.0/libjava/configure.ac 2007-12-22 16:48:46.000000000 +0100 -+++ gcc-4.3.0-p/libjava/configure.ac 2008-03-16 13:54:45.000000000 +0100 -@@ -114,7 +114,7 @@ - AC_CHECK_TOOL(AR, ar) - AC_CHECK_TOOL(RANLIB, ranlib, :) - AC_PROG_AWK --AC_CHECK_PROGS([JAR], [jar fastjar gjar], no) -+AC_CHECK_PROGS([JAR], [fastjar], yes) - AC_PATH_PROG([ZIP], [zip], no) - AC_PATH_PROG([UNZIP], [unzip], unzip) - diff --git a/source/devel/gcc/remove_broken_class_loader_test.patch b/source/devel/gcc/remove_broken_class_loader_test.patch deleted file mode 100644 index 5c404ec..0000000 --- a/source/devel/gcc/remove_broken_class_loader_test.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- gcc-4_3-branch/libjava/link.cc 2008/02/18 22:35:48 132392 -+++ gcc-4_3-branch/libjava/link.cc 2008/03/13 18:20:41 133180 -@@ -359,40 +359,6 @@ - throw new java::lang::NoSuchMethodError (sb->toString()); - } - -- // if (found_class->loader != klass->loader), then we -- // must actually check that the types of arguments -- // correspond. That is, for each argument type, and -- // the return type, doing _Jv_FindClassFromSignature -- // with either loader should produce the same result, -- // i.e., exactly the same jclass object. JVMS 5.4.3.3 -- if (found_class->loader != klass->loader) -- { -- JArray *found_args, *klass_args; -- jclass found_return, klass_return; -- -- _Jv_GetTypesFromSignature (the_method, -- found_class, -- &found_args, -- &found_return); -- _Jv_GetTypesFromSignature (the_method, -- klass, -- &klass_args, -- &klass_return); -- -- jclass *found_arg = elements (found_args); -- jclass *klass_arg = elements (klass_args); -- -- for (int i = 0; i < found_args->length; i++) -- { -- if (*(found_arg++) != *(klass_arg++)) -- throw new java::lang::LinkageError (JvNewStringLatin1 -- ("argument type mismatch with different loaders")); -- } -- if (found_return != klass_return) -- throw new java::lang::LinkageError (JvNewStringLatin1 -- ("return type mismatch with different loaders")); -- } -- - return the_method; - } From vmiklos at frugalware.org Sat Jun 7 16:23:21 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 7 16:23:24 2008 Subject: [Frugalware-git] frugalware-current: phpbb-2.0.23-1-i686 Message-ID: <20080607142321.DBB5B1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3d9f82f295057bb228a38c9d45778218237808fa commit 3d9f82f295057bb228a38c9d45778218237808fa Author: Miklos Vajna Date: Sat Jun 7 15:45:25 2008 +0200 phpbb-2.0.23-1-i686 - version bump diff --git a/source/network-extra/phpbb/FrugalBuild b/source/network-extra/phpbb/FrugalBuild index 935e3e6..c8fa2c3 100644 --- a/source/network-extra/phpbb/FrugalBuild +++ b/source/network-extra/phpbb/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=phpbb -pkgver=2.0.22 +pkgver=2.0.23 pkgrel=1 pkgdesc="A fully-featured online forum solution for your website" _F_sourceforge_dirname="$pkgname" @@ -20,9 +20,9 @@ replaces=('phpbb-php5mod') backup=(var/www/phpBB2/config.php) up2date="lynx -dump http://frugalware.org/~alex/misc/phpbbver.php | sed 's/ //g' | grep ." source=($source phpbbsetup README.Frugalware) -sha1sums=('e5ddea44f7cb69f6412cfd88e1a13b03011b5c61' \ - '6862e0f12cb221078507887656e415cc80e8d964' \ - '116bc9724acbf9a3d9448c333af4fb1be3e6e840') +sha1sums=('3a8a966ea2a2d19b6c467bd3faca5062edde82c6' \ + '6862e0f12cb221078507887656e415cc80e8d964' \ + '116bc9724acbf9a3d9448c333af4fb1be3e6e840') build() { From vmiklos at frugalware.org Sat Jun 7 16:23:22 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 7 16:23:24 2008 Subject: [Frugalware-git] frugalware-current: vobject-0.6.6-1-i686 Message-ID: <20080607142322.0796A1190ACA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2e792aaa0135c73ea667d5b88ea8823ea946649b commit 2e792aaa0135c73ea667d5b88ea8823ea946649b Author: Miklos Vajna Date: Sat Jun 7 15:54:05 2008 +0200 vobject-0.6.6-1-i686 - version bump diff --git a/source/devel-extra/vobject/FrugalBuild b/source/devel-extra/vobject/FrugalBuild index 390f7ca..0cd05ae 100644 --- a/source/devel-extra/vobject/FrugalBuild +++ b/source/devel-extra/vobject/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=vobject -pkgver=0.6.0 +pkgver=0.6.6 pkgrel=1 pkgdesc="vobject is intended to be a full featured Python package for parsing and generating vCard and vCalendar files" url="http://vobject.skyhouseconsulting.com/" @@ -12,4 +12,4 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://vobject.skyhouseconsulting.com/history.html | grep -m1 'vobject.*released' | sed 's/.*vobject //' | sed 's/ released.*//'" source=(http://vobject.skyhouseconsulting.com/$pkgname-$pkgver.tar.gz) -sha1sums=('2f5f601ef0491940b225cce89e3fd482c4b04e01') +sha1sums=('1ed2003c368d0d3358dad139d4b9822c04ba5fea') From vmiklos at frugalware.org Sat Jun 7 16:23:22 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 7 16:23:25 2008 Subject: [Frugalware-git] frugalware-current: dhcp-3.0.7-1-i686 Message-ID: <20080607142322.18D0B1190ACB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=66e486f7da29e8c55c8ec7c40e1dbe8a18c9d2d6 commit 66e486f7da29e8c55c8ec7c40e1dbe8a18c9d2d6 Author: Miklos Vajna Date: Sat Jun 7 15:57:01 2008 +0200 dhcp-3.0.7-1-i686 - version bump - drop networkmanager patch diff --git a/source/network-extra/dhcp/FrugalBuild b/source/network-extra/dhcp/FrugalBuild index 53fa33f..fb729f0 100644 --- a/source/network-extra/dhcp/FrugalBuild +++ b/source/network-extra/dhcp/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: AlexExtreme pkgname=dhcp -pkgver=3.0.6 -pkgrel=2 +pkgver=3.0.7 +pkgrel=1 pkgdesc="The ISC DHCP server" url="http://www.isc.org/sw/dhcp/" depends=('glibc') @@ -13,13 +13,11 @@ archs=('i686' 'x86_64') backup=('etc/dhcpd.conf') up2date="lynx -dump $url |grep dhcp-[0-9] |sed -ne 's/.*p-\(.*\).t.*/\1/;1 p'" source=(ftp://ftp.isc.org/isc/$pkgname/$pkgname-$pkgver.tar.gz \ - rc.dhcpd rc.dhcpd-hu.po README.Frugalware $pkgname-3.0.4-networkmanager-fixes.patch dhclient.conf) -sha1sums=('204e509580d57d0cfff23529274612ca8c710efb' \ + rc.dhcpd rc.dhcpd-hu.po README.Frugalware) +sha1sums=('d6e8fd6f8e3bd04930ff74b400fca6eb7a5c715a' \ '4b8d8813f497d3a9aa21eeb113ae965b7b7fdf81' \ 'fd70ba41e16c15d69529eeb216be103e042f3437' \ - '0510d9057df9dcf1c476961930f0ac65f7de87f9' \ - '638b5a5eb6e4459db52e6e65c7d015d246b70e3e' \ - 'ce6545dad5c371b269da8f689f6d3599feefc4da') + '0510d9057df9dcf1c476961930f0ac65f7de87f9') subpkgs=('dhclient') subdescs=('The ISC DHCP client') subgroups=('network') diff --git a/source/network-extra/dhcp/dhcp-3.0.4-networkmanager-fixes.patch b/source/network-extra/dhcp/dhcp-3.0.4-networkmanager-fixes.patch deleted file mode 100644 index 5614bdd..0000000 --- a/source/network-extra/dhcp/dhcp-3.0.4-networkmanager-fixes.patch +++ /dev/null @@ -1,377 +0,0 @@ -diff -urN dhcp-3.0.3/client/dhclient.8 dhcp-3.0.3-work/client/dhclient.8 ---- dhcp-3.0.3/client/dhclient.8 2004-09-30 01:01:46.000000000 +0200 -+++ dhcp-3.0.3-work/client/dhclient.8 2005-10-19 18:43:28.000000000 +0200 -@@ -78,6 +78,9 @@ - .B -w - ] - [ -+.B -x -+] -+[ - .I if0 - [ - .I ...ifN -diff -urN dhcp-3.0.3/client/dhclient.c dhcp-3.0.3-work/client/dhclient.c ---- dhcp-3.0.3/client/dhclient.c 2005-03-03 17:55:22.000000000 +0100 -+++ dhcp-3.0.3-work/client/dhclient.c 2005-10-19 18:48:42.000000000 +0200 -@@ -74,7 +74,9 @@ - int onetry=0; - int quiet=0; - int nowait=0; -- -+#ifdef EXTENDED_NEW_OPTION_INFO -+int extended_option_environment = 0; -+#endif - static void usage PROTO ((void)); - - void do_release(struct client_state *); -@@ -204,6 +206,11 @@ - } else if (!strcmp (argv [i], "--version")) { - log_info ("isc-dhclient-%s", DHCP_VERSION); - exit (0); -+#ifdef EXTENDED_NEW_OPTION_INFO -+ } else if (!strcmp (argv [i], "-x")) { -+ extended_option_environment = 1; -+ new_option_info_tree = GENERATE_NEW_OPTION_INFO; -+#endif - } else if (argv [i][0] == '-') { - usage (); - } else { -@@ -241,7 +248,7 @@ - } - - /* first kill of any currently running client */ -- if (release_mode) { -+ if (1) { - FILE *pidfd; - pid_t oldpid; - long temp; -@@ -251,11 +258,17 @@ - if ((pidfd = fopen(path_dhclient_pid, "r")) != NULL) { - e = fscanf(pidfd, "%ld\n", &temp); - oldpid = (pid_t)temp; -+ log_info ("There is already a pid file %s with pid %i", path_dhclient_pid, oldpid); - - if (e != 0 && e != EOF) { - if (oldpid) { -- if (kill(oldpid, SIGTERM) == 0) -- unlink(path_dhclient_pid); -+ if (kill(oldpid, SIGTERM) == 0) { -+ log_info ("killed old client process, removed PID file"); -+ unlink(path_dhclient_pid); -+ } else if (errno == ESRCH) { -+ log_info ("removed stale PID file"); -+ unlink(path_dhclient_pid); -+ } - } - } - fclose(pidfd); -@@ -476,7 +489,11 @@ - log_info (arr); - log_info (url); - -+#ifdef EXTENDED_NEW_OPTION_INFO -+ log_error ("Usage: dhclient [-1dqr] [-nwx] [-p ] %s", -+#else - log_error ("Usage: dhclient [-1dqr] [-nw] [-p ] %s", -+#endif - "[-s server]"); - log_error (" [-cf config-file] [-lf lease-file]%s", - "[-pf pid-file] [-e VAR=val]"); -@@ -867,7 +884,7 @@ - /* If the BOUND/RENEW code detects another machine using the - offered address, it exits nonzero. We need to send a - DHCPDECLINE and toss the lease. */ -- if (script_go (client)) { -+ if (script_go (client) == 2) { - make_decline (client, client -> new); - send_decline (client); - destroy_client_lease (client -> new); -@@ -2447,8 +2464,28 @@ - struct envadd_state { - struct client_state *client; - const char *prefix; -+ struct universe *universe; - }; - -+#ifdef EXTENDED_NEW_OPTION_INFO -+static -+void build_universe_info_envvar -+( struct option_cache *oc, -+ struct packet *p, struct lease *l, -+ struct client_state *client, -+ struct option_state *in_o, -+ struct option_state *cf_o, -+ struct binding_scope **scope, -+ struct universe *u, void *es -+) -+{ -+ char info_name[512], info_data[512]; -+ snprintf(info_name, 512, "%s._universe_.", oc->option->universe->name); -+ snprintf(info_data, 512, "%u:%s", oc->option->code,oc->option->format); -+ client_envadd( client, info_name, oc->option->name, info_data ); -+} -+#endif -+ - void client_option_envadd (struct option_cache *oc, - struct packet *packet, struct lease *lease, - struct client_state *client_state, -@@ -2465,6 +2502,31 @@ - in_options, cfg_options, scope, oc, MDL)) { - if (data.len) { - char name [256]; -+#ifdef EXTENDED_NEW_OPTION_INFO -+ if ( extended_option_environment ) -+ { -+ if( ( oc->option->universe != &dhcp_universe ) -+ &&( oc->option->universe->index > fqdn_universe.index ) -+ &&( es->universe != oc->option->universe ) -+ ) -+ { -+ es->universe = oc->option->universe; -+ (*(es->universe->foreach)) -+ ( (struct packet *)0, (struct lease *)0, -+ client_state, -+ in_options, cfg_options, -+ scope, es->universe, es, -+ build_universe_info_envvar -+ ); -+ }else -+ if ( lookup_new_option_info(oc->option) != 0L ) -+ build_universe_info_envvar -+ ( oc, packet, lease, client_state, -+ in_options, cfg_options, scope, -+ oc->option->universe, es -+ ); -+ } -+#endif - if (dhcp_option_ev_name (name, sizeof name, - oc -> option)) { - client_envadd (es -> client, es -> prefix, -@@ -2493,6 +2555,7 @@ - - es.client = client; - es.prefix = prefix; -+ es.universe = 0L; - - client_envadd (client, - prefix, "ip_address", "%s", piaddr (lease -> address)); -@@ -2709,7 +2772,14 @@ - s = option -> name; - if (j + 1 == buflen) - return 0; -+#ifdef EXTENDED_NEW_OPTION_INFO -+ if ( ! extended_option_environment ) -+ buf [j++] = '_'; -+ else -+ buf [j++] = '.'; -+#else - buf [j++] = '_'; -+#endif - } - ++i; - } while (i != 2); -diff -urN dhcp-3.0.3/client/scripts/linux dhcp-3.0.3-work/client/scripts/linux ---- dhcp-3.0.3/client/scripts/linux 2002-11-15 02:09:09.000000000 +0100 -+++ dhcp-3.0.3-work/client/scripts/linux 2005-10-19 18:46:52.000000000 +0200 -@@ -22,6 +22,19 @@ - # 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious - # of the $1 in its args. - -+if [ -n "${dhc_dbus}" ]; then -+ /usr/bin/dbus-send \ -+ --system \ -+ --dest=com.redhat.dhcp \ -+ --type=method_call \ -+ /com/redhat/dhcp/$interface \ -+ com.redhat.dhcp.set \ -+ 'string:'"`env | /bin/egrep -v '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"; -+ if (( ( dhc_dbus & 31 ) == 31 )); then -+ exit 0; -+ fi; -+fi; -+ - make_resolv_conf() { - if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then - echo search $new_domain_name >/etc/resolv.conf -@@ -80,6 +93,7 @@ - fi - - if [ x$reason = xPREINIT ]; then -+ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then - if [ x$alias_ip_address != x ]; then - # Bring down alias interface. Its routes will disappear too. - ifconfig $interface:0- inet 0 -@@ -98,6 +112,7 @@ - sleep 1 - - exit_with_hooks 0 -+ fi - fi - - if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then -@@ -115,6 +130,7 @@ - fi - fi - -+ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then - if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ - [ x$alias_ip_address != x$old_ip_address ]; then - # Possible new alias. Remove old alias. -@@ -124,13 +140,18 @@ - # IP address changed. Bringing down the interface will delete all routes, - # and clear the ARP cache. - ifconfig $interface inet 0 down -- - fi -+ fi -+ - if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \ - [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then - -+ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then - ifconfig $interface inet $new_ip_address $new_subnet_arg \ - $new_broadcast_arg -+ fi -+ -+ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 4 ) != 4 )); then - # Add a network route to the computed network address. - if [ $relmajor -lt 2 ] || \ - ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then -@@ -140,13 +161,18 @@ - route add default gw $router - done - fi -+ fi -+ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then - if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ]; - then - ifconfig $interface:0- inet 0 - ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg - route add -host $alias_ip_address $interface:0 - fi -+ fi -+ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 1 ) != 1 )); then - make_resolv_conf -+ fi - exit_with_hooks 0 - fi - -@@ -168,19 +194,24 @@ - fi - - if [ x$reason = xTIMEOUT ]; then -+ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then - if [ x$alias_ip_address != x ]; then - ifconfig $interface:0- inet 0 - fi - ifconfig $interface inet $new_ip_address $new_subnet_arg \ - $new_broadcast_arg -+ fi - set $new_routers - ############## what is -w in ping? - if ping -q -c 1 $1; then -+ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then - if [ x$new_ip_address != x$alias_ip_address ] && \ - [ x$alias_ip_address != x ]; then - ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg - route add -host $alias_ip_address dev $interface:0 - fi -+ fi -+ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 4 ) != 4 )); then - if [ $relmajor -lt 2 ] || \ - ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then - route add -net $new_network_number -@@ -188,10 +219,16 @@ - for router in $new_routers; do - route add default gw $router - done -+ fi -+ -+ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 1 ) != 1 )); then - make_resolv_conf -+ fi - exit_with_hooks 0 - fi -+ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then - ifconfig $interface inet 0 down -+ fi - exit_with_hooks 1 - fi - -diff -urN dhcp-3.0.3/common/parse.c dhcp-3.0.3-work/common/parse.c ---- dhcp-3.0.3/common/parse.c 2005-03-03 17:55:23.000000000 +0100 -+++ dhcp-3.0.3-work/common/parse.c 2005-10-19 18:43:28.000000000 +0200 -@@ -1270,6 +1270,10 @@ - option_hash_add (option -> universe -> hash, - (const char *)option -> name, - 0, option, MDL); -+#ifdef EXTENDED_NEW_OPTION_INFO -+ if ( new_option_info_tree != 0L ) -+ add_new_option_info( option ); -+#endif - return 1; - } - -diff -urN dhcp-3.0.3/common/tables.c dhcp-3.0.3-work/common/tables.c ---- dhcp-3.0.3/common/tables.c 2004-09-01 19:06:35.000000000 +0200 -+++ dhcp-3.0.3-work/common/tables.c 2005-10-19 18:43:28.000000000 +0200 -@@ -1238,3 +1238,40 @@ - fqdn_universe.name, 0, - &fqdn_universe, MDL); - } -+ -+#ifdef EXTENDED_NEW_OPTION_INFO -+#include -+ -+void *new_option_info_tree = 0L; -+ -+static int new_option_info_comparator( const void* p1, const void *p2 ) -+{ -+ uint32_t ocode1 = (((const struct option*)p1)->universe->index << 8) -+ |(((const struct option*)p1)->code), -+ ocode2 = (((const struct option*)p2)->universe->index << 8) -+ |(((const struct option*)p2)->code); -+ return( (ocode1 == ocode2) -+ ? 0 -+ :( ( ocode1 > ocode2 ) -+ ? 1 -+ : -1 -+ ) -+ ); -+} -+ -+void *add_new_option_info( struct option *option ) -+{ -+ if ( option->universe->index >= fqdn_universe.index ) -+ return 0L; -+ if ( new_option_info_tree == GENERATE_NEW_OPTION_INFO ) -+ new_option_info_tree = (void*)0L; -+ return tsearch( option, &(new_option_info_tree), new_option_info_comparator ); -+} -+ -+void *lookup_new_option_info( struct option *option ) -+{ -+ if ( new_option_info_tree == GENERATE_NEW_OPTION_INFO ) -+ return 0L; -+ return tfind( option, &(new_option_info_tree), new_option_info_comparator ); -+} -+#endif -diff -urN dhcp-3.0.3/includes/dhcpd.h dhcp-3.0.3-work/includes/dhcpd.h ---- dhcp-3.0.3/includes/dhcpd.h 2005-04-30 01:10:57.000000000 +0200 -+++ dhcp-3.0.3-work/includes/dhcpd.h 2005-10-19 18:43:28.000000000 +0200 -@@ -1799,6 +1799,14 @@ - void initialize_common_option_spaces PROTO ((void)); - struct universe *config_universe; - -+#define EXTENDED_NEW_OPTION_INFO -+#ifdef EXTENDED_NEW_OPTION_INFO -+#define GENERATE_NEW_OPTION_INFO ((void*)1) -+extern void *new_option_info_tree; -+extern void *add_new_option_info( struct option*); -+extern void *lookup_new_option_info( struct option *); -+#endif -+ - /* stables.c */ - #if defined (FAILOVER_PROTOCOL) - extern failover_option_t null_failover_option; From vmiklos at frugalware.org Sat Jun 7 16:23:22 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 7 16:23:26 2008 Subject: [Frugalware-git] frugalware-current: qemuctl-0.2.1-1-i686 Message-ID: <20080607142322.1FA991190ACC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=46d8c3f5fe2208e5b6234f67d5d423b8c148b391 commit 46d8c3f5fe2208e5b6234f67d5d423b8c148b391 Author: Miklos Vajna Date: Sat Jun 7 16:07:06 2008 +0200 qemuctl-0.2.1-1-i686 - version bump diff --git a/source/gnome-extra/qemuctl/FrugalBuild b/source/gnome-extra/qemuctl/FrugalBuild index 9cf37b4..1eeb77f 100644 --- a/source/gnome-extra/qemuctl/FrugalBuild +++ b/source/gnome-extra/qemuctl/FrugalBuild @@ -2,19 +2,18 @@ # Maintainer: AlexExtreme pkgname=qemuctl -pkgver=0.2 -pkgrel=2 +pkgver=0.2.1 +pkgrel=1 pkgdesc="A small GUI for changing media etc. while QEMU is running." -depends=('gtk+2' 'glade' 'perl' 'perl-gtk2' 'qemu') +rodepends=('gtk+2' 'glade' 'perl' 'perl-gtk2' 'qemu') groups=('gnome-extra') archs=('i686' 'x86_64') -sha1sums=('d9262feac55942f86332603d69df425287c96c81') +_F_sourceforge_sep="None" Finclude sourceforge -up2date="$up2date | sed 's/qemuctl //'" source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-$pkgver.tar.gz) -_F_cd_path="${pkgname}${pkgver}" +sha1sums=('fa5f858af864604e83db9e5ee8444fb16b110501') build() { - Fcd + Fcd $pkgname$pkgver Fmakeinstall } From vmiklos at frugalware.org Sat Jun 7 16:23:22 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 7 16:23:27 2008 Subject: [Frugalware-git] frugalware-current: tree-1.5.2-1-i686 Message-ID: <20080607142322.31F021190ACD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=39661e17081a7916990569e0272ae38542e84494 commit 39661e17081a7916990569e0272ae38542e84494 Author: Miklos Vajna Date: Sat Jun 7 16:15:48 2008 +0200 tree-1.5.2-1-i686 - version bump diff --git a/source/base/tree/FrugalBuild b/source/base/tree/FrugalBuild index b09c781..1e9d468 100644 --- a/source/base/tree/FrugalBuild +++ b/source/base/tree/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=tree -pkgver=1.5.1 -pkgrel=2 +pkgver=1.5.2 +pkgrel=1 pkgdesc="List contents of directories in a tree-like format" url="ftp://mama.indstate.edu/linux/tree/" depends=('glibc>=2.7-3') @@ -11,13 +11,13 @@ groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="wget --passive-ftp -O - -q $url |grep tree |grep tgz|tail -n 1|cut -d '>' -f 2|cut -d '<' -f 1|sed 's/.tgz//'|cut -d - -f 2" source=($url/$pkgname-$pkgver.tgz) +sha1sums=('67022040700a440a68b08fbcb224d48d131714e3') build() { - Fcd $pkgname-${pkgver}.1 ## lol someone replaced the tarball + Fcd $pkgname-${pkgver} Fsed '^\(CFLAGS=\)-O2' "\1$CFLAGS" Makefile Fbuild } # optimization ok -sha1sums=('ca4145bf1d2957ff3f4e6af0f64ce92d102fd356') From vmiklos at frugalware.org Sat Jun 7 16:23:22 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 7 16:23:27 2008 Subject: [Frugalware-git] frugalware-current: mdadm-2.6.7-1-i686 Message-ID: <20080607142322.3BD651190ACE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3d24c44073beab18d45fa5b3bd94826ebc05e104 commit 3d24c44073beab18d45fa5b3bd94826ebc05e104 Author: Miklos Vajna Date: Sat Jun 7 16:18:26 2008 +0200 mdadm-2.6.7-1-i686 - version bump diff --git a/source/base/mdadm/FrugalBuild b/source/base/mdadm/FrugalBuild index acff3fc..59cf5d6 100644 --- a/source/base/mdadm/FrugalBuild +++ b/source/base/mdadm/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=mdadm -pkgver=2.6.6 +pkgver=2.6.7 pkgrel=1 pkgdesc="A tool for managing software RAID under Linux" url="http://www.kernel.org/pub/linux/utils/raid/mdadm/" @@ -11,10 +11,10 @@ makedepends=('groff>=1.19.2-3') groups=('base') archs=('i686' 'x86_64' 'ppc') backup=(etc/{mdadm.conf,sysconfig/mdadm}) -up2date="lynx -dump 'http://www.kernel.org/pub/linux/utils/raid/mdadm/?C=M;O=D'|grep mdadm-[0-9\.]*tar.bz2$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=($url/$pkgname-$pkgver.tar.bz2 $pkgname-2.5.1-cflags.diff \ +up2date="Flasttarbz2 http://www.kernel.org/pub/linux/utils/raid/mdadm/" +source=($url/$pkgname-$pkgver.tar.bz2 \ mdadm rc.mdadm rc.mdadm-{de,hu}.po) -signatures=("${source[0]}.sign" '' '' '' '' '') +signatures=("${source[0]}.sign" '' '' '' '') build() { diff --git a/source/base/mdadm/mdadm-2.5.1-cflags.diff b/source/base/mdadm/mdadm-2.5.1-cflags.diff deleted file mode 100644 index 79313d9..0000000 --- a/source/base/mdadm/mdadm-2.5.1-cflags.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur mdadm-2.5.1.orig/Makefile mdadm-2.5.1/Makefile ---- mdadm-2.5.1.orig/Makefile 2006-06-16 02:21:52.000000000 +0200 -+++ mdadm-2.5.1/Makefile 2006-06-16 03:38:37.000000000 +0200 -@@ -38,8 +38,8 @@ - KLIBC_GCC = gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32 - - CC = $(CROSS_COMPILE)gcc --CXFLAGS = -ggdb --CWFLAGS = -Wall -Werror -Wstrict-prototypes -+CFLAGS ?= -ggdb -Werror -+CWFLAGS = -Wall -Wstrict-prototypes - - ifdef DEBIAN - CPPFLAGS= -DDEBIAN -@@ -52,7 +52,7 @@ - CONFFILE2 = $(SYSCONFDIR)/mdadm/mdadm.conf - MAILCMD =/usr/sbin/sendmail -t - CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\" --CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) -+CFLAGS += $(CWFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) - - # If you want a static binary, you might uncomment these - # LDFLAGS = -static From vmiklos at frugalware.org Sat Jun 7 16:23:22 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 7 16:23:28 2008 Subject: [Frugalware-git] frugalware-current: include/util.sh: add a CFLAGS trick in Fmake() Message-ID: <20080607142322.4706E1190ACF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=429d47ebcd2c5972c2c8d9a5078a3bab7eb6f854 commit 429d47ebcd2c5972c2c8d9a5078a3bab7eb6f854 Author: Miklos Vajna Date: Sat Jun 7 16:18:51 2008 +0200 include/util.sh: add a CFLAGS trick in Fmake() diff --git a/source/include/util.sh b/source/include/util.sh index 44d433a..b66cc2a 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -548,7 +548,7 @@ Fmake() { Fconf "$@" Fmessage "Compiling..." if [ -f GNUmakefile -o -f makefile -o -f Makefile ]; then - make || Fdie + make CFLAGS="$CFLAGS" || Fdie elif [ -f setup.py ]; then python setup.py build "$@" || Fdie elif [ -f setup.rb ]; then From vmiklos at frugalware.org Sat Jun 7 16:23:22 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 7 16:23:29 2008 Subject: [Frugalware-git] frugalware-current: live-2008.06.05-1-i686 Message-ID: <20080607142322.534601190ACA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=09aaa74b336d9d8c53c05ec98d64c925e7907900 commit 09aaa74b336d9d8c53c05ec98d64c925e7907900 Author: Miklos Vajna Date: Sat Jun 7 16:20:25 2008 +0200 live-2008.06.05-1-i686 - version bump diff --git a/source/multimedia/live/FrugalBuild b/source/multimedia/live/FrugalBuild index bb3ec94..1ddd71a 100644 --- a/source/multimedia/live/FrugalBuild +++ b/source/multimedia/live/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=live -pkgver=2008.05.12 +pkgver=2008.06.05 pkgrel=1 pkgdesc="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming" url="http://www.live555.com/" @@ -11,7 +11,7 @@ groups=('multimedia') archs=('i686' 'x86_64') up2date="lynx -dump http://www.live555.com/liveMedia/public/|grep tar.gz$|sed 's/.*live.\(.*\)\.t.*/\1/;q'" source=(http://www.live555.com/liveMedia/public/live.$pkgver.tar.gz) -sha1sums=('cc707df16800297c39648a1980689a7226b2873d') +sha1sums=('2aa7f5f562648054eebd62445db72c1bf205180e') build() { From vmiklos at frugalware.org Sat Jun 7 16:23:22 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 7 16:23:30 2008 Subject: [Frugalware-git] frugalware-current: device-mapper-1.02.26-1-i686 Message-ID: <20080607142322.5CBF41190AD0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f7a3a0fbddb65240d80176dad8223c20476b08a2 commit f7a3a0fbddb65240d80176dad8223c20476b08a2 Author: Miklos Vajna Date: Sat Jun 7 16:21:29 2008 +0200 device-mapper-1.02.26-1-i686 - version bump diff --git a/source/lib/device-mapper/FrugalBuild b/source/lib/device-mapper/FrugalBuild index 417c9dd..0cf35d9 100644 --- a/source/lib/device-mapper/FrugalBuild +++ b/source/lib/device-mapper/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=device-mapper -pkgver=1.02.25 +pkgver=1.02.26 pkgrel=1 pkgdesc="Device mapper ioctl library." url="http://sources.redhat.com/dm/" From vmiklos at frugalware.org Sat Jun 7 16:23:22 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 7 16:23:30 2008 Subject: [Frugalware-git] frugalware-current: lvm2-2.02.37-1-i686 Message-ID: <20080607142322.66D511190AD1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e3468d063c757ee7a4ffdd16fb0af5a6568b4a09 commit e3468d063c757ee7a4ffdd16fb0af5a6568b4a09 Author: Miklos Vajna Date: Sat Jun 7 16:23:02 2008 +0200 lvm2-2.02.37-1-i686 - version bump diff --git a/source/apps/lvm2/FrugalBuild b/source/apps/lvm2/FrugalBuild index a14a6fc..e8797fe 100644 --- a/source/apps/lvm2/FrugalBuild +++ b/source/apps/lvm2/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=lvm2 -pkgver=2.02.36 +pkgver=2.02.37 pkgrel=1 pkgdesc="Logical Volume Manager 2 utilities" url="http://sources.redhat.com/lvm2/" From vmiklos at frugalware.org Sat Jun 7 16:30:03 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 7 16:30:04 2008 Subject: [Frugalware-git] frugalware-current: dhcp-3.0.7-1-i686 Message-ID: <20080607143003.55BB51190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e23b0dfd7024a9658f0f75d23e5cac924526a998 commit e23b0dfd7024a9658f0f75d23e5cac924526a998 Author: Miklos Vajna Date: Sat Jun 7 16:29:51 2008 +0200 dhcp-3.0.7-1-i686 - typo: add back dhclient.conf to source() diff --git a/source/network-extra/dhcp/FrugalBuild b/source/network-extra/dhcp/FrugalBuild index fb729f0..2e8ec0b 100644 --- a/source/network-extra/dhcp/FrugalBuild +++ b/source/network-extra/dhcp/FrugalBuild @@ -13,11 +13,12 @@ archs=('i686' 'x86_64') backup=('etc/dhcpd.conf') up2date="lynx -dump $url |grep dhcp-[0-9] |sed -ne 's/.*p-\(.*\).t.*/\1/;1 p'" source=(ftp://ftp.isc.org/isc/$pkgname/$pkgname-$pkgver.tar.gz \ - rc.dhcpd rc.dhcpd-hu.po README.Frugalware) + rc.dhcpd rc.dhcpd-hu.po README.Frugalware dhclient.conf) sha1sums=('d6e8fd6f8e3bd04930ff74b400fca6eb7a5c715a' \ '4b8d8813f497d3a9aa21eeb113ae965b7b7fdf81' \ 'fd70ba41e16c15d69529eeb216be103e042f3437' \ - '0510d9057df9dcf1c476961930f0ac65f7de87f9') + '0510d9057df9dcf1c476961930f0ac65f7de87f9' \ + 'ce6545dad5c371b269da8f689f6d3599feefc4da') subpkgs=('dhclient') subdescs=('The ISC DHCP client') subgroups=('network') From vmiklos at frugalware.org Sat Jun 7 16:54:09 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 7 16:54:10 2008 Subject: [Frugalware-git] frugalware-current: device-mapper-1.02.26-1-x86_64 Message-ID: <20080607145409.9B56E1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cb54bcb8abedce2091a397159a9c3128416cc70b commit cb54bcb8abedce2091a397159a9c3128416cc70b Author: Miklos Vajna Date: Sat Jun 7 16:53:55 2008 +0200 device-mapper-1.02.26-1-x86_64 - fix up x86_64 build diff --git a/source/lib/device-mapper/FrugalBuild b/source/lib/device-mapper/FrugalBuild index 0cf35d9..39fb6e6 100644 --- a/source/lib/device-mapper/FrugalBuild +++ b/source/lib/device-mapper/FrugalBuild @@ -17,6 +17,9 @@ signatures=($source.asc '') build() { + if [ "$CARCH" == "x86_64" ]; then + export CFLAGS="$CFLAGS -fPIC" + fi Fcd $pkgname.$pkgver Fpatchall Fmake From vmiklos at frugalware.org Sat Jun 7 18:02:25 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 7 18:02:27 2008 Subject: [Frugalware-git] pacman-tools: dg unrecord: use git reset --mixed instead of --soft and custom workarounds Message-ID: <20080607160225.7CF241190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=6481cda00035134cb71503c497c4bfff0301ef05 commit 6481cda00035134cb71503c497c4bfff0301ef05 Author: Miklos Vajna Date: Sat Jun 7 18:01:56 2008 +0200 dg unrecord: use git reset --mixed instead of --soft and custom workarounds diff --git a/darcs-git.py b/darcs-git.py index 1b91883..9faf55b 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -815,15 +815,7 @@ Options: if ret in ("n", "q"): sys.exit(0) print "Invalid response, try again!" - os.system("git reset --soft HEAD^ %s" % " ".join(argv)) - sock = os.popen("git diff --cached --name-status") - files = sock.readlines() - sock.close() - for i in files: - status, name = i.split("\t") - if status != "M": - files.remove(i) - os.system("git reset HEAD %s >/dev/null" % " ".join([i.split("\t")[1].strip() for i in files])) + os.system("git reset HEAD^ %s >/dev/null" % " ".join(argv)) print "Finished unrecording." def unpull(argv): From devil505linux at gmail.com Sat Jun 7 18:58:37 2008 From: devil505linux at gmail.com (Devil505) Date: Sat Jun 7 18:58:39 2008 Subject: [Frugalware-git] frugalware-current: quodlibet-plugins-20080601-1-i686 Message-ID: <20080607165837.EE6711190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d3c2e58e579cd3350678b0e7cac7a056f37d89ad commit d3c2e58e579cd3350678b0e7cac7a056f37d89ad Author: Devil505 Date: Sat Jun 7 18:46:42 2008 +0200 quodlibet-plugins-20080601-1-i686 * new package * closed feature request FS#1882 diff --git a/source/gnome-extra/quodlibet-plugins/FrugalBuild b/source/gnome-extra/quodlibet-plugins/FrugalBuild new file mode 100644 index 0000000..dded2eb --- /dev/null +++ b/source/gnome-extra/quodlibet-plugins/FrugalBuild @@ -0,0 +1,32 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=quodlibet-plugins +pkgver=20080601 +pkgrel=1 +pkgdesc="Some plugins for QuodLibet" +url="http://www.sacredchao.net/quodlibet/browser/trunk/plugins" +depends=('python' 'quodlibet' 'notification-daemon' 'cddb-py' 'dbus-python' 'gnome-python' 'python-musicbrainz2' 'lastfmsubmitd') +options=('scriptlet') +groups=('gnome-extra') +archs=('i686' 'x86_64') +Fpkgversep="_" +up2date="lynx -dump http://ftp.de.debian.org/debian/pool/main/q/$pkgname/ | sed 's/.orig.tar.gz/.tar.gz/g' | Flasttar" +source=(http://ftp.de.debian.org/debian/pool/main/q/$pkgname/${pkgname}_${pkgver}.orig.tar.gz) +_F_cd_path="$pkgname-$pkgver" +sha1sums=('19e9257782473bc116e10ec44cc3d2c51202a807') + +build() +{ + Fcd + Fmkdir usr/share/quodlibet/plugins/ + Fcp $pkgname-$pkgver/* usr/share/quodlibet/plugins/ + Fdirschmod usr/share/quodlibet/plugins/editing 755 + Fdirschmod usr/share/quodlibet/plugins/playorder 755 + Fdirschmod usr/share/quodlibet/plugins/events 755 + Fdirschmod usr/share/quodlibet/plugins/songsmenu 755 + Ffileschmod usr/share/quodlibet/plugins/editing/*.py 644 + Ffileschmod usr/share/quodlibet/plugins/playorder/*.py 644 + Ffileschmod usr/share/quodlibet/plugins/events/*.py 644 + Ffileschmod usr/share/quodlibet/plugins/songsmenu/*.py 644 +} From vmiklos at frugalware.org Sat Jun 7 19:14:44 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 7 19:14:44 2008 Subject: [Frugalware-git] frugalware-current: gcc-4.1-4.1.2-1-i686 Message-ID: <20080607171444.1FF5D1190ACA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=efe2c6fe56a5fe820d00e21ab546d7dcbeb1dc5c commit efe2c6fe56a5fe820d00e21ab546d7dcbeb1dc5c Author: Miklos Vajna Date: Sat Jun 7 19:13:20 2008 +0200 gcc-4.1-4.1.2-1-i686 - new package - adding a minila (c/c++-only) -4.1 compiler, since it's really needed for some broken packages, like virtualbox diff --git a/source/devel-extra/gcc-4.1/FrugalBuild b/source/devel-extra/gcc-4.1/FrugalBuild new file mode 100644 index 0000000..f026bf6 --- /dev/null +++ b/source/devel-extra/gcc-4.1/FrugalBuild @@ -0,0 +1,64 @@ +# Compiling Time: 4.43 SBU +# Contributor: VMiklos +# Maintainer: Janny + +pkgname=gcc-4.1 +pkgver=4.1.2 +pkgrel=1 +pkgdesc="The GNU Compiler Collection (4.1.x series)" +url="http://gcc.gnu.org/gcc-4.1/" +depends=('binutils' 'libstdc++') +groups=('devel-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump $url |grep 'GCC.*[0-9]$' |sed -n 's/.*C \(.*\)/\1/;1 p'" +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.bz2) +sha1sums=('7981b8d1b58b10ddfd7d5142eab16352d9206f3b') +[ "$CARCH" == "x86_64" ] && Fconfopts="$Fconfopts --libdir=/usr/lib --disable-multilib" + +build() +{ + Fcd gcc-$pkgver + Fsed '../lib64 ../lib' '. ../lib' gcc/config/i386/t-linux64 + mkdir ../$pkgname-build + cd ../$pkgname-build + CC="$FCC gcc" CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" XCFLAGS="$CFLAGS" \ + TCFLAGS="$CFLAGS" \ + ../gcc-$pkgver/configure $Fconfopts \ + --enable-languages=c,c++ --enable-threads=posix \ + --enable-__cxa_atexit --program-suffix=-4.1 + + make STAGE_CC_WRAPPER="$FCC" BOOT_CFLAGS="$CFLAGS" bootstrap || return 1 + + Fmakeinstall + + # include/ contains install-tools/include/* and headers that were fixed + # up by fixincludes, we don't want former + for i in `find $Fdestdir/usr/lib/gcc/$CHOST/$pkgver/include/ -name \*.h` + do + if grep -q 'It has been auto-edited by fixincludes from' \ + $i; then + rm -f $i + fi + done + + Frm '/usr/bin/c++filt*' /usr/lib/libiberty.a + Fmkdir /lib + Fln ../usr/bin/cpp-4.1 /lib/cpp-4.1 + Fln gcc-4.1 /usr/bin/cc-4.1 + Fln g++-4.1 /usr/bin/c++-4.1 + # conflicts + Frm usr/lib/libobjc.* + Frm usr/man/man1/{cpp.1,gcov.1} /usr/man/man7 + Frm usr/info/gccinstall.info + Frm usr/share/locale/*/LC_MESSAGES/gcc.mo + Frm usr/lib/libstdc++.{a,la,so} + Frm usr/lib/libsupc++.* + Frm usr/share/locale/*/LC_MESSAGES/libstdc++.mo + Frm usr/lib/libstdc++.* + Frm usr/lib/libgcc_* + Frm usr/lib/libmudflap.* usr/lib/libmudflapth.* + Frm usr/lib/libssp.* usr/lib/libssp_nonshared.* + Frm usr/share/locale/*/LC_MESSAGES/cpplib.mo +} + +# optimization ok From vmiklos at frugalware.org Sat Jun 7 19:21:32 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 7 19:21:34 2008 Subject: [Frugalware-git] frugalware-current: java-gcj-compat-1.0.78-1-i686 Message-ID: <20080607172132.AC6191190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=14a82e494714750845b7de4133b1693a5b0b36e8 commit 14a82e494714750845b7de4133b1693a5b0b36e8 Author: Miklos Vajna Date: Sat Jun 7 19:21:20 2008 +0200 java-gcj-compat-1.0.78-1-i686 - rebuilt with gcc-4.3.1 diff --git a/source/devel-extra/java-gcj-compat/FrugalBuild b/source/devel-extra/java-gcj-compat/FrugalBuild index 16c1767..4c796b7 100644 --- a/source/devel-extra/java-gcj-compat/FrugalBuild +++ b/source/devel-extra/java-gcj-compat/FrugalBuild @@ -4,7 +4,7 @@ pkgname=java-gcj-compat pkgver=1.0.78 pkgrel=1 -gccver=4.3.0 +gccver=4.3.1 javaver="1.5.0-gcj-1.5.0.0" pkgdesc="A collection of wrapper scripts, symlinks and jar files." url="ftp://sources.redhat.com/pub/rhug/" From janny at frugalware.org Sat Jun 7 19:40:11 2008 From: janny at frugalware.org (Janos Kovacs) Date: Sat Jun 7 19:40:13 2008 Subject: [Frugalware-git] frugalware-current: virtualbox-1.6.2-1-i686 Message-ID: <20080607174011.E8D051190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=583a8b4bdc697d8b8f39478918b3675b1fc52b5f commit 583a8b4bdc697d8b8f39478918b3675b1fc52b5f Author: Janos Kovacs Date: Sat Jun 7 19:33:50 2008 +0200 virtualbox-1.6.2-1-i686 * review FrugalBuild * deleted unnecessary patchs * closes FS#2875 diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index ae9ddb7..3d17713 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -1,39 +1,33 @@ # Compiling Time: 3.03 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs # Contributor: AlexExtreme pkgname=virtualbox realname=VirtualBox -pkgver=1.5.6_1 -pkgrel=9 +pkgver=1.6.2 +pkgrel=1 pkgdesc="InnoTek VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use." url="http://www.virtualbox.org" -_F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module -depends=(${depends[@]} 'gcc' 'xerces-c>=2.8.0' 'xalan-c>=1.10.0-2' 'iasl' 'dev86' 'libxslt' 'libxcursor' 'qt' 'libidl' 'sdl' \ - 'hal' 'libstdc++5' 'alsa-lib') +_F_kernelmod_scriptlet=${pkgname}.install +depends=(${depends[@]} 'xerces-c>=2.8.0' 'xalan-c>=1.10.0-2' 'iasl' 'dev86' 'libxslt' 'libxcursor' 'qt' 'libidl' 'sdl' \ + 'hal' 'libstdc++5' 'alsa-lib' 'qt4') +makedepends=(${makedepends[@]} 'gcc-4.1') # For get-vbox-additions rodepends=('wget') groups=('xapps-extra') archs=('i686' '!x86_64') up2date="lynx -dump http://www.virtualbox.org/wiki/Downloads | grep 'OSE tarball' | sed 's/.*VirtualBox //' | sed 's/ OSE.*//'" -source=(http://www.virtualbox.org/download/$(echo $pkgver|sed 's/_.*//')/${realname}-${pkgver/_/-}_OSE.tar.bz2 \ - vboxsvc virtualbox get-vbox-additions README.Frugalware 60-virtualbox.rules \ - use-o3-to-workaround-gcc-ice.diff virtualbox-gcc43-fixes.diff virtualbox-validate-op-gcc43.diff \ - kernel-2.6.25.patch) -sha1sums=('1cb11c012b9143e14f2eada645757cae8886d0d1' \ +source=(http://www.virtualbox.org/download/${pkgver}/${realname}-${pkgver}-OSE.tar.bz2 \ + vboxsvc virtualbox get-vbox-additions README.Frugalware 60-virtualbox.rules) +_F_cd_path="${realname}-${pkgver}" +options=('scriptlet' 'genscriptlet') +sha1sums=('6811a580b70e651f36002f344033e1db1858fdef' \ 'e32ebff11bb235b50f8826b70d85dbcf4a56aee4' \ '3c0c856b9ad5f186405e87cf6eac09f1060b62cd' \ '07f49d0c5fac8311ec87d1a38a981de9ba3a4e07' \ '155be5405f4c91e5c7f4a51b5bac8fc4760a894c' \ - 'b9cb188f62148603b78a0b8c04b6fff369bb7b62' \ - 'f8875f474975d33ef2c8707bde4710c7c72f9727' \ - '17f6f99a344ac9a088fef826249a38e6cce2c11d' \ - 'c2d014abf3801f0a87142fc3a6d08a782cd5ef9c' \ - '6dfbfe1c50b78b17a6091e229abef77bf6e084ee') -_F_cd_path="${realname}-$(echo $pkgver|sed 's/_.*//')_OSE" -vboxrealpkgver="$(echo $pkgver|sed 's/_.*//')" -options=('scriptlet') + 'b9cb188f62148603b78a0b8c04b6fff369bb7b62') _F_desktop_name="$realname" _F_desktop_desc="InnoTek VirtualBox virtualization program" @@ -43,11 +37,6 @@ _F_desktop_categories="System;" build() { Fcd - Fpatchall - - # Desktop file - Ffilerel src/VBox/Installer/linux/VBox.png /usr/share/pixmaps/vbox.png - Fdesktop2 ## yeah fscking realize is 2007 and xfree died long time ago .. WTH! Fsed '/usr/X11R6/bin/xterm' '/usr/bin/xterm' \ @@ -56,26 +45,12 @@ build() { Fsed 'X11R6/' '' Config.kmk # Configure and load our options - ./configure \ - --disable-pulse \ - --with-xalan="-lxalan-c" \ - --with-xerces="-lxerces-c" \ - --with-qt-dir="/usr/lib/qt" || Fdie + ./configure --with-gcc-compat=/usr/bin/gcc-4.1 --disable-pulse || Fdie source ./env.sh || Fdie - # Build verbose so we can see what this *nice* kmk is doing ... -- crazy -- - # FIXME: figure the other kmk crap switches and force building with our LDFLAGS etc -- crazy -- - #kmk KBUILD_VERBOSE=2 \ - # TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" TOOL_GCC3_LDFLAGS="${LDFLAGS}" \ - # TOOL_GCC3_CFLAGS.release="${CFLAGS}" TOOL_GCC3_CXXFLAGS.release="${CXXFLAGS}" all || Fdie - kmk KBUILD_VERBOSE=2 all || Fdie # Kernel module - # Always create the dirs before 'make ...' because there is a check to test the dirs - # Anyway this is a 'chroot|cross building' problem only -- crazy -- - # FIXME: kill that from here and use the kernel-module-src tarball - # there is no need to rebuild all that while an kernel bump -- crazy -- Fmkdir ${_F_kernelmod_dir}/kernel/misc cd out/linux.x86/release/bin/src || Fdie make KERN_DIR=${_F_kernelmod_dir}/build MODULE_DIR_TST=$Fdestdir/${_F_kernelmod_dir} \ @@ -89,18 +64,20 @@ build() { rm -rf sdk src tst* testcase additions/src || Fdie rm -f vboxdrv.ko SUPInstall SUPUninstall || Fdie cp -R * $Fdestdir/usr/lib/VirtualBox/ || Fdie - ## FIXME: that has to be done different - crazy - for each in VBox{BFE,Manage,SDL,SVC,XPCOMIPCD,Tunctl} VirtualBox vditool additions/vboxadd-timesync ; do chmod 0755 $Fdestdir/usr/lib/VirtualBox/${each} || Fdie done + # Desktop file + Fln "/usr/lib/VirtualBox/VBox.png" "/usr/share/pixmaps/vbox.png" + Fdesktop2 + # Install the wrappers - # FIXME: these wrappers are weird , do it different in 0.9 -- crazy -- Fexerel $Fsrcdir/vboxsvc /usr/bin/vboxsvc Fexerel $Fsrcdir/virtualbox /usr/bin/virtualbox - ## do it automagically so we don't forget to bump the version by accident =) (FS#2760) Fsed "version=" "version=$vboxrealpkgver" $Fsrcdir/get-vbox-additions Fexerel $Fsrcdir/get-vbox-additions /usr/bin/get-vbox-additions + ## udev rule Fexerel $Fsrcdir/60-virtualbox.rules /etc/udev/rules.d/60-virtualbox.rules diff --git a/source/xapps-extra/virtualbox/kernel-2.6.25.patch b/source/xapps-extra/virtualbox/kernel-2.6.25.patch deleted file mode 100644 index 41f1b60..0000000 --- a/source/xapps-extra/virtualbox/kernel-2.6.25.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff -ur virtualbox-ose_1.5.6/r0drv/linux/the-linux-kernel.h virtualbox-ose/r0drv/linux/the-linux-kernel.h ---- src/VBox/Runtime/r0drv/linux/the-linux-kernel.h 2008-02-23 11:10:06.000000000 +0100 -+++ src/VBox/Runtime/r0drv/linux/the-linux-kernel.h 2008-02-27 01:57:20.000000000 +0100 -@@ -225,12 +225,16 @@ - #undef bool - - /* -- * There are post-2.6.24 kernels (confusingly with unchanged version number) -- * which eliminate macros which were marked as deprecated. -+ * The 2.6.25 kernel eliminates macros that were marked as deprecated and eliminates -+ * routine change_page_attr() in favor of the set_pages_* API. - */ - #ifndef __attribute_used__ - #define __attribute_used__ __used - #endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) -+int change_page_attr(struct page *page, int numpages, pgprot_t prot); -+#endif -+ - #endif - -diff -ur virtualbox-ose_1.5.6/linux/SUPDrv-linux.c virtualbox-ose/linux/SUPDrv-linux.c ---- src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2008-02-23 11:10:05.000000000 +0100 -+++ src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2008-02-27 01:54:17.000000000 +0100 -@@ -2069,6 +2069,17 @@ - /* GCC C++ hack. */ - unsigned __gxx_personality_v0 = 0xcccccccc; - -+/* Add the change_page_attr routine for kernels 2.6.25 or later */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) -+int change_page_attr(struct page *page, int numpages, pgprot_t prot) -+{ -+ /* use the set_pages_* API */ -+ if (pgprot_val(prot) & _PAGE_NX) -+ set_pages_nx(page, numpages); -+ set_pages_uc(page, numpages); -+ return 0; -+} -+#endif - - module_init(VBoxSupDrvInit); - module_exit(VBoxSupDrvUnload); -Index: src/VBox/Additions/linux/sharedfolders/vfsmod.c -=================================================================== ---- src/VBox/Additions/linux/sharedfolders/vfsmod.c (revision 7549) -+++ src/VBox/Additions/linux/sharedfolders/vfsmod.c (revision 7550) -@@ -224,7 +224,11 @@ - sb->s_blocksize = 1024; - sb->s_op = &sf_super_ops; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25) -+ iroot = iget_locked (sb, 0); -+#else - iroot = iget (sb, 0); -+#endif - if (!iroot) { - err = -ENOMEM; /* XXX */ - LogFunc(("could not get root inode\n")); -@@ -234,6 +238,10 @@ - sf_init_inode (sf_g, iroot, &fsinfo); - SET_INODE_INFO (iroot, sf_i); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25) -+ unlock_new_inode(iroot); -+#endif -+ - droot = d_alloc_root (iroot); - if (!droot) { - err = -ENOMEM; /* XXX */ -@@ -296,10 +304,12 @@ - the only thing that is known about inode at this point is its index - hence we can't do anything here, and let lookup/whatever with the - job to properly fill then [inode] */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 25) - static void - sf_read_inode (struct inode *inode) - { - } -+#endif - - /* vfs is done with [sb] (umount called) call [sf_glob_free] to unmap - the folder and free [sf_g] */ -@@ -337,7 +347,9 @@ - - static struct super_operations sf_super_ops = { - .clear_inode = sf_clear_inode, -+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 25) - .read_inode = sf_read_inode, -+#endif - .put_super = sf_put_super, - .statfs = sf_statfs, - .remount_fs = sf_remount_fs -Index: src/VBox/Additions/linux/sharedfolders/dirops.c -=================================================================== ---- src/VBox/Additions/linux/sharedfolders/dirops.c (revision 7549) -+++ src/VBox/Additions/linux/sharedfolders/dirops.c (revision 7550) -@@ -291,7 +291,11 @@ - } - - ino = iunique (parent->i_sb, 1); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25) -+ inode = iget_locked (parent->i_sb, ino); -+#else - inode = iget (parent->i_sb, ino); -+#endif - if (!inode) { - LogFunc(("iget failed\n")); - err = -ENOMEM; /* XXX: ??? */ -@@ -301,6 +305,10 @@ - SET_INODE_INFO (inode, sf_new_i); - sf_init_inode (sf_g, inode, &fsinfo); - sf_new_i->path = path; -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25) -+ unlock_new_inode(inode); -+#endif - } - - sf_i->force_restat = 0; -@@ -342,7 +350,11 @@ - } - - ino = iunique (parent->i_sb, 1); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25) -+ inode = iget_locked (parent->i_sb, ino); -+#else - inode = iget (parent->i_sb, ino); -+#endif - if (!inode) { - LogFunc(("iget failed. caller=%s\n", caller)); - err = -ENOMEM; -@@ -358,6 +370,11 @@ - sf_new_i->force_restat = 1; - - d_instantiate (dentry, inode); -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25) -+ unlock_new_inode(inode); -+#endif -+ - return 0; - - fail1: diff --git a/source/xapps-extra/virtualbox/use-o3-to-workaround-gcc-ice.diff b/source/xapps-extra/virtualbox/use-o3-to-workaround-gcc-ice.diff deleted file mode 100644 index f3346be..0000000 --- a/source/xapps-extra/virtualbox/use-o3-to-workaround-gcc-ice.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- src/recompiler/Makefile.kmk -+++ src/recompiler/Makefile.kmk -@@ -231,9 +231,9 @@ - - # Extra flags for these source modules. - target-i386/op.c_CFLAGS = -O2 -fno-strict-aliasing -fomit-frame-pointer -falign-functions=0 -fno-reorder-blocks -fno-optimize-sibling-calls --target-i386/op.c_CFLAGS.x86 = -fno-gcse -fno-instrument-functions -mpreferred-stack-boundary=2 -+target-i386/op.c_CFLAGS.x86 = -O3 -fno-gcse -fno-instrument-functions -mpreferred-stack-boundary=2 - target-i386/op.c_CFLAGS.darwin.x86 = -m128bit-long-double -mpreferred-stack-boundary=4 --target-i386/helper.c_CFLAGS.x86 = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse -+target-i386/helper.c_CFLAGS.x86 = -O3 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse - cpu-exec.c_CFLAGS.x86 = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse - - diff --git a/source/xapps-extra/virtualbox/virtualbox-gcc43-fixes.diff b/source/xapps-extra/virtualbox/virtualbox-gcc43-fixes.diff deleted file mode 100644 index a508fb2..0000000 --- a/source/xapps-extra/virtualbox/virtualbox-gcc43-fixes.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- src/VBox/Main/VMMDevInterface.cpp.old 2008-01-27 16:50:02.000000000 +0100 -+++ src/VBox/Main/VMMDevInterface.cpp 2008-01-27 16:50:28.000000000 +0100 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #ifdef VBOX_HGCM - #include "hgcm/HGCM.h" ---- src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp.old 2008-01-27 16:49:32.000000000 +0100 -+++ src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp 2008-01-27 16:49:48.000000000 +0100 -@@ -28,6 +28,8 @@ - #include "VBoxRegistrationDlg.h" - #endif - -+#include -+ - #include - #include - #include diff --git a/source/xapps-extra/virtualbox/virtualbox-validate-op-gcc43.diff b/source/xapps-extra/virtualbox/virtualbox-validate-op-gcc43.diff deleted file mode 100644 index 34ac3ba..0000000 --- a/source/xapps-extra/virtualbox/virtualbox-validate-op-gcc43.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/recompiler/InnoTek/op-validate.sed -=================================================================== ---- src/recompiler/InnoTek/op-validate.sed.orig -+++ src/recompiler/InnoTek/op-validate.sed -@@ -63,6 +63,8 @@ s/^[[:blank:]]*ret[[:blank:]]*\n*[[:blan - /\.Lfe[0-9][0-9]*:/d - /\.LFE[0-9][0-9]*:/d - /size[[:space:]]/d -+/p2align[[:space:]]/d -+/^[/#][[:space:]]0[[:space:]]\"\"[[:space:]]2[[:space:]]*$/d - /^[/#]NO_APP[[:space:]]*$/d - /^$/!b bad - b end From devil505linux at gmail.com Sun Jun 8 08:10:19 2008 From: devil505linux at gmail.com (Devil505) Date: Sun Jun 8 08:10:20 2008 Subject: [Frugalware-git] frugalware-current: tunapie-2.1.7-1-i686 Message-ID: <20080608061019.03DF71190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=60d3d6a782a07a2ed24051832ed76f67776b3f4e commit 60d3d6a782a07a2ed24051832ed76f67776b3f4e Author: Devil505 Date: Sun Jun 8 08:09:54 2008 +0200 tunapie-2.1.7-1-i686 * version bump diff --git a/source/xapps-extra/tunapie/FrugalBuild b/source/xapps-extra/tunapie/FrugalBuild index b87246d..8ea8cf1 100755 --- a/source/xapps-extra/tunapie/FrugalBuild +++ b/source/xapps-extra/tunapie/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=tunapie -pkgver=2.1.6 +pkgver=2.1.7 pkgrel=1 pkgdesc="A directory browser for internet radio and TV streams" _F_sourceforge_broken_up2date=1 @@ -10,7 +10,7 @@ Finclude sourceforge depends=('python>=2.3' 'wxpython>=2.6') groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('6deb303c03b3fad432162adec4efae1338d9de4b') +sha1sums=('9ffcf066e764c67502fd8f5662aa54b2197c00f2') _F_cd_path="$pkgname-$pkgver/src" build() { @@ -30,22 +30,22 @@ build() { Fmkdir /etc # setup to the right path - Fsed 'usr/local/' 'usr/' ../tunapie + Fsed 'usr/local/' 'usr/' ../$pkgname # install Tunapie files - Finstallrel 755 ../tunapie /usr/bin + Finstallrel 755 ../$pkgname /usr/bin Finstallrel 644 ./*.py usr/share/$pkgname Finstallrel 644 ./*.pyc usr/share/$pkgname Finstallrel 644 ./*.png usr/share/$pkgname Ficonrel tplogo.xpm - Finstallrel 644 ../tunapie.desktop usr/share/applications + Finstallrel 644 ../$pkgname.desktop usr/share/applications # install manual - Finstallrel 644 ../tunapie.1 usr/man/man1 + Finstallrel 644 ../$pkgname.1 usr/man/man1 # switch adult tv off - echo 0 >tunapie.config - Finstallrel 644 tunapie.config /etc + echo 0 >$pkgname.config + Finstallrel 644 $pkgname.config /etc } From janny at frugalware.org Sun Jun 8 09:37:42 2008 From: janny at frugalware.org (Janos Kovacs) Date: Sun Jun 8 09:37:44 2008 Subject: [Frugalware-git] frugalware-current: gadmin-dhcpd-0.4.4-1-i686 Message-ID: <20080608073742.AA9311190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=35fb120a8528dfb9b910b7c35f96f2c20d4f7a76 commit 35fb120a8528dfb9b910b7c35f96f2c20d4f7a76 Author: Janos Kovacs Date: Sun Jun 8 09:37:17 2008 +0200 gadmin-dhcpd-0.4.4-1-i686 * version bump diff --git a/source/xapps-extra/gadmin-dhcpd/FrugalBuild b/source/xapps-extra/gadmin-dhcpd/FrugalBuild index 3df633b..8030a20 100644 --- a/source/xapps-extra/gadmin-dhcpd/FrugalBuild +++ b/source/xapps-extra/gadmin-dhcpd/FrugalBuild @@ -1,8 +1,8 @@ # Compiling time: 0.05 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=gadmin-dhcpd -pkgver=0.4.3 +pkgver=0.4.4 pkgrel=1 pkgdesc="GDHCPD == A GTK+ administration tool for the ISC DHCPD server." url="http://www.gadmintools.org" @@ -12,7 +12,7 @@ archs=('i686' 'x86_64') groups=('xapps-extra') up2date="lynx -dump http://mange.dynalias.org/linux/${pkgname}/|Flasttar" source=(http://mange.dynalias.org/linux/${pkgname}/${pkgname}-${pkgver}.tar.gz desktop.patch) -sha1sums=('c102a0095bf89f35a4645a3e4bad474cf5d081a2' \ +sha1sums=('be46c24e585ab1349c170e15c8144d182b113304' \ '1ff79153e987fa5bd01986f63d53d61821a628eb') provides=('gdhcpd') conflicts=('gdhcpd') From voroskoi at frugalware.org Sun Jun 8 10:43:51 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 10:43:53 2008 Subject: [Frugalware-git] frugalware-current: klavaro-1.0.8-1-i686 Message-ID: <20080608084351.401391190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=79e9a86ef54808c4baf9fa60b8f99ea6317ece97 commit 79e9a86ef54808c4baf9fa60b8f99ea6317ece97 Author: voroskoi Date: Sun Jun 8 10:43:21 2008 +0200 klavaro-1.0.8-1-i686 version bump diff --git a/source/xapps-extra/klavaro/FrugalBuild b/source/xapps-extra/klavaro/FrugalBuild index 659389d..e698d64 100644 --- a/source/xapps-extra/klavaro/FrugalBuild +++ b/source/xapps-extra/klavaro/FrugalBuild @@ -1,8 +1,8 @@ -# Compiling Time: ~0.1 SBU +# Compiling Time: 0.08 SBU # Maintainer: voroskoi pkgname=klavaro -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=1 pkgdesc="Klavaro is just another free touch typing tutor program." depends=('gtk+2') @@ -11,6 +11,6 @@ archs=('i686' 'x86_64') _F_sourceforge_ext=.tar.bz2 Finclude sourceforge up2date="lynx -dump http://klavaro.sourceforge.net/en/index.html |grep bz2 |sed -ne 's/.*o-\(.*\).t.*/\1/;1p'" -sha1sums=('6dc0974f3ac37d5e5ef1c11f32a3a6456f9d84b5') +sha1sums=('12ee0ebe6c88c56acc8d46378f35193c7887e920') # optimization OK From janny at frugalware.org Sun Jun 8 11:53:24 2008 From: janny at frugalware.org (Janos Kovacs) Date: Sun Jun 8 11:53:25 2008 Subject: [Frugalware-git] frugalware-current: virtualbox-1.6.2-2-i686 Message-ID: <20080608095324.B4ECB1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f705a2cf6e46d019d748163ab9273006980d47c5 commit f705a2cf6e46d019d748163ab9273006980d47c5 Author: Janos Kovacs Date: Sun Jun 8 11:50:12 2008 +0200 virtualbox-1.6.2-2-i686 * rebuild with release bump * remove qt4 in depends() diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index 3d17713..1e039cf 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -1,17 +1,17 @@ -# Compiling Time: 3.03 SBU +# Compiling Time: 12.93 SBU # Maintainer: Janos Kovacs # Contributor: AlexExtreme pkgname=virtualbox realname=VirtualBox pkgver=1.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="InnoTek VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use." url="http://www.virtualbox.org" Finclude kernel-module _F_kernelmod_scriptlet=${pkgname}.install depends=(${depends[@]} 'xerces-c>=2.8.0' 'xalan-c>=1.10.0-2' 'iasl' 'dev86' 'libxslt' 'libxcursor' 'qt' 'libidl' 'sdl' \ - 'hal' 'libstdc++5' 'alsa-lib' 'qt4') + 'hal' 'libstdc++5' 'alsa-lib') makedepends=(${makedepends[@]} 'gcc-4.1') # For get-vbox-additions rodepends=('wget') From ryuo at frugalware.org Sun Jun 8 12:17:34 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 8 12:17:36 2008 Subject: [Frugalware-git] frugalware-current: xf86-input-evtouch-0.8.7-1-i686 Message-ID: <20080608101734.C295B1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f88d5545f39354274b1a918616db1a53ff0e3f10 commit f88d5545f39354274b1a918616db1a53ff0e3f10 Author: James Buren Date: Sun Jun 8 05:14:26 2008 -0500 xf86-input-evtouch-0.8.7-1-i686 * new package, no build for now diff --git a/source/x11-extra/xf86-input-evtouch/FrugalBuild b/source/x11-extra/xf86-input-evtouch/FrugalBuild new file mode 100644 index 0000000..42d7f9a --- /dev/null +++ b/source/x11-extra/xf86-input-evtouch/FrugalBuild @@ -0,0 +1,33 @@ +# Compiling Time: 0.06 SBU +# Maintainer: James Buren + +pkgname=xf86-input-evtouch +pkgver=0.8.7 +pkgrel=1 +pkgdesc="XOrg input driver for touchscreens" +url="http://www.conan.de/touchscreen/evtouch.html" +depends=('glibc') +makedepends=('xorg-server' 'randrproto') +groups=('x11-extra') +archs=('i686' 'x86_64') +# leave no build until this can be properly reviewed +options=('nobuild') +up2date="Flasttar $url" +source=(http://www.conan.de/touchscreen/$pkgname-$pkgver.tar.bz2 \ + # borrowed from debian + $pkgname-$pkgver-xorg-1.4.patch) +sha1sums=('d8180ea721f00d833756d894075f84920d1082ac' \ + '4002abb765a77451035a25e45e479b623960fba7') + +build() +{ + # correct path of data file for ev_calibrate + Fsed 'CURSORDIRECTORY"/empty_cursor.xbm"' 'CURSORDIRECTORY"/usr/share/'$pkgname'/empty_cursor.xbm"' ev_calibrate.c + # convert font to one that is universal to most xorg installs + Fsed 'helvetica' 'fixed' ev_calibrate.c + Fbuild --enable-evcalibrate --enable-udevinstall + Fln /usr/lib/$pkgname/calibrate.sh /usr/sbin/calibrate.sh + Fln /usr/lib/$pkgname/ev_calibrate /usr/sbin/ev_calibrate +} + +# optimization OK diff --git a/source/x11-extra/xf86-input-evtouch/xf86-input-evtouch-0.8.7-xorg-1.4.patch b/source/x11-extra/xf86-input-evtouch/xf86-input-evtouch-0.8.7-xorg-1.4.patch new file mode 100644 index 0000000..3a60d4f --- /dev/null +++ b/source/x11-extra/xf86-input-evtouch/xf86-input-evtouch-0.8.7-xorg-1.4.patch @@ -0,0 +1,22 @@ +Index: xserver-xorg-input-evtouch/evtouch.c +=================================================================== +--- xserver-xorg-input-evtouch.orig/evtouch.c 2007-09-17 17:20:21.736761738 +0900 ++++ xserver-xorg-input-evtouch/evtouch.c 2007-09-17 17:31:22.274403633 +0900 +@@ -492,9 +492,6 @@ DeviceOn (DeviceIntPtr dev) + + priv->buffer = XisbNew(local->fd, 64); + +- DBG (9, XisbTrace (priv->buffer, 1)); +- +- + if (!priv->buffer) + { + xf86CloseSerial(local->fd); +@@ -1207,7 +1204,6 @@ EVTouchPreInit(InputDriverPtr drv, IDevP + priv->diff[i][0], priv->diff[i][1]); + } + +- xf86AlwaysCore(local, TRUE); + priv->touch_flags = 0; + + local->history_size = xf86SetIntOption( local->options, "HistorySize", 0 ); From voroskoi at frugalware.org Sun Jun 8 12:37:42 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 12:37:54 2008 Subject: [Frugalware-git] frugalware-current: gnome-vfs-2.22.0-2-x86_64 Message-ID: <20080608103742.A92091190ACA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5ec4a26b913c35d81ee56ef27614c6d44534c8d6 commit 5ec4a26b913c35d81ee56ef27614c6d44534c8d6 Author: voroskoi Date: Wed Jun 4 21:57:14 2008 +0200 gnome-vfs-2.22.0-2-x86_64 rebuilt with heimdal-1.2 diff --git a/source/gnome/gnome-vfs/FrugalBuild b/source/gnome/gnome-vfs/FrugalBuild index 6a79882..a04142d 100644 --- a/source/gnome/gnome-vfs/FrugalBuild +++ b/source/gnome/gnome-vfs/FrugalBuild @@ -4,11 +4,11 @@ pkgname=gnome-vfs pkgver=2.22.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME Virtual File System" url="http://www.gnome.org/" depends=('gconf>=2.22.0' 'bzip2' 'hal>=0.5.8.1' 'dbus-glib>=0.74-2' 'gnome-mime-data' 'gamin>=0.1.9-2' \ - 'avahi-glib>=0.6.17' 'xfsprogs-acl' 'heimdal>=1.1' 'db>=4.6.18' 'pmount') + 'avahi-glib>=0.6.17' 'xfsprogs-acl' 'heimdal>=1.2' 'db>=4.6.18' 'pmount') makedepends=('intltool' 'gtk-doc>=1.9' 'samba') rodepends=('gnome-mount>=0.6') groups=('gnome' 'gnome-minimal') From voroskoi at frugalware.org Sun Jun 8 12:37:42 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 12:37:56 2008 Subject: [Frugalware-git] frugalware-current: heimdal-1.2-1-x86_64 Message-ID: <20080608103742.792181190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0b63d926a002dd6445578accc944de8fe774ab7b commit 0b63d926a002dd6445578accc944de8fe774ab7b Author: voroskoi Date: Wed Jun 4 21:26:25 2008 +0200 heimdal-1.2-1-x86_64 version bump diff --git a/source/lib/heimdal/FrugalBuild b/source/lib/heimdal/FrugalBuild index f7a7c35..7e9b0b3 100644 --- a/source/lib/heimdal/FrugalBuild +++ b/source/lib/heimdal/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=heimdal -pkgver=1.1 +pkgver=1.2 pkgrel=1 pkgdesc="Heimdal Kerberos V5 libraries" url="http://www.pdc.kth.se/heimdal/" @@ -21,7 +21,7 @@ build() Fbuild --enable-shared=yes --enable-static=no \ --without-x --enable-pthread-support \ --libexecdir=/usr/sbin --with-gnu-ld - for i in ftp login mk_cmds rcp rsh su telnet; do + for i in ftp login rcp rsh su telnet; do Fmv usr/bin/$i usr/bin/k$i [ -e $Fdestdir/usr/share/man/man1/$i.1 ] && Fmv usr/share/man/man1/$i.1 usr/share/man/man1/k$i.1 done From voroskoi at frugalware.org Sun Jun 8 12:37:42 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 12:37:57 2008 Subject: [Frugalware-git] frugalware-current: neon-0.26.4-5-x86_64 Message-ID: <20080608103742.D81751190ACC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=36cab3423a824d96f9a278cdafc4af31b77a6c79 commit 36cab3423a824d96f9a278cdafc4af31b77a6c79 Author: voroskoi Date: Wed Jun 4 22:22:22 2008 +0200 neon-0.26.4-5-x86_64 rebuilt with heimdal-1.2 diff --git a/source/network/neon/FrugalBuild b/source/network/neon/FrugalBuild index 67c5976..4e786e3 100644 --- a/source/network/neon/FrugalBuild +++ b/source/network/neon/FrugalBuild @@ -3,10 +3,10 @@ pkgname=neon pkgver=0.26.4 -pkgrel=4 +pkgrel=5 pkgdesc="An HTTP and WebDAV client library, with a C interface." url="http://www.webdav.org/neon/" -depends=('heimdal>=1.1' 'expat' 'zlib') +depends=('heimdal>=1.2' 'expat' 'zlib') groups=('network') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep Source|sed 's/.*-\(.*\)\.t.*/\1/'" From voroskoi at frugalware.org Sun Jun 8 12:37:42 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 12:37:58 2008 Subject: [Frugalware-git] frugalware-current: dillo-unicode-0.8.6_20070916-1-x86_64 Message-ID: <20080608103742.CE0401190ACB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5572be8605c3095cd1118b1f6c89d22dbb68533c commit 5572be8605c3095cd1118b1f6c89d22dbb68533c Author: voroskoi Date: Wed Jun 4 22:11:09 2008 +0200 dillo-unicode-0.8.6_20070916-1-x86_64 version bump rebuilt with heimdal-1.2 diff --git a/source/xapps-extra/dillo-unicode/FrugalBuild b/source/xapps-extra/dillo-unicode/FrugalBuild index be5df53..bff0bf2 100644 --- a/source/xapps-extra/dillo-unicode/FrugalBuild +++ b/source/xapps-extra/dillo-unicode/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: Bence Nagy pkgname=dillo-unicode -pkgver=0.8.6_20060709 -pkgrel=3 +pkgver=0.8.6_20070916 +pkgrel=1 pkgdesc="Dillo aims to be a multi-platform browser alternative that's small, stable, developer-friendly, usable, fast, and extensible." url="http://teki.jpn.ph/pc/software/" -depends=('heimdal>=1.0' 'libjpeg' 'gtk+' 'libpng' 'libxft' 'fltk') +depends=('heimdal>=1.2' 'libjpeg' 'gtk+' 'libpng' 'libxft' 'fltk') groups=('xapps-extra') archs=('i686' 'x86_64') conflicts=('dillo') provides=('dillo') up2date="lynx -dump http://teki.jpn.ph/pc/software | grep -m1 -o 'dillo-.*i18n-misc-.*.tar.bz2' | cut -d - -f 2,5,6 | sed 's|\.tar.bz2||' | tr - _" source=($url/dillo-`echo $pkgver | sed 's/[0-9]\{8\}/-i18n-misc-&/g' | tr -d _`.tar.bz2) -sha1sums=('daa39da681ab854f5d95b0b434a0e3784f6d13fd') +sha1sums=('530e3a4889745eadb94e2924ed97bfe3ec196386') build() { Fcd dillo-`echo $pkgver | sed 's/[0-9]\{8\}/-i18n-misc-&/g' | tr -d _` From voroskoi at frugalware.org Sun Jun 8 12:37:42 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 12:37:59 2008 Subject: [Frugalware-git] frugalware-current: kdelibs-3.5.9-4-x86_64 Message-ID: <20080608103742.E25521190ACD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=762356cac14d19b64fdf600e94dc86ef7710aa58 commit 762356cac14d19b64fdf600e94dc86ef7710aa58 Author: voroskoi Date: Fri Jun 6 04:54:35 2008 +0200 kdelibs-3.5.9-4-x86_64 rebuilt with heimdal-1.2 diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild index 120d90e..0ea6c6b 100644 --- a/source/kde/kdelibs/FrugalBuild +++ b/source/kde/kdelibs/FrugalBuild @@ -4,11 +4,11 @@ pkgname=kdelibs pkgver=3.5.9 -pkgrel=3 +pkgrel=4 pkgdesc="KDE Core Libraries." depends=('arts>=1.5.9' 'hicolor-icon-theme' 'libxslt' 'pcre' 'openmotif' 'openssl' 'libart_lgpl' 'gamin' 'bzip2' \ 'xfsprogs-acl' 'openexr>=1.4.0a-2' 'libidn' 'aspell' 'jasper>=1.900.1-2' 'avahi-qt3>=0.6.14-2' \ - 'avahi-compat>=0.6.14-2' 'heimdal>=1.1' 'rgb' 'qt>=3.3.8-8' 'libdrm' 'libxrender' 'libxcb') + 'avahi-compat>=0.6.14-2' 'heimdal>=1.2' 'rgb' 'qt>=3.3.8-8' 'libdrm' 'libxrender' 'libxcb') makedepends=('cups>=1.2.3' 'openldap' 'sane-backends' 'hspell' 'flex' 'opensp' \ 'openjade' 'doxygen' 'qt-docs>=3.3.8-2' 'graphviz') rodepends=('dejavu-ttf' 'corefonts' 'aspell6-en') From voroskoi at frugalware.org Sun Jun 8 12:37:42 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 12:37:59 2008 Subject: [Frugalware-git] frugalware-current: gst-plugins-bad-0.10.7-3-x86_64 Message-ID: <20080608103742.EC4471190ACE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fade8541739c40741f81d5210c35280b4b74d68e commit fade8541739c40741f81d5210c35280b4b74d68e Author: voroskoi Date: Fri Jun 6 05:24:55 2008 +0200 gst-plugins-bad-0.10.7-3-x86_64 rebuilt with heimdal-1.2 diff --git a/source/xmultimedia/gst-plugins-bad/FrugalBuild b/source/xmultimedia/gst-plugins-bad/FrugalBuild index 8daa195..8198b89 100644 --- a/source/xmultimedia/gst-plugins-bad/FrugalBuild +++ b/source/xmultimedia/gst-plugins-bad/FrugalBuild @@ -3,14 +3,14 @@ pkgname=gst-plugins-bad pkgver=0.10.7 -pkgrel=2 +pkgrel=3 pkgdesc="Plugins for GStreamer (Bad)" url="http://gstreamer.freedesktop.org/" depends=('gst-plugins-base>=0.10.19-2' 'libstdc++' 'zlib' 'gstreamer>=0.10.19-2') makedepends=('soundtouch' 'directfb>=1.0.0' 'xvidcore' 'wavpack' 'libmpcdec' 'faac' 'neon>=0.26.1' \ 'libmusicbrainz' 'cairo' 'bzip2' 'libdca>=0.0.5' 'liboil>=0.3.14' 'libmms' 'faad2' 'libcdaudio' 'alsa-lib' \ 'jack' 'ladspa_sdk' 'libtimidity' 'wildmidi' 'nas' 'x264>=20080426' 'libsndfile' 'libsm' 'libice' 'libx11' 'libgl' \ - 'libxcb' 'libxau' 'libxdmcp' 'libxext' 'libxxf86vm' 'libxdamage' 'libxfixes' 'libdrm' 'heimdal>=1.1' 'mjpegtools' \ + 'libxcb' 'libxau' 'libxdmcp' 'libxext' 'libxxf86vm' 'libxdamage' 'libxfixes' 'libdrm' 'heimdal>=1.2' 'mjpegtools' \ 'libexif' 'amrwb') groups=('xmultimedia') options=('scriptlet') @@ -35,7 +35,7 @@ subdescs=('GStreamer bzip2 plugin (Bad).' 'GStreamer dts plugin (Bad).' 'GStre 'GStreamer x264 plugin (Bad).' 'GStreamer libsndfile plugin (Bad).' 'GStreamer amrwb plugin (Bad).' \ 'GStreamer mpeg2enc plugin (Bad).' 'GStreamer metadata plugin (Bad).') subdepends=("bzip2 $pkgname=$pkgver" "libdca>=0.0.5 $pkgname=$pkgver liboil>=0.3.10" "faac $pkgname=$pkgver" \ - "faad2 $pkgname=$pkgver" "libmms $pkgname=$pkgver" "neon>=0.26.1 $pkgname=$pkgver heimdal>=1.0.1" \ + "faad2 $pkgname=$pkgver" "libmms $pkgname=$pkgver" "neon>=0.26.1 $pkgname=$pkgver heimdal>=1.2" \ "sdl $pkgname=$pkgver" "directfb>=1.1.1 $pkgname=$pkgver liboil>=0.3.10" "xvidcore $pkgname=$pkgver" \ "libmpcdec $pkgname=$pkgver" "soundtouch $pkgname=$pkgver" "libmusicbrainz $pkgname=$pkgver libstdc++" "$pkgname=$pkgver jack" \ "$pkgname=$pkgver libcdaudio" "$pkgname=$pkgver alsa-lib" "$pkgname=$pkgver libtimidity" "$pkgname=$pkgver wildmidi" \ From voroskoi at frugalware.org Sun Jun 8 12:37:43 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 12:38:00 2008 Subject: [Frugalware-git] frugalware-current: cyrus-sasl-2.1.22-14-x86_64 Message-ID: <20080608103743.027CE1190ACF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7626d6ea876c06459210e62729ce740deb1d8939 commit 7626d6ea876c06459210e62729ce740deb1d8939 Author: voroskoi Date: Fri Jun 6 05:36:58 2008 +0200 cyrus-sasl-2.1.22-14-x86_64 rebuilt with heimdal-1.2 diff --git a/source/network/cyrus-sasl/FrugalBuild b/source/network/cyrus-sasl/FrugalBuild index 561eda2..c134b7a 100644 --- a/source/network/cyrus-sasl/FrugalBuild +++ b/source/network/cyrus-sasl/FrugalBuild @@ -3,12 +3,12 @@ pkgname=cyrus-sasl pkgver=2.1.22 -pkgrel=13 +pkgrel=14 pkgdesc="SASL Authentication mechanism" url="http://ftp.andrew.cmu.edu/pub/cyrus-mail/" depends=('openssl' 'gdbm') backup=(etc/sysconfig/saslauthd) -makedepends=('mysql' 'postgresql>=8.2' 'heimdal>=1.1' 'db>=4.6.18') +makedepends=('mysql' 'postgresql>=8.2' 'heimdal>=1.2' 'db>=4.6.18') groups=('network') archs=('i686' 'x86_64') source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-$pkgver.tar.gz \ @@ -25,7 +25,7 @@ sha1sums=('d23454ab12054714ab97d229c86cb934ce63fbb1' \ subpkgs=("$pkgname-sql" "$pkgname-gssapiv2" "saslauthd") subdescs=("$pkgname mysql, postgresql and sqlite plugin." "$pkgname gssapiv2 plugin." \ "sasl authentication server") -subdepends=("$pkgname=$pkgver libmysqlclient libpq>=8.2" "$pkgname=$pkgver db>=4.6.16 heimdal>=1.0" \ +subdepends=("$pkgname=$pkgver libmysqlclient libpq>=8.2" "$pkgname=$pkgver db>=4.6.16 heimdal>=1.2" \ "$pkgname=$pkgver $pkgname-gssapiv2") subgroups=('network' 'network' 'network') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') From voroskoi at frugalware.org Sun Jun 8 12:37:43 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 12:38:01 2008 Subject: [Frugalware-git] frugalware-current: mailx-12.3-4-x86_64 Message-ID: <20080608103743.12B821190AD0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=00ddcef0861c60a0710d88b26eebd4098ec3986a commit 00ddcef0861c60a0710d88b26eebd4098ec3986a Author: voroskoi Date: Fri Jun 6 05:42:59 2008 +0200 mailx-12.3-4-x86_64 rebuilt with heimdal-1.2 remove replaces/conflicts nail diff --git a/source/network/mailx/FrugalBuild b/source/network/mailx/FrugalBuild index 14f0265..bdfc193 100644 --- a/source/network/mailx/FrugalBuild +++ b/source/network/mailx/FrugalBuild @@ -5,19 +5,18 @@ pkgname=mailx pkgver=12.3 -pkgrel=3 +pkgrel=4 pkgdesc="A MUA derived from Berkeley Mail 8.1 and contains builtin support for MIME messages and IPv6" _F_sourceforge_dirname="heirloom" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://heirloom.sourceforge.net/mailx.html" backup=('etc/nail.rc') -depends=('heimdal>=1.1') +depends=('heimdal>=1.2') groups=('network') archs=('i686' 'x86_64') -replaces=('nail') -conflicts=('nail') up2date="lynx -dump $url |grep mailx.*tar |sed -e 's/.*x-\(.*\).t.*/\1/'" +sha1sums=('5d5c17a7c4557953b2cf7796fc28974511e8fe59') build() { @@ -28,6 +27,5 @@ build() Fln $pkgname /usr/bin/mail Fln $pkgname.1.gz /usr/share/man/man1/mail.1.gz } -sha1sums=('5d5c17a7c4557953b2cf7796fc28974511e8fe59') # optimization OK From voroskoi at frugalware.org Sun Jun 8 12:37:43 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 12:38:02 2008 Subject: [Frugalware-git] frugalware-current: subversion-1.4.6-4-x86_64 Message-ID: <20080608103743.2AFC31190ACA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8556435c28a0318d1911ddffd981686370eb871f commit 8556435c28a0318d1911ddffd981686370eb871f Author: voroskoi Date: Fri Jun 6 06:14:32 2008 +0200 subversion-1.4.6-4-x86_64 rebuilt with heimdal-1.2 diff --git a/source/devel-extra/subversion/FrugalBuild b/source/devel-extra/subversion/FrugalBuild index 3925aee..f7dcfed 100644 --- a/source/devel-extra/subversion/FrugalBuild +++ b/source/devel-extra/subversion/FrugalBuild @@ -3,10 +3,10 @@ pkgname=subversion pkgver=1.4.6 -pkgrel=3 +pkgrel=4 pkgdesc="A version control system that is a compelling replacement for CVS." url="http://subversion.tigris.org/" -depends=('neon>=0.26.4-3' 'heimdal>=1.1' 'apr-util>=1.2.12' 'apr>=1.2.12') +depends=('neon>=0.26.4-3' 'heimdal>=1.2' 'apr-util>=1.2.12' 'apr>=1.2.12') makedepends=('apache>=2.2.6-2' 'swig>=1.3.34' 'ruby') groups=('devel-extra') archs=('i686' 'x86_64') From voroskoi at frugalware.org Sun Jun 8 12:37:43 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 12:38:03 2008 Subject: [Frugalware-git] frugalware-current: bug-buddy-2.22.0-2-x86_64 Message-ID: <20080608103743.350071190AD1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c842128bf5032db4bd2f5416d78953f9a750b38e commit c842128bf5032db4bd2f5416d78953f9a750b38e Author: voroskoi Date: Fri Jun 6 07:08:36 2008 +0200 bug-buddy-2.22.0-2-x86_64 rebuilt with heimdal-1.2 diff --git a/source/gnome/bug-buddy/FrugalBuild b/source/gnome/bug-buddy/FrugalBuild index 24f173b..c30327f 100644 --- a/source/gnome/bug-buddy/FrugalBuild +++ b/source/gnome/bug-buddy/FrugalBuild @@ -3,11 +3,11 @@ pkgname=bug-buddy pkgver=2.22.0 -pkgrel=1 +pkgrel=2 pkgdesc="A bug reporting tool for GNOME" depends=('gnome-desktop>=2.22.0' 'gnome-menus>=2.22.0' 'rarian>=0.8.0' 'desktop-file-utils' \ 'libsoup>=2.2.104-2' 'libgtop>=2.20.0' 'evolution-data-server>=2.22.1' 'libelf' \ - 'heimdal>=1.1') + 'heimdal>=1.2') makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') From voroskoi at frugalware.org Sun Jun 8 12:37:43 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 12:38:04 2008 Subject: [Frugalware-git] frugalware-current: gnome-control-center-2.22.2.1-2-x86_64 Message-ID: <20080608103743.3FBF31190AD2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3ba1426bd92be6084de66c20c8892afc43283399 commit 3ba1426bd92be6084de66c20c8892afc43283399 Author: voroskoi Date: Fri Jun 6 07:25:27 2008 +0200 gnome-control-center-2.22.2.1-2-x86_64 rebuilt with heimdal-1.2 diff --git a/source/gnome/gnome-control-center/FrugalBuild b/source/gnome/gnome-control-center/FrugalBuild index 8e1df76..6fb7818 100644 --- a/source/gnome/gnome-control-center/FrugalBuild +++ b/source/gnome/gnome-control-center/FrugalBuild @@ -3,12 +3,12 @@ pkgname=gnome-control-center pkgver=2.22.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME Control Center" depends=('gnome-desktop>=2.22.2' 'gnome-menus>=2.22.2' 'metacity>=2.22.0' 'libgnomekbd>=2.22.0' \ 'nautilus>=2.22.3' 'gst-plugins-base>=0.10.19-2' 'desktop-file-utils' \ 'evolution-data-server>=2.22.2' 'libxxf86misc' 'libxscrnsaver' 'xrdb' \ - 'gnome-vfs>=2.22.0' 'gnome-panel>=2.22.2' 'heimdal>=1.1' 'db>=4.6.21' \ + 'gnome-vfs>=2.22.0' 'gnome-panel>=2.22.2' 'heimdal>=1.2' 'db>=4.6.21' \ 'gnome-settings-daemon') makedepends=('intltool' 'gnome-doc-utils>=0.12.2' 'gnome-common>=2.20.0') rodepends=('gst-plugins-base-alsa>=0.10.19-2' 'gst-plugins-base-gnomevfs>=0.10.19-2') From voroskoi at frugalware.org Sun Jun 8 12:37:43 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 12:38:05 2008 Subject: [Frugalware-git] frugalware-current: evolution-2.22.1.1-2-x86_64 Message-ID: <20080608103743.61C5D1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c6dd63c05ee6dc3a8a7811cf0d49197d208e058f commit c6dd63c05ee6dc3a8a7811cf0d49197d208e058f Author: voroskoi Date: Sun Jun 8 10:33:18 2008 +0200 evolution-2.22.1.1-2-x86_64 rebuilt with heimdal-1.2 diff --git a/source/gnome/evolution/FrugalBuild b/source/gnome/evolution/FrugalBuild index d74d02c..3a2cd5a 100644 --- a/source/gnome/evolution/FrugalBuild +++ b/source/gnome/evolution/FrugalBuild @@ -3,10 +3,10 @@ pkgname=evolution pkgver=2.22.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Integrated mail, calendar and address book suite for GNOME" depends=('gail>=1.20.1' 'gal>=2.5.3-3' 'evolution-data-server>=2.22.1.1' 'gtkhtml>=3.18.0' \ - 'gnome-spell>=1.0.8' 'rarian' 'heimdal>=1.1' \ + 'gnome-spell>=1.0.8' 'rarian' 'heimdal>=1.2' \ 'evolution-data-server-ldap>=2.22.1.1' 'libbonobo>=2.22.0' 'nss>=3.11.5' 'nspr>=4.6.6' \ 'libnotify' 'gnome-pilot-conduits') makedepends=('intltool' 'gnome-doc-utils>=0.10.3' 'openldap' 'psmisc' 'gnome-common') From voroskoi at frugalware.org Sun Jun 8 12:37:43 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 12:38:05 2008 Subject: [Frugalware-git] frugalware-current: samba-3.0.30-2-x86_64 Message-ID: <20080608103743.70BBB1190ACC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=24f87598587937b0e9cd6d3f5255b854c102d422 commit 24f87598587937b0e9cd6d3f5255b854c102d422 Author: voroskoi Date: Sun Jun 8 10:54:20 2008 +0200 samba-3.0.30-2-x86_64 rebuilt with heimdal-1.2 diff --git a/source/network/samba/FrugalBuild b/source/network/samba/FrugalBuild index 6f05de4..148ec7d 100644 --- a/source/network/samba/FrugalBuild +++ b/source/network/samba/FrugalBuild @@ -5,7 +5,7 @@ pkgname=samba pkgver=3.0.30 pkgextraver= -pkgrel=1 +pkgrel=2 pkgdesc="SMB file and print server." url="http://www.samba.org" backup=(etc/logrotate.d/samba) @@ -19,7 +19,7 @@ source=(http://ftp.samba.org/samba/ftp/stable/$pkgname-$pkgver$pkgextraver.tar.g subpkgs=('libsmbclient' 'samba-client' 'samba-swat') subdescs=('SMB client library.' 'SMB client tools.' 'Swat config tool for samba.') -subdepends=('libldap' 'heimdal>=1.1 db readline popt' '') +subdepends=('libldap' 'heimdal>=1.2 db readline popt' '') subrodepends=('' "libsmbclient=$pkgver" 'samba') subgroups=('lib' 'network' 'network') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') From voroskoi at frugalware.org Sun Jun 8 12:37:43 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 12:38:06 2008 Subject: [Frugalware-git] frugalware-current: evolution-data-server-2.22.2-2-x86_64 Message-ID: <20080608103743.9435C1190AD3@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=297f83635fe10e5fef90502c256a0fa538311bbb commit 297f83635fe10e5fef90502c256a0fa538311bbb Author: voroskoi Date: Sun Jun 8 11:15:06 2008 +0200 evolution-data-server-2.22.2-2-x86_64 rebuilt with heimdal-1.2 diff --git a/source/gnome/evolution-data-server/FrugalBuild b/source/gnome/evolution-data-server/FrugalBuild index 8e0a565..828afd6 100644 --- a/source/gnome/evolution-data-server/FrugalBuild +++ b/source/gnome/evolution-data-server/FrugalBuild @@ -3,9 +3,9 @@ pkgname=evolution-data-server pkgver=2.22.2 -pkgrel=1 +pkgrel=2 pkgdesc="Evolution Data Server provides a central location for addressbook and calendar in the GNOME Desktop" -depends=('nss>=3.11.7' 'libsoup>=2.4.1' 'libgnomeui>=2.22.1' 'heimdal>=1.1' 'gnome-keyring>=2.22.1' \ +depends=('nss>=3.11.7' 'libsoup>=2.4.1' 'libgnomeui>=2.22.1' 'heimdal>=1.2' 'gnome-keyring>=2.22.1' \ 'db>=4.6.18') makedepends=('intltool' 'gtk-doc>=1.9' 'openldap>=2.3.24') groups=('gnome' 'gnome-minimal') From voroskoi at frugalware.org Sun Jun 8 12:37:43 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 12:38:07 2008 Subject: [Frugalware-git] frugalware-current: wireshark-1.0.0-2-x86_64 Message-ID: <20080608103743.A097B1190ACD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b9f51ec21539d7d0391156f6d57bb02d6fcc724f commit b9f51ec21539d7d0391156f6d57bb02d6fcc724f Author: voroskoi Date: Sun Jun 8 11:48:38 2008 +0200 wireshark-1.0.0-2-x86_64 rebuilt with heimdal-1.2 diff --git a/source/xapps-extra/wireshark/FrugalBuild b/source/xapps-extra/wireshark/FrugalBuild index f005b18..f08b529 100644 --- a/source/xapps-extra/wireshark/FrugalBuild +++ b/source/xapps-extra/wireshark/FrugalBuild @@ -3,10 +3,10 @@ pkgname=wireshark pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="The world's most popular network protocol analyzer" url="http://www.wireshark.org/" -depends=('heimdal>=1.1' 'gtk+2>=2.10.2' 'pcre' 'libpcap' 'gnutls' 'gksu>=1.9.4-2' 'gnutls>=2.2.0') +depends=('heimdal>=1.2' 'gtk+2>=2.10.2' 'pcre' 'libpcap' 'gnutls' 'gksu>=1.9.4-2' 'gnutls>=2.2.0') replaces=('ethereal') groups=('xapps-extra') archs=('i686' 'x86_64') From voroskoi at frugalware.org Sun Jun 8 12:37:43 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 12:38:07 2008 Subject: [Frugalware-git] frugalware-current: rpm-5.1.2-2-x86_64 Message-ID: <20080608103743.B661F1190AD4@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ff552968efd79e3131e6fd79ee90f6162bd817dd commit ff552968efd79e3131e6fd79ee90f6162bd817dd Author: voroskoi Date: Sun Jun 8 12:10:20 2008 +0200 rpm-5.1.2-2-x86_64 rebuilt with heimdal-1.2 diff --git a/source/apps-extra/rpm/FrugalBuild b/source/apps-extra/rpm/FrugalBuild index 658b266..aef362e 100644 --- a/source/apps-extra/rpm/FrugalBuild +++ b/source/apps-extra/rpm/FrugalBuild @@ -4,10 +4,10 @@ pkgname=rpm pkgver=5.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Red Hat Package Manager" url="http://rpm5.org" -depends=('heimdal>=1.1' 'pcre' 'sqlite3' 'popt' 'beecrypt' 'bzip2' 'neon' 'sqlite2' 'xfsprogs-acl' 'libxml2') +depends=('heimdal>=1.2' 'pcre' 'sqlite3' 'popt' 'beecrypt' 'bzip2' 'neon' 'sqlite2' 'xfsprogs-acl' 'libxml2') groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://rpm5.org/|grep Production|sed 's/.*RPM \([0-9.]\+\) .*/\1/'" From voroskoi at frugalware.org Sun Jun 8 12:37:43 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 12:38:08 2008 Subject: [Frugalware-git] frugalware-current: fusedav-0.2-4-x86_64 Message-ID: <20080608103743.D5C7B1190ACB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=74d07d5560450fe67498d30583aac4b254e8f99a commit 74d07d5560450fe67498d30583aac4b254e8f99a Author: voroskoi Date: Sun Jun 8 12:15:37 2008 +0200 fusedav-0.2-4-x86_64 rebuilt with heimdal-1.2 diff --git a/source/network-extra/fusedav/FrugalBuild b/source/network-extra/fusedav/FrugalBuild index 0da6f41..91862af 100644 --- a/source/network-extra/fusedav/FrugalBuild +++ b/source/network-extra/fusedav/FrugalBuild @@ -3,10 +3,10 @@ pkgname=fusedav pkgver=0.2 -pkgrel=3 +pkgrel=4 pkgdesc="a Linux userspace file system driver for mounting WebDAV shares." url="http://0pointer.de/lennart/projects/fusedav/" -depends=('fuse>=2.5' 'neon>=0.26' 'heimdal>=1.1') +depends=('fuse>=2.5' 'neon>=0.26' 'heimdal>=1.2') makedepends=('xfsprogs-attr') groups=('network-extra') archs=('i686' 'x86_64') From voroskoi at frugalware.org Sun Jun 8 12:37:44 2008 From: voroskoi at frugalware.org (voroskoi) Date: Sun Jun 8 12:38:08 2008 Subject: [Frugalware-git] frugalware-current: Merge branch 'master' of voroskoi@git.frugalware.org:/home/ftp/pub/other/people/voroskoi/wipv Message-ID: <20080608103744.113E21190ACE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=07f4b9a27ace93623ceb45c49f67d133d58f4f4d commit 07f4b9a27ace93623ceb45c49f67d133d58f4f4d Merge: f88d554... 74d07d5... Author: voroskoi Date: Sun Jun 8 12:36:03 2008 +0200 Merge branch 'master' of voroskoi@git.frugalware.org:/home/ftp/pub/other/people/voroskoi/wipv From vmiklos at frugalware.org Sun Jun 8 13:26:12 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 13:26:13 2008 Subject: [Frugalware-git] frugalware-current: pdftk-1.41-3-i686 Message-ID: <20080608112612.72D8D1190AC9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c4917292eb63f8be0cf977a503c719bcf010c9fd commit c4917292eb63f8be0cf977a503c719bcf010c9fd Author: Miklos Vajna Date: Sun Jun 8 13:24:37 2008 +0200 pdftk-1.41-3-i686 - rebuilt with gcj-4.3.x - closes #3131 diff --git a/source/apps-extra/pdftk/FrugalBuild b/source/apps-extra/pdftk/FrugalBuild index a88d26f..109a2d7 100644 --- a/source/apps-extra/pdftk/FrugalBuild +++ b/source/apps-extra/pdftk/FrugalBuild @@ -3,11 +3,11 @@ pkgname=pdftk pkgver=1.41 -pkgrel=2 +pkgrel=3 pkgdesc="A tool for manipulating PDF documents" url="http://www.accesspdf.com/pdftk" depends=('libstdc++' 'libgcj') -makedepends=('gcc-gcj') +makedepends=('gcc-gcj>=4.3.1') groups=('apps-extra') archs=('i686' 'x86_64') up2date='lynx -dump "http://www.pdfhacks.com/pdftk/" | grep "pdftk-.*.tar.bz2" | head -n 1 | sed "s/.*pdftk-\(.*\).tar.bz2.*/\1/"' @@ -17,6 +17,12 @@ sha1sums=('e5eb83dd96dbda68072efe8f2637aad59f50dffc') build() { unset MAKEFLAGS Fcd + for i in `find . -name Makefile` + do + sed -i 's/--classpath="."/--classpath="$(java_libs_root):."/g' $i + sed -i 's/all : $(library) $(headers)/all : $(library) $(headers) $(classes)/g' $i + sed -i '/$(RM) $ Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=e2994e65f21c197f96afda13846cb59dd2fa8b1a commit e2994e65f21c197f96afda13846cb59dd2fa8b1a Author: Miklos Vajna Date: Sun Jun 8 13:30:24 2008 +0200 dg send: add --dry-run switch diff --git a/darcs-git.py b/darcs-git.py index 9faf55b..435332b 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -725,9 +725,31 @@ The recommended work is: Use "darcs-git help send-email" for more information. Options: + -d --dry-run don't actually take the action -h --help shows brief description of command and its arguments""" sys.exit(ret) - if len(argv) and argv[0] in ("-h", "--help"): + + class Options: + def __init__(self): + self.dryrun = "" + self.help = False + self.gitopts = "" + options = Options() + + try: + opts, args = getopt.getopt(argv, "d", ["dry-run"]) + except getopt.GetoptError: + usage(1) + optind = 0 + for opt, arg in opts: + if opt in ("-d", "--dry-run"): + options.dryrun = "--dry-run" + elif opt in ("-h", "--help"): + options.help = True + optind += 1 + if optind < len(argv): + options.gitopts = " ".join(argv[optind:]) + if options.help: usage(0) sock = os.popen("git config user.name") author = sock.readline().strip() @@ -735,7 +757,7 @@ Options: sock = os.popen("git config user.email") author += " <%s>" % sock.readline().strip() sock.close() - return os.system("""git send-email --envelope-sender "%s" --from "%s" --suppress-from %s""" % (author, author, " ".join(argv))) + return os.system("""git send-email --envelope-sender "%s" --from "%s" --suppress-from %s %s""" % (author, author, options.dryrun, options.gitopts)) def get(argv): def usage(ret): From vmiklos at frugalware.org Sun Jun 8 13:35:14 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 13:35:14 2008 Subject: [Frugalware-git] frugalware-current: git-1.5.5.4-1-i686 Message-ID: <20080608113514.34AAE11901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=80c70228e01b4ab5bd2e47bd5575b8dd30123c98 commit 80c70228e01b4ab5bd2e47bd5575b8dd30123c98 Author: Miklos Vajna Date: Sun Jun 8 13:34:43 2008 +0200 git-1.5.5.4-1-i686 - version bump diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index da11dfc..ea100b9 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.5.5.3 +pkgver=1.5.5.4 Fuse $USE_DEVEL && pkgver=1.5.5.rc3 pkgrel=1 pkgdesc="A fast, scalable, distributed revision control system." From vmiklos at frugalware.org Sun Jun 8 13:40:33 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 13:40:35 2008 Subject: [Frugalware-git] frugalware-current: aterm-1.0.1-2-i686 Message-ID: <20080608114033.6145A11901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=098e67a3fa30a70a682f4c302d366583cd192443 commit 098e67a3fa30a70a682f4c302d366583cd192443 Author: Miklos Vajna Date: Sun Jun 8 13:40:04 2008 +0200 aterm-1.0.1-2-i686 - moved to extra diff --git a/source/xlib-extra/aterm/FrugalBuild b/source/xlib-extra/aterm/FrugalBuild new file mode 100644 index 0000000..e444d42 --- /dev/null +++ b/source/xlib-extra/aterm/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 0.33 SBU +# Maintainer: VMiklos + +pkgname=aterm +pkgver=1.0.1 +pkgrel=2 +pkgdesc="A VT100 terminal emulator for X with transparency support" +depends=('libxext' 'libsm' 'libxt') +groups=('xlib-extra') +archs=('i686' 'x86_64') +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge +url="http://aterm.sourceforge.net/" +source=($source aterm-1.0.1-display-security-issue.patch) +sha1sums=('a975753b415306a0734efc3773de8a86129bb54b' \ + '11f7a0e6c2bc6fa7400d4c3f360d0da331a5b816') +Fconfopts="$Fconfopts --enable-transparency=yes --enable-background-image --enable-fading \ + --enable-menubar --enable-graphics" +# optimization OK diff --git a/source/xlib-extra/aterm/aterm-1.0.1-display-security-issue.patch b/source/xlib-extra/aterm/aterm-1.0.1-display-security-issue.patch new file mode 100644 index 0000000..e44c0b3 --- /dev/null +++ b/source/xlib-extra/aterm/aterm-1.0.1-display-security-issue.patch @@ -0,0 +1,24 @@ +--- aterm-1.0.1/src/main.c 2007-08-01 16:08:29.000000000 +0200 ++++ aterm-1.0.1.new/src/main.c 2008-05-03 14:06:52.000000000 +0200 +@@ -2057,10 +2057,6 @@ + */ + get_options(argc, argv); + +- if( display_name == NULL ) +- if ((display_name = getenv("DISPLAY")) == NULL) +- display_name = ":0"; +- + #ifdef HAVE_AFTERSTEP + #ifdef MyArgs_IS_MACRO + MyArgsPtr = safecalloc(1, sizeof(ASProgArgs) ); +@@ -2102,7 +2098,9 @@ + Xdisplay = XOpenDisplay(display_name); + + if (!Xdisplay) { +- print_error("can't open display %s", display_name); ++ print_error("can't open display %s", display_name?display_name: ++ getenv("DISPLAY")?getenv("DISPLAY"): ++ "as no -d given and DISPLAY not set"); + exit(EXIT_FAILURE); + } + /* changed from _MOTIF_WM_INFO - Vaevictus - gentoo bug #139554 */ diff --git a/source/xlib/aterm/FrugalBuild b/source/xlib/aterm/FrugalBuild deleted file mode 100644 index fd99dfc..0000000 --- a/source/xlib/aterm/FrugalBuild +++ /dev/null @@ -1,19 +0,0 @@ -# Compiling Time: 0.33 SBU -# Maintainer: VMiklos - -pkgname=aterm -pkgver=1.0.1 -pkgrel=2 -pkgdesc="A VT100 terminal emulator for X with transparency support" -depends=('libxext' 'libsm' 'libxt') -groups=('xlib') -archs=('i686' 'x86_64') -_F_sourceforge_ext=".tar.bz2" -Finclude sourceforge -url="http://aterm.sourceforge.net/" -source=($source aterm-1.0.1-display-security-issue.patch) -sha1sums=('a975753b415306a0734efc3773de8a86129bb54b' \ - '11f7a0e6c2bc6fa7400d4c3f360d0da331a5b816') -Fconfopts="$Fconfopts --enable-transparency=yes --enable-background-image --enable-fading \ - --enable-menubar --enable-graphics" -# optimization OK diff --git a/source/xlib/aterm/aterm-1.0.1-display-security-issue.patch b/source/xlib/aterm/aterm-1.0.1-display-security-issue.patch deleted file mode 100644 index e44c0b3..0000000 --- a/source/xlib/aterm/aterm-1.0.1-display-security-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- aterm-1.0.1/src/main.c 2007-08-01 16:08:29.000000000 +0200 -+++ aterm-1.0.1.new/src/main.c 2008-05-03 14:06:52.000000000 +0200 -@@ -2057,10 +2057,6 @@ - */ - get_options(argc, argv); - -- if( display_name == NULL ) -- if ((display_name = getenv("DISPLAY")) == NULL) -- display_name = ":0"; -- - #ifdef HAVE_AFTERSTEP - #ifdef MyArgs_IS_MACRO - MyArgsPtr = safecalloc(1, sizeof(ASProgArgs) ); -@@ -2102,7 +2098,9 @@ - Xdisplay = XOpenDisplay(display_name); - - if (!Xdisplay) { -- print_error("can't open display %s", display_name); -+ print_error("can't open display %s", display_name?display_name: -+ getenv("DISPLAY")?getenv("DISPLAY"): -+ "as no -d given and DISPLAY not set"); - exit(EXIT_FAILURE); - } - /* changed from _MOTIF_WM_INFO - Vaevictus - gentoo bug #139554 */ From vmiklos at frugalware.org Sun Jun 8 13:43:22 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 13:43:22 2008 Subject: [Frugalware-git] frugalware-current: avahi-0.6.22-4-i686 Message-ID: <20080608114322.7A5C911901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d55e34dcfdf22d425320c65549f585c1ef29eb3a commit d55e34dcfdf22d425320c65549f585c1ef29eb3a Author: Miklos Vajna Date: Sun Jun 8 13:42:51 2008 +0200 avahi-0.6.22-4-i686 - moved avahi-gtk2 to extra diff --git a/source/network/avahi/FrugalBuild b/source/network/avahi/FrugalBuild index ae8e594..f140a42 100644 --- a/source/network/avahi/FrugalBuild +++ b/source/network/avahi/FrugalBuild @@ -36,7 +36,7 @@ subdescs=('Glib bindings for Avahi' 'Mono C# bindings for Avahi' 'QT3 bindings f subdepends=("glib2 $pkgname=$pkgver" "mono>=1.9 $pkgname=$pkgver" "qt $pkgname=$pkgver" "python>=2.5 $pkgname=$pkgver" "$pkgname=$pkgver" \ "avahi-python=$pkgver libglade pygtk libavahi-ui=$pkgver avahi-glib=$pkgver" "libqtcore $pkgname=$pkgver" "$pkgname=$pkgver" \ "gtk+2 $pkgname=$pkgver" "gtk2-sharp>=2.12.0 libavahi-ui=$pkgver") -subgroups=('network' 'apps-extra' 'xlib' 'network' 'network' 'gnome' 'lib-extra' 'network-extra' 'gnome' 'gnome-extra') +subgroups=('network' 'apps-extra' 'xlib' 'network' 'network' 'gnome-extra' 'lib-extra' 'network-extra' 'gnome' 'gnome-extra') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') From vmiklos at frugalware.org Sun Jun 8 13:45:29 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 13:45:29 2008 Subject: [Frugalware-git] frugalware-current: bashburn-2.1.2-1-i686 Message-ID: <20080608114529.4B22611901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d2ec62302776c54dd3e67b9a474eb73b2ab6dbe3 commit d2ec62302776c54dd3e67b9a474eb73b2ab6dbe3 Author: Miklos Vajna Date: Sun Jun 8 13:44:57 2008 +0200 bashburn-2.1.2-1-i686 - moved to extra diff --git a/source/multimedia-extra/bashburn/FrugalBuild b/source/multimedia-extra/bashburn/FrugalBuild new file mode 100644 index 0000000..58c7830 --- /dev/null +++ b/source/multimedia-extra/bashburn/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: 0.01 SBU +# Maintainer: VMiklos + +pkgname=bashburn +pkgver=2.1.2 +pkgrel=1 +pkgdesc="A CD burning shell script." +rodepends=('bash' 'cdrtools' 'cdrdao' 'mpg321' 'lame' 'vorbis-tools' 'flac' \ + 'eject') +groups=('multimedia-extra') +backup=('etc/bashburnrc') +archs=('i686' 'x86_64') +_F_sourceforge_dirname="bashburn" +_F_sourceforge_name="BashBurn" +Finclude sourceforge +sha1sums=('2487a182d0791a8c92959aae9a76f94d69a665ec') + +build() +{ + Fcd BashBurn-$pkgver + Fpatchall + Fsed 'usr/bin/BashBurn' 'usr/lib/BashBurn' Install.sh + echo -e "yes\nno" |./Install.sh --destdir $Fdestdir + Fmkdir /usr/share/doc/$pkgname-$pkgver + Fln /usr/lib/BashBurn/HOWTO /usr/share/doc/$pkgname-$pkgver +} diff --git a/source/multimedia/bashburn/FrugalBuild b/source/multimedia/bashburn/FrugalBuild deleted file mode 100644 index 39e02ac..0000000 --- a/source/multimedia/bashburn/FrugalBuild +++ /dev/null @@ -1,26 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: VMiklos - -pkgname=bashburn -pkgver=2.1.2 -pkgrel=1 -pkgdesc="A CD burning shell script." -rodepends=('bash' 'cdrtools' 'cdrdao' 'mpg321' 'lame' 'vorbis-tools' 'flac' \ - 'eject') -groups=('multimedia') -backup=(etc/bashburnrc) -archs=('i686' 'x86_64') -_F_sourceforge_dirname="bashburn" -_F_sourceforge_name="BashBurn" -Finclude sourceforge -sha1sums=('2487a182d0791a8c92959aae9a76f94d69a665ec') - -build() -{ - Fcd BashBurn-$pkgver - Fpatchall - Fsed 'usr/bin/BashBurn' 'usr/lib/BashBurn' Install.sh - echo -e "yes\nno" |./Install.sh --destdir $Fdestdir - Fmkdir /usr/share/doc/$pkgname-$pkgver - Fln /usr/lib/BashBurn/HOWTO /usr/share/doc/$pkgname-$pkgver -} From vmiklos at frugalware.org Sun Jun 8 13:47:52 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 13:47:54 2008 Subject: [Frugalware-git] frugalware-current: bbkeys-0.9.0-2-i686 Message-ID: <20080608114752.5E44811901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=139d00746e3ac5faf070bb766e7aafe3d40d1012 commit 139d00746e3ac5faf070bb766e7aafe3d40d1012 Author: Miklos Vajna Date: Sun Jun 8 13:47:09 2008 +0200 bbkeys-0.9.0-2-i686 - moved to extra diff --git a/source/xlib-extra/bbkeys/FrugalBuild b/source/xlib-extra/bbkeys/FrugalBuild new file mode 100644 index 0000000..2c86c1b --- /dev/null +++ b/source/xlib-extra/bbkeys/FrugalBuild @@ -0,0 +1,25 @@ +# Compiling Time: 0.01 SBU +# Maintainer: VMiklos + +pkgname=bbkeys +pkgver=0.9.0 +pkgrel=2 +pkgdesc="A completely configurable key-combo grabber for blackbox" +depends=('blackbox>=0.70.0' 'perl') +groups=('xlib-extra') +archs=('i686' 'x86_64') +Finclude sourceforge +url="http://bbkeys.sourceforge.net" +source=(${source[@]} xft-fix.patch) +sha1sums=('b406f47f298fe83df6be89d2437dae2cee007439' \ + '7d2d8ec14c453765c302ffcbc9897a0d0a429a24') +build() +{ + Fpatchall + aclocal && autoheader && autoconf && automake -a -c -f + Fmake + Fmakeinstall + Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver +} + +# optimization OK diff --git a/source/xlib-extra/bbkeys/xft-fix.patch b/source/xlib-extra/bbkeys/xft-fix.patch new file mode 100644 index 0000000..1f4858e --- /dev/null +++ b/source/xlib-extra/bbkeys/xft-fix.patch @@ -0,0 +1,15 @@ +diff -Naur bbkeys-0.9.0.orig/configure.ac bbkeys-0.9.0/configure.ac +--- bbkeys-0.9.0.orig/configure.ac 2005-06-16 23:06:07.000000000 +0000 ++++ bbkeys-0.9.0/configure.ac 2005-06-16 23:08:04.000000000 +0000 +@@ -134,6 +134,11 @@ + CXXFLAGS="$CXXFLAGS $LIBBT_CFLAGS" + LIBS="$LIBS $LIBBT_LIBS" + ++dnl pkgconfig checks for Xft ++PKG_CHECK_MODULES(LIBXFT, xft) ++CXXFLAGS="$CXXFLAGS $LIBXFT_CFLAGS" ++LIBS="$LIBS $LIBXFT_LIBS" ++ + dnl generate the config header + AM_CONFIG_HEADER(config.h) + diff --git a/source/xlib/bbkeys/FrugalBuild b/source/xlib/bbkeys/FrugalBuild deleted file mode 100644 index 9db055c..0000000 --- a/source/xlib/bbkeys/FrugalBuild +++ /dev/null @@ -1,25 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: VMiklos - -pkgname=bbkeys -pkgver=0.9.0 -pkgrel=2 -pkgdesc="A completely configurable key-combo grabber for blackbox" -depends=('blackbox>=0.70.0' 'perl') -groups=('xlib') -archs=('i686' 'x86_64') -Finclude sourceforge -url="http://bbkeys.sourceforge.net" -source=(${source[@]} xft-fix.patch) -sha1sums=('b406f47f298fe83df6be89d2437dae2cee007439' \ - '7d2d8ec14c453765c302ffcbc9897a0d0a429a24') -build() -{ - Fpatchall - aclocal && autoheader && autoconf && automake -a -c -f - Fmake - Fmakeinstall - Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver -} - -# optimization OK diff --git a/source/xlib/bbkeys/xft-fix.patch b/source/xlib/bbkeys/xft-fix.patch deleted file mode 100644 index 1f4858e..0000000 --- a/source/xlib/bbkeys/xft-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur bbkeys-0.9.0.orig/configure.ac bbkeys-0.9.0/configure.ac ---- bbkeys-0.9.0.orig/configure.ac 2005-06-16 23:06:07.000000000 +0000 -+++ bbkeys-0.9.0/configure.ac 2005-06-16 23:08:04.000000000 +0000 -@@ -134,6 +134,11 @@ - CXXFLAGS="$CXXFLAGS $LIBBT_CFLAGS" - LIBS="$LIBS $LIBBT_LIBS" - -+dnl pkgconfig checks for Xft -+PKG_CHECK_MODULES(LIBXFT, xft) -+CXXFLAGS="$CXXFLAGS $LIBXFT_CFLAGS" -+LIBS="$LIBS $LIBXFT_LIBS" -+ - dnl generate the config header - AM_CONFIG_HEADER(config.h) - From vmiklos at frugalware.org Sun Jun 8 13:49:59 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 13:50:01 2008 Subject: [Frugalware-git] frugalware-current: ccache-2.4-7-i686 Message-ID: <20080608114959.C917A11901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a9192b42dd57efba0dd3280be6a7b0e16e113838 commit a9192b42dd57efba0dd3280be6a7b0e16e113838 Author: Miklos Vajna Date: Sun Jun 8 13:49:31 2008 +0200 ccache-2.4-7-i686 - moved to extra diff --git a/source/devel-extra/ccache/FrugalBuild b/source/devel-extra/ccache/FrugalBuild new file mode 100644 index 0000000..1d5435f --- /dev/null +++ b/source/devel-extra/ccache/FrugalBuild @@ -0,0 +1,29 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Bence Nagy + +pkgname=ccache +pkgver=2.4 +pkgrel=7 +pkgdesc="A fast compiler cache" +url="http://ccache.samba.org" +depends=('glibc>=2.7-3') +groups=('devel-extra' 'devel-core') +archs=('i686' 'x86_64') +up2date="lynx -dump $url | grep 'The latest release' | sed -e 's/.*ccache \(.*\)\..*/\1/'" +source=(http://samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz \ + README.Frugalware) +sha1sums=('9833ec13de9b90d5409e60d679ac681115ef465e' \ + '533569cbe2b4cdfb27da9a58594f3eed670a269a') + +build() { + Fbuild + Fmkdir /usr/lib/ccache/bin + for i in {$CHOST-,}{cc,c++,gcc,g++} + do + Fln /usr/bin/ccache /usr/lib/ccache/bin/$i + done + install -d -m 2775 -g 48 $Fdestdir/var/cache/ccache/ || Fdie + Fdoc README.Frugalware +} + +# optimization OK diff --git a/source/devel-extra/ccache/README.Frugalware b/source/devel-extra/ccache/README.Frugalware new file mode 100644 index 0000000..5751e43 --- /dev/null +++ b/source/devel-extra/ccache/README.Frugalware @@ -0,0 +1,27 @@ +After you installed `ccache`, it won't be enabled by default. + +First, you need to determine who is allowed to use `ccache`. You have to +add each user to the `ccache` group. If you want to allow using `ccache` +from chrooted builds, then you need to add the `fst` user: + +---- +# usermod -a -G ccache fst +---- + +Second, you need to somehow let the build system to use `ccache`, and +not the compiler directly. If you use `makepkg`, this is enabled by +default (you can disable it with the `-B` option). If you build +manually, then you are on your own, though usually there are two ways to +do so: + +- Tell the configure script to use a different compiler: + +-------------------------------- +$ CC=/usr/bin/ccache ./configure +-------------------------------- + +- Modify path to use the fake compiler provided by `ccache`: + +------------------------------------- +export PATH=/usr/lib/ccache/bin:$PATH +------------------------------------- diff --git a/source/devel-extra/ccache/ccache.install b/source/devel-extra/ccache/ccache.install new file mode 100644 index 0000000..09340de --- /dev/null +++ b/source/devel-extra/ccache/ccache.install @@ -0,0 +1,20 @@ +post_install() +{ + if ! grep -q '^ccache:' /etc/group ; then + groupadd -g 48 ccache + fi +} + +post_upgrade() +{ + post_install $1 +} + +pre_remove() { + groupdel ccache +} + +op=$1 +shift + +$op $* diff --git a/source/devel/ccache/FrugalBuild b/source/devel/ccache/FrugalBuild deleted file mode 100644 index a5a8f9c..0000000 --- a/source/devel/ccache/FrugalBuild +++ /dev/null @@ -1,29 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: Bence Nagy - -pkgname=ccache -pkgver=2.4 -pkgrel=7 -pkgdesc="A fast compiler cache" -url="http://ccache.samba.org" -depends=('glibc>=2.7-3') -groups=('devel' 'devel-core') -archs=('i686' 'x86_64') -up2date="lynx -dump $url | grep 'The latest release' | sed -e 's/.*ccache \(.*\)\..*/\1/'" -source=(http://samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz \ - README.Frugalware) -sha1sums=('9833ec13de9b90d5409e60d679ac681115ef465e' \ - '533569cbe2b4cdfb27da9a58594f3eed670a269a') - -build() { - Fbuild - Fmkdir /usr/lib/ccache/bin - for i in {$CHOST-,}{cc,c++,gcc,g++} - do - Fln /usr/bin/ccache /usr/lib/ccache/bin/$i - done - install -d -m 2775 -g 48 $Fdestdir/var/cache/ccache/ || Fdie - Fdoc README.Frugalware -} - -# optimization OK diff --git a/source/devel/ccache/README.Frugalware b/source/devel/ccache/README.Frugalware deleted file mode 100644 index 5751e43..0000000 --- a/source/devel/ccache/README.Frugalware +++ /dev/null @@ -1,27 +0,0 @@ -After you installed `ccache`, it won't be enabled by default. - -First, you need to determine who is allowed to use `ccache`. You have to -add each user to the `ccache` group. If you want to allow using `ccache` -from chrooted builds, then you need to add the `fst` user: - ----- -# usermod -a -G ccache fst ----- - -Second, you need to somehow let the build system to use `ccache`, and -not the compiler directly. If you use `makepkg`, this is enabled by -default (you can disable it with the `-B` option). If you build -manually, then you are on your own, though usually there are two ways to -do so: - -- Tell the configure script to use a different compiler: - --------------------------------- -$ CC=/usr/bin/ccache ./configure --------------------------------- - -- Modify path to use the fake compiler provided by `ccache`: - -------------------------------------- -export PATH=/usr/lib/ccache/bin:$PATH -------------------------------------- diff --git a/source/devel/ccache/ccache.install b/source/devel/ccache/ccache.install deleted file mode 100644 index 09340de..0000000 --- a/source/devel/ccache/ccache.install +++ /dev/null @@ -1,20 +0,0 @@ -post_install() -{ - if ! grep -q '^ccache:' /etc/group ; then - groupadd -g 48 ccache - fi -} - -post_upgrade() -{ - post_install $1 -} - -pre_remove() { - groupdel ccache -} - -op=$1 -shift - -$op $* From vmiklos at frugalware.org Sun Jun 8 13:51:58 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 13:52:00 2008 Subject: [Frugalware-git] frugalware-current: centericq-4.21.0-2-i686 Message-ID: <20080608115158.E581611901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f750b63cdc6cfae52509de46536878712790b201 commit f750b63cdc6cfae52509de46536878712790b201 Author: Miklos Vajna Date: Sun Jun 8 13:51:27 2008 +0200 centericq-4.21.0-2-i686 - moved to extra diff --git a/source/network-extra/centericq/FrugalBuild b/source/network-extra/centericq/FrugalBuild new file mode 100644 index 0000000..baecbe4 --- /dev/null +++ b/source/network-extra/centericq/FrugalBuild @@ -0,0 +1,32 @@ +# Compiling Time: 2.02 SBU +# Maintainer: Zsolt Szalai +# Contributor: VMiklos + +pkgname=centericq +pkgver=4.21.0 +pkgrel=2 +pkgdesc="A text mode menu- and window-driven IM interface." +groups=('network-extra') +archs=('i686' 'x86_64') +url="http://konst.org.ua/centericq/" +depends=('libjpeg' 'ncurses' 'openssl' 'curl>=7.16.0' 'libstdc++') +up2date="lynx -dump $url|grep Release|sed 's/.*e \(.*\) f.*/\1/'" +source=(http://konst.org.ua/download/$pkgname-$pkgver.tar.gz centericq-amd64-gcc4fix.patch) +sha1sums=('8b5fbd8b945a5a6f0fd57e831ccfaef520a96315' \ + '6dc34394d2946b7d876d1d1e1efabb9708241153') + +build() { + Fcd + [ "$CARCH" == "x86_64" ] && Fpatch centericq-amd64-gcc4fix.patch + # fixes "can only configure for one host and one target at a time" + for i in connwrap-0.1 kkconsui-0.1 kkstrtext-0.1 kksystr-0.1 \ + libicq2000-0.1 libjabber-0.1 libmsn-0.1 libyahoo2-0.1 + do + (Fcd && cd $i && autoconf) + done + Fmake + Fmakeinstall +} + + +# optimization OK diff --git a/source/network-extra/centericq/centericq-amd64-gcc4fix.patch b/source/network-extra/centericq/centericq-amd64-gcc4fix.patch new file mode 100644 index 0000000..d7128ec --- /dev/null +++ b/source/network-extra/centericq/centericq-amd64-gcc4fix.patch @@ -0,0 +1,138 @@ +diff -Naur centericq-4.20.0.orig/kkconsui-0.1/src/texteditor.cc centericq-4.20.0/kkconsui-0.1/src/texteditor.cc +--- centericq-4.20.0.orig/kkconsui-0.1/src/texteditor.cc 2005-08-05 17:10:43.000000000 +0200 ++++ centericq-4.20.0/kkconsui-0.1/src/texteditor.cc 2005-08-05 17:21:58.000000000 +0200 +@@ -1940,7 +1940,7 @@ + } + + int texteditor::findint(void *p1, void *p2) { +- return *(int *) p1 != (int) p2; ++ return *(int *) p1 != (long) p2; + } + + int texteditor::findhighline(void *p1, void *p2) { +diff -Naur centericq-4.20.0.orig/kkstrtext-0.1/kkstrtext.cc centericq-4.20.0/kkstrtext-0.1/kkstrtext.cc +--- centericq-4.20.0.orig/kkstrtext-0.1/kkstrtext.cc 2005-08-05 17:10:43.000000000 +0200 ++++ centericq-4.20.0/kkstrtext-0.1/kkstrtext.cc 2005-08-05 17:21:58.000000000 +0200 +@@ -431,7 +431,7 @@ + } + + int intcompare(void *s1, void *s2) { +- return (int) s1 != (int) s2; ++ return (long) s1 != (long) s2; + } + + string i2str(int i) { +@@ -885,7 +885,7 @@ + #ifdef HAVE_ICONV + iconv_t cd = iconv_open(tocs.c_str(), fromcs.c_str()); + +- if(((int) cd) != -1) { ++ if(((long) cd) != -1) { + string r, text(atext); + size_t inleft, outleft, soutleft; + char *inbuf, *outbuf, *sinbuf, *soutbuf; +diff -Naur centericq-4.20.0.orig/src/icqdialogs.cc centericq-4.20.0/src/icqdialogs.cc +--- centericq-4.20.0.orig/src/icqdialogs.cc 2005-08-05 17:10:43.000000000 +0200 ++++ centericq-4.20.0/src/icqdialogs.cc 2005-08-05 17:21:58.000000000 +0200 +@@ -894,7 +894,7 @@ + i = m.open(); + m.close(); + +- if(i) f = (unsigned short) ((int) m.getref(i-1)); ++ if(i) f = (unsigned short) ((long) m.getref(i-1)); + } + + void icqface::selectlanguage(unsigned short &f) { +@@ -946,7 +946,7 @@ + int i = m.open(); + m.close(); + +- if(i) f = (imgender) ((int) m.getref(i-1)); ++ if(i) f = (imgender) ((long) m.getref(i-1)); + } + + void icqface::selectagerange(ICQ2000::AgeRange &r) { +@@ -967,7 +967,7 @@ + int i = m.open(); + m.close(); + +- if(i) r = (ICQ2000::AgeRange) ((int) m.getref(i-1)); ++ if(i) r = (ICQ2000::AgeRange) ((long) m.getref(i-1)); + } + + bool icqface::edit(string &txt, const string &header) { +@@ -1254,7 +1254,7 @@ + + void *p; + finished = !db.open(n, b, &p); +- i = (int) p; ++ i = (long) p; + + if(!finished) + switch(b) { +@@ -1745,7 +1745,7 @@ + it = transfers.end(); + + if(!db.gettree()->isnode(db.gettree()->getid(np-1))) +- it = transfers.begin() + (int) db.getmenu()->getref(n-1); ++ it = transfers.begin() + (long) db.getmenu()->getref(n-1); + + switch(b) { + case 0: +diff -Naur centericq-4.20.0.orig/src/icqface.cc centericq-4.20.0/src/icqface.cc +--- centericq-4.20.0.orig/src/icqface.cc 2005-08-05 17:10:43.000000000 +0200 ++++ centericq-4.20.0/src/icqface.cc 2005-08-05 17:23:09.000000000 +0200 +@@ -392,7 +392,7 @@ + + m.scale(); + m.idle = &menuidle; +- i = (int) m.getref(m.open()-1); ++ i = (long) m.getref(m.open()-1); + m.close(); + + if(i) lastr = i; +@@ -441,7 +441,7 @@ + + if(i) { + lastitem = i-1; +- r = (int) m.getref(lastitem); ++ r = (long) m.getref(lastitem); + } + + return r; +@@ -467,7 +467,7 @@ + g = 0; + } + +- if((unsigned int) c < 100) c = 0; ++ if((unsigned long) c < 100) c = 0; + + if(i) { + switch(action = extk) { +@@ -1430,7 +1430,7 @@ + m.scale(); + + i = m.open(); +- choice = (int) m.getref(i-1); ++ choice = (long) m.getref(i-1); + + m.close(); + } +@@ -1485,7 +1485,7 @@ + m.close(); + + if(r = i) { +- st = (imstatus) ((int) m.getref(i-1)); ++ st = (imstatus) ((long) m.getref(i-1)); + } + } + +@@ -2078,7 +2078,7 @@ + c = (icqcontact *) cm->getref(i); + } + +- if((unsigned int) c > 100) { ++ if((unsigned long) c > 100) { + string current = c->getdispnick(); + len = current.size(); + if(len > nick.size()) len = nick.size(); diff --git a/source/network/centericq/FrugalBuild b/source/network/centericq/FrugalBuild deleted file mode 100644 index 50ea741..0000000 --- a/source/network/centericq/FrugalBuild +++ /dev/null @@ -1,32 +0,0 @@ -# Compiling Time: 2.02 SBU -# Maintainer: Zsolt Szalai -# Contributor: VMiklos - -pkgname=centericq -pkgver=4.21.0 -pkgrel=2 -pkgdesc="A text mode menu- and window-driven IM interface." -groups=('network') -archs=('i686' 'x86_64') -url="http://konst.org.ua/centericq/" -depends=('libjpeg' 'ncurses' 'openssl' 'curl>=7.16.0' 'libstdc++') -up2date="lynx -dump $url|grep Release|sed 's/.*e \(.*\) f.*/\1/'" -source=(http://konst.org.ua/download/$pkgname-$pkgver.tar.gz centericq-amd64-gcc4fix.patch) -sha1sums=('8b5fbd8b945a5a6f0fd57e831ccfaef520a96315' \ - '6dc34394d2946b7d876d1d1e1efabb9708241153') - -build() { - Fcd - [ "$CARCH" == "x86_64" ] && Fpatch centericq-amd64-gcc4fix.patch - # fixes "can only configure for one host and one target at a time" - for i in connwrap-0.1 kkconsui-0.1 kkstrtext-0.1 kksystr-0.1 \ - libicq2000-0.1 libjabber-0.1 libmsn-0.1 libyahoo2-0.1 - do - (Fcd && cd $i && autoconf) - done - Fmake - Fmakeinstall -} - - -# optimization OK diff --git a/source/network/centericq/centericq-amd64-gcc4fix.patch b/source/network/centericq/centericq-amd64-gcc4fix.patch deleted file mode 100644 index d7128ec..0000000 --- a/source/network/centericq/centericq-amd64-gcc4fix.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -Naur centericq-4.20.0.orig/kkconsui-0.1/src/texteditor.cc centericq-4.20.0/kkconsui-0.1/src/texteditor.cc ---- centericq-4.20.0.orig/kkconsui-0.1/src/texteditor.cc 2005-08-05 17:10:43.000000000 +0200 -+++ centericq-4.20.0/kkconsui-0.1/src/texteditor.cc 2005-08-05 17:21:58.000000000 +0200 -@@ -1940,7 +1940,7 @@ - } - - int texteditor::findint(void *p1, void *p2) { -- return *(int *) p1 != (int) p2; -+ return *(int *) p1 != (long) p2; - } - - int texteditor::findhighline(void *p1, void *p2) { -diff -Naur centericq-4.20.0.orig/kkstrtext-0.1/kkstrtext.cc centericq-4.20.0/kkstrtext-0.1/kkstrtext.cc ---- centericq-4.20.0.orig/kkstrtext-0.1/kkstrtext.cc 2005-08-05 17:10:43.000000000 +0200 -+++ centericq-4.20.0/kkstrtext-0.1/kkstrtext.cc 2005-08-05 17:21:58.000000000 +0200 -@@ -431,7 +431,7 @@ - } - - int intcompare(void *s1, void *s2) { -- return (int) s1 != (int) s2; -+ return (long) s1 != (long) s2; - } - - string i2str(int i) { -@@ -885,7 +885,7 @@ - #ifdef HAVE_ICONV - iconv_t cd = iconv_open(tocs.c_str(), fromcs.c_str()); - -- if(((int) cd) != -1) { -+ if(((long) cd) != -1) { - string r, text(atext); - size_t inleft, outleft, soutleft; - char *inbuf, *outbuf, *sinbuf, *soutbuf; -diff -Naur centericq-4.20.0.orig/src/icqdialogs.cc centericq-4.20.0/src/icqdialogs.cc ---- centericq-4.20.0.orig/src/icqdialogs.cc 2005-08-05 17:10:43.000000000 +0200 -+++ centericq-4.20.0/src/icqdialogs.cc 2005-08-05 17:21:58.000000000 +0200 -@@ -894,7 +894,7 @@ - i = m.open(); - m.close(); - -- if(i) f = (unsigned short) ((int) m.getref(i-1)); -+ if(i) f = (unsigned short) ((long) m.getref(i-1)); - } - - void icqface::selectlanguage(unsigned short &f) { -@@ -946,7 +946,7 @@ - int i = m.open(); - m.close(); - -- if(i) f = (imgender) ((int) m.getref(i-1)); -+ if(i) f = (imgender) ((long) m.getref(i-1)); - } - - void icqface::selectagerange(ICQ2000::AgeRange &r) { -@@ -967,7 +967,7 @@ - int i = m.open(); - m.close(); - -- if(i) r = (ICQ2000::AgeRange) ((int) m.getref(i-1)); -+ if(i) r = (ICQ2000::AgeRange) ((long) m.getref(i-1)); - } - - bool icqface::edit(string &txt, const string &header) { -@@ -1254,7 +1254,7 @@ - - void *p; - finished = !db.open(n, b, &p); -- i = (int) p; -+ i = (long) p; - - if(!finished) - switch(b) { -@@ -1745,7 +1745,7 @@ - it = transfers.end(); - - if(!db.gettree()->isnode(db.gettree()->getid(np-1))) -- it = transfers.begin() + (int) db.getmenu()->getref(n-1); -+ it = transfers.begin() + (long) db.getmenu()->getref(n-1); - - switch(b) { - case 0: -diff -Naur centericq-4.20.0.orig/src/icqface.cc centericq-4.20.0/src/icqface.cc ---- centericq-4.20.0.orig/src/icqface.cc 2005-08-05 17:10:43.000000000 +0200 -+++ centericq-4.20.0/src/icqface.cc 2005-08-05 17:23:09.000000000 +0200 -@@ -392,7 +392,7 @@ - - m.scale(); - m.idle = &menuidle; -- i = (int) m.getref(m.open()-1); -+ i = (long) m.getref(m.open()-1); - m.close(); - - if(i) lastr = i; -@@ -441,7 +441,7 @@ - - if(i) { - lastitem = i-1; -- r = (int) m.getref(lastitem); -+ r = (long) m.getref(lastitem); - } - - return r; -@@ -467,7 +467,7 @@ - g = 0; - } - -- if((unsigned int) c < 100) c = 0; -+ if((unsigned long) c < 100) c = 0; - - if(i) { - switch(action = extk) { -@@ -1430,7 +1430,7 @@ - m.scale(); - - i = m.open(); -- choice = (int) m.getref(i-1); -+ choice = (long) m.getref(i-1); - - m.close(); - } -@@ -1485,7 +1485,7 @@ - m.close(); - - if(r = i) { -- st = (imstatus) ((int) m.getref(i-1)); -+ st = (imstatus) ((long) m.getref(i-1)); - } - } - -@@ -2078,7 +2078,7 @@ - c = (icqcontact *) cm->getref(i); - } - -- if((unsigned int) c > 100) { -+ if((unsigned long) c > 100) { - string current = c->getdispnick(); - len = current.size(); - if(len > nick.size()) len = nick.size(); From vmiklos at frugalware.org Sun Jun 8 13:53:55 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 13:53:56 2008 Subject: [Frugalware-git] frugalware-current: chkrootkit-0.48-1-i686 Message-ID: <20080608115355.5CFEA11901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2ad157fb10e78ad3455bae1d4dbddf74c1320074 commit 2ad157fb10e78ad3455bae1d4dbddf74c1320074 Author: Miklos Vajna Date: Sun Jun 8 13:53:26 2008 +0200 chkrootkit-0.48-1-i686 - moved to extra diff --git a/source/apps-extra/chkrootkit/FrugalBuild b/source/apps-extra/chkrootkit/FrugalBuild new file mode 100644 index 0000000..59ac779 --- /dev/null +++ b/source/apps-extra/chkrootkit/FrugalBuild @@ -0,0 +1,27 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=chkrootkit +pkgver=0.48 +pkgrel=1 +pkgdesc="chkrootkit is a tool to locally check for signs of a rootkit." +url="http://www.chkrootkit.org/" +pkgurl="ftp://ftp.pangeia.com.br/pub/seg/pac/" +groups=('apps-extra') +depends=() +archs=('i686' 'x86_64') +up2date="lynx --dump http://www.chkrootkit.org/ | grep 'is now available' | sed 's/.* \([0-9\.a-z]\+\) is.*/\1/;q'" +source=($pkgurl$pkgname-$pkgver.tar.gz) +sha1sums=('edbaf062a78f4210a7dbe9ef935cb86d12695d91') + +build() +{ + Fsed " \./" " /usr/sbin/" chkrootkit + Fsed "CFLAGS\(.*\)=" "CFLAGS\1+=" Makefile + Fmake + Fmkdir /usr/sbin + Fexerel chkdirs chklastlog chkproc chkrootkit chkwtmp chkutmp ifpromisc \ + strings-static check_wtmpx /usr/sbin +} + +# optimization OK diff --git a/source/apps/chkrootkit/FrugalBuild b/source/apps/chkrootkit/FrugalBuild deleted file mode 100644 index dac04d2..0000000 --- a/source/apps/chkrootkit/FrugalBuild +++ /dev/null @@ -1,27 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: Christian Hamar alias krix - -pkgname=chkrootkit -pkgver=0.48 -pkgrel=1 -pkgdesc="chkrootkit is a tool to locally check for signs of a rootkit." -url="http://www.chkrootkit.org/" -pkgurl="ftp://ftp.pangeia.com.br/pub/seg/pac/" -groups=('apps') -depends=() -archs=('i686' 'x86_64') -up2date="lynx --dump http://www.chkrootkit.org/ | grep 'is now available' | sed 's/.* \([0-9\.a-z]\+\) is.*/\1/;q'" -source=($pkgurl$pkgname-$pkgver.tar.gz) -sha1sums=('edbaf062a78f4210a7dbe9ef935cb86d12695d91') - -build() -{ - Fsed " \./" " /usr/sbin/" chkrootkit - Fsed "CFLAGS\(.*\)=" "CFLAGS\1+=" Makefile - Fmake - Fmkdir /usr/sbin - Fexerel chkdirs chklastlog chkproc chkrootkit chkwtmp chkutmp ifpromisc \ - strings-static check_wtmpx /usr/sbin -} - -# optimization OK From vmiklos at frugalware.org Sun Jun 8 13:55:40 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 13:55:41 2008 Subject: [Frugalware-git] frugalware-current: dhcp-3.0.7-1-i686 Message-ID: <20080608115540.9B7DD11901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=32bb1a6a284021b41a19cfcdc485ae16c7e856cb commit 32bb1a6a284021b41a19cfcdc485ae16c7e856cb Author: Miklos Vajna Date: Sun Jun 8 13:55:11 2008 +0200 dhcp-3.0.7-1-i686 - moved dhclient to extra diff --git a/source/network-extra/dhcp/FrugalBuild b/source/network-extra/dhcp/FrugalBuild index 2e8ec0b..b68ac28 100644 --- a/source/network-extra/dhcp/FrugalBuild +++ b/source/network-extra/dhcp/FrugalBuild @@ -21,7 +21,7 @@ sha1sums=('d6e8fd6f8e3bd04930ff74b400fca6eb7a5c715a' \ 'ce6545dad5c371b269da8f689f6d3599feefc4da') subpkgs=('dhclient') subdescs=('The ISC DHCP client') -subgroups=('network') +subgroups=('network-extra') subdepends=('glibc') subbackup=('etc/dhclient.conf') subarchs=('i686 x86_64') From vmiklos at frugalware.org Sun Jun 8 13:57:23 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 13:57:24 2008 Subject: [Frugalware-git] frugalware-current: diffstat-1.45-1-i686 Message-ID: <20080608115723.B739911901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a92e6a1c8d536f02770ee7bf0821a179a2b7c99f commit a92e6a1c8d536f02770ee7bf0821a179a2b7c99f Author: Miklos Vajna Date: Sun Jun 8 13:56:53 2008 +0200 diffstat-1.45-1-i686 - moved to extra diff --git a/source/devel-extra/diffstat/FrugalBuild b/source/devel-extra/diffstat/FrugalBuild new file mode 100644 index 0000000..ddf465e --- /dev/null +++ b/source/devel-extra/diffstat/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.01 SBU +# Maintainer: VMiklos + +pkgname=diffstat +pkgver=1.45 +pkgrel=1 +pkgdesc="Displays a histogram of changes to a file" +url="http://dickey.his.com/diffstat/diffstat.html" +depends=('glibc') +groups=('devel-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump ftp://invisible-island.net/diffstat/|grep tgz$|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" +source=(ftp://invisible-island.net/$pkgname/$pkgname-$pkgver.tgz) +sha1sums=('5801ed764eee00f3c81be7f6995670962aad7467') +# optimization ok diff --git a/source/devel/diffstat/FrugalBuild b/source/devel/diffstat/FrugalBuild deleted file mode 100644 index 0139fe6..0000000 --- a/source/devel/diffstat/FrugalBuild +++ /dev/null @@ -1,15 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: VMiklos - -pkgname=diffstat -pkgver=1.45 -pkgrel=1 -pkgdesc="Displays a histogram of changes to a file" -url="http://dickey.his.com/diffstat/diffstat.html" -depends=('glibc') -groups=('devel') -archs=('i686' 'x86_64') -up2date="lynx -dump ftp://invisible-island.net/diffstat/|grep tgz$|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" -source=(ftp://invisible-island.net/$pkgname/$pkgname-$pkgver.tgz) -sha1sums=('5801ed764eee00f3c81be7f6995670962aad7467') -# optimization ok From vmiklos at frugalware.org Sun Jun 8 14:38:07 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 14:38:11 2008 Subject: [Frugalware-git] frugalware-0.8: imlib2-1.4.0-2kalgan1-i686 Message-ID: <20080608123807.59A3211901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=97a4e1fa20de6b1a61e0f30cc86dc37a94ddbd37 commit 97a4e1fa20de6b1a61e0f30cc86dc37a94ddbd37 Author: Miklos Vajna Date: Sun Jun 8 14:37:23 2008 +0200 imlib2-1.4.0-2kalgan1-i686 - added CVE-2008-2426.patch - closes #3124 diff --git a/source/xlib/imlib2/CVE-2008-2426.patch b/source/xlib/imlib2/CVE-2008-2426.patch new file mode 100644 index 0000000..87269fd --- /dev/null +++ b/source/xlib/imlib2/CVE-2008-2426.patch @@ -0,0 +1,98 @@ +diff -Nur imlib2-1.2.1/src/modules/loaders/loader_argb.c imlib2-1.2.1.new/src/modules/loaders/loader_argb.c +--- imlib2-1.2.1/src/modules/loaders/loader_argb.c 2006-11-06 01:27:59.000000000 -0800 ++++ imlib2-1.2.1.new/src/modules/loaders/loader_argb.c 2006-11-06 01:30:41.000000000 -0800 +@@ -23,7 +23,7 @@ + load(ImlibImage * im, ImlibProgressFunction progress, + char progress_granularity, char immediate_load) + { +- int w, h, alpha; ++ int w=0, h=0, alpha=0; + FILE *f; + + if (im->data) +@@ -36,6 +36,8 @@ + { + char buf[256], buf2[256]; + ++ memset(buf, 0, sizeof(buf)); ++ memset(buf2, 0, sizeof(buf)); + if (!fgets(buf, 255, f)) + { + fclose(f); +diff -Nur imlib2-1.2.1/src/modules/loaders/loader_jpeg.c imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c +--- imlib2-1.2.1/src/modules/loaders/loader_jpeg.c 2006-11-06 01:27:59.000000000 -0800 ++++ imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c 2006-11-06 01:33:01.000000000 -0800 +@@ -104,8 +104,9 @@ + im->w = w = cinfo.output_width; + im->h = h = cinfo.output_height; + +- if (cinfo.rec_outbuf_height > 16) ++ if (cinfo.rec_outbuf_height > 16 || w < 1 || h < 1 || w > 16383 || h > 16383) + { ++ im->w = im->h = 0; + jpeg_destroy_decompress(&cinfo); + fclose(f); + return 0; +diff -Nur imlib2-1.2.1/src/modules/loaders/loader_lbm.c imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c +--- imlib2-1.2.1/src/modules/loaders/loader_lbm.c 2006-11-06 01:27:59.000000000 -0800 ++++ imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c 2006-11-06 01:30:41.000000000 -0800 +@@ -453,6 +453,7 @@ + } + } + if (!full || !ok) { ++ im->w = im->h = 0; + freeilbm(&ilbm); + return ok; + } +@@ -467,12 +468,13 @@ + cancel = 0; + plane[0] = NULL; + ++ n = ilbm.depth; ++ if (ilbm.mask == 1) n++; ++ + im->data = malloc(im->w * im->h * sizeof(DATA32)); +- if (im->data) { +- n = ilbm.depth; +- if (ilbm.mask == 1) n++; ++ plane[0] = malloc(((im->w + 15) / 16) * 2 * n); ++ if (im->data && plane[0]) { + +- plane[0] = malloc(((im->w + 15) / 16) * 2 * n); + for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2; + + z = ((im->w + 15) / 16) * 2 * n; +@@ -511,6 +513,7 @@ + * the memory for im->data. + *----------*/ + if (!ok) { ++ im->w = im->h = 0; + if (im->data) free(im->data); + im->data = NULL; + } +diff -Nur imlib2-1.2.1/src/modules/loaders/loader_pnm.c imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c +--- imlib2-1.2.1/src/modules/loaders/loader_pnm.c 2006-11-06 01:27:59.000000000 -0800 ++++ imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c 2006-11-06 01:30:41.000000000 -0800 +@@ -80,7 +80,7 @@ + int i = 0; + + /* read numbers */ +- while (c != EOF && !isspace(c)) ++ while (c != EOF && i+1 < sizeof(buf) && !isspace(c)) + { + buf[i++] = c; + c = fgetc(f); +diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tga.c imlib2-1.2.1.new/src/modules/loaders/loader_tga.c +--- imlib2-1.2.1/src/modules/loaders/loader_tga.c 2006-11-06 01:27:59.000000000 -0800 ++++ imlib2-1.2.1.new/src/modules/loaders/loader_tga.c 2006-11-06 01:30:41.000000000 -0800 +@@ -365,7 +369,9 @@ + else + dataptr = im->data + (y * im->w); + +- for (x = 0; x < im->w; x++) /* for each pixel in the row */ ++ for (x = 0; ++ x < im->w && bufptr+bpp/8 < bufend; ++ x++) /* for each pixel in the row */ + { + switch (bpp) + { diff --git a/source/xlib/imlib2/FrugalBuild b/source/xlib/imlib2/FrugalBuild index aff67e8..ebe0ae7 100644 --- a/source/xlib/imlib2/FrugalBuild +++ b/source/xlib/imlib2/FrugalBuild @@ -3,7 +3,7 @@ pkgname=imlib2 pkgver=1.4.0 -pkgrel=1 +pkgrel=2kalgan1 pkgdesc="Imlib 2 is the successor to Imlib, it is NOT a newer version" _F_sourceforge_dirname="enlightenment" Finclude sourceforge @@ -13,7 +13,9 @@ depends=('libtiff' 'freetype2' 'libxext' 'libjpeg' \ groups=('xlib') archs=('i686' 'x86_64') up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=2 |grep imlib2-src |sed 's/.*]\([0-9\.]*\) [A-Z].*/\1/;q'" -sha1sums=('2bbd65b82a690d21dab2bfeb33cc370f6bb49393') +source=($source CVE-2008-2426.patch) +sha1sums=('2bbd65b82a690d21dab2bfeb33cc370f6bb49393' \ + 'ce2a8c515e9f16bffcb996a6e9171e3832a94323') if [ "$CARCH" != "x86_64" ]; then Fconfopts="$Fconfopts --enable-mmx" From vmiklos at frugalware.org Sun Jun 8 14:41:11 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 14:41:12 2008 Subject: [Frugalware-git] frugalware-0.8: stunnel-4.24-1kalgan1-i686 Message-ID: <20080608124111.522CA11901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=c866d8b2bf8470a8687c3379c0ffb62bb33506b8 commit c866d8b2bf8470a8687c3379c0ffb62bb33506b8 Author: Miklos Vajna Date: Sun Jun 8 14:40:31 2008 +0200 stunnel-4.24-1kalgan1-i686 - secfix bump - closes #3122 diff --git a/source/network-extra/stunnel/FrugalBuild b/source/network-extra/stunnel/FrugalBuild index fdcde05..8e6aef7 100644 --- a/source/network-extra/stunnel/FrugalBuild +++ b/source/network-extra/stunnel/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=stunnel -pkgver=4.21 -pkgrel=1 +pkgver=4.24 +pkgrel=1kalgan1 pkgdesc="Universal SSL Wrapper" url="http://www.stunnel.org/" depends=('zlib' 'openssl' 'tcp_wrappers') @@ -12,8 +12,8 @@ groups=('network-extra') archs=('i686') up2date="lynx -dump http://www.stunnel.org/download/source.html|grep -m1 .tar.gz$|Flasttar" source=(http://www.stunnel.org/download/stunnel/src/stunnel-$pkgver.tar.gz \ - rc.stunnel setuid.patch README.Frugalware) -signatures=($source.asc '' '' '') + rc.stunnel README.Frugalware) +signatures=($source.asc '' '') build() { diff --git a/source/network-extra/stunnel/setuid.patch b/source/network-extra/stunnel/setuid.patch deleted file mode 100644 index ff75499..0000000 --- a/source/network-extra/stunnel/setuid.patch +++ /dev/null @@ -1,104 +0,0 @@ -from ftp://stunnel.mirt.net/stunnel/setuid.patch - -we would just get a SIGCHLD without this - ---- /tmp/stunnel-4.21/src/stunnel.c 2007-10-27 17:41:39.000000000 +0200 -+++ src/stunnel.c 2007-11-03 16:44:02.000000000 +0100 -@@ -3,8 +3,8 @@ - * Copyright (c) 1998-2007 Michal Trojnara - * All Rights Reserved - * -- * Version: 4.21 (stunnel.c) -- * Date: 2007.10.27 -+ * Version: 4.22 (stunnel.c) -+ * Date: 2007.11.xx - * - * Author: Michal Trojnara - * -@@ -41,7 +41,7 @@ - static void accept_connection(LOCAL_OPTIONS *); - static void get_limits(void); /* setup global max_clients and max_fds */ - #if !defined (USE_WIN32) && !defined (__vms) --static void make_chroot(void); -+static void drop_privileges(void); - static void daemonize(void); - static void create_pid(void); - static void delete_pid(void); -@@ -111,9 +111,6 @@ - } else { /* inetd mode */ - #if !defined (USE_WIN32) && !defined (__vms)&&!defined(USE_OS2) - max_fds=FD_SETSIZE; /* just in case */ --#ifdef HAVE_CHROOT -- make_chroot(); --#endif /* HAVE_CHROOT */ - drop_privileges(); - #endif - num_clients=1; -@@ -171,9 +168,6 @@ - #if !defined (USE_WIN32) && !defined (__vms) && !defined(USE_OS2) - if(!(options.option.foreground)) - daemonize(); --#ifdef HAVE_CHROOT -- make_chroot(); --#endif /* HAVE_CHROOT */ - drop_privileges(); - create_pid(); - #endif /* !defined USE_WIN32 && !defined (__vms) */ -@@ -299,24 +293,9 @@ - #endif - } - --#ifdef HAVE_CHROOT --static void make_chroot(void) { -- if(options.chroot_dir) { -- if(chroot(options.chroot_dir)) { -- sockerror("chroot"); -- exit(1); -- } -- if(chdir("/")) { -- sockerror("chdir"); -- exit(1); -- } -- } --} --#endif /* HAVE_CHROOT */ -- - #if !defined (USE_WIN32) && !defined (__vms) -- /* set process user and group(s) id */ --void drop_privileges(void) { -+ /* chroot and set process user and group(s) id */ -+static void drop_privileges(void) { - int uid=0, gid=0; - struct group *gr; - #ifdef HAVE_SETGROUPS -@@ -350,6 +329,20 @@ - } - } - -+#ifdef HAVE_CHROOT -+ /* chroot */ -+ if(options.chroot_dir) { -+ if(chroot(options.chroot_dir)) { -+ sockerror("chroot"); -+ exit(1); -+ } -+ if(chdir("/")) { -+ sockerror("chdir"); -+ exit(1); -+ } -+ } -+#endif /* HAVE_CHROOT */ -+ - /* Set uid and gid */ - if(gid) { - if(setgid(gid)) { ---- /tmp/stunnel-4.21/src/prototypes.h 2007-10-05 17:42:48.000000000 +0200 -+++ src/prototypes.h 2007-11-03 16:33:49.000000000 +0100 -@@ -57,7 +57,6 @@ - void main_initialize(char *, char *); - void main_execute(void); - void stunnel_info(int); --void drop_privileges(void); - - /**************************************** Prototypes for log.c */ - From vmiklos at frugalware.org Sun Jun 8 14:49:48 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 14:49:49 2008 Subject: [Frugalware-git] frugalware-0.8: emacs-22.1-3kalgan2-i686 Message-ID: <20080608124948.7A8D811901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=a543781264b0c7f8b7c687e089bf969f7395a96a commit a543781264b0c7f8b7c687e089bf969f7395a96a Author: Miklos Vajna Date: Sun Jun 8 14:49:17 2008 +0200 emacs-22.1-3kalgan2-i686 - added CVE-2008-2142.patch - closes #3086 diff --git a/source/xapps/emacs/CVE-2008-2142.patch b/source/xapps/emacs/CVE-2008-2142.patch new file mode 100644 index 0000000..e60159b --- /dev/null +++ b/source/xapps/emacs/CVE-2008-2142.patch @@ -0,0 +1,32 @@ +--- lisp/obsolete/fast-lock.el.orig 2008-05-14 08:00:17.000000000 +0300 ++++ lisp/obsolete/fast-lock.el 2008-05-14 08:16:32.000000000 +0300 +@@ -270,7 +270,7 @@ + (integer :tag "size"))))) + :group 'fast-lock) + +-(defcustom fast-lock-cache-directories '("." "~/.emacs-flc") ++(defcustom fast-lock-cache-directories '("~/.emacs-flc") + ; - `internal', keep each file's Font Lock cache file in the same file. + ; - `external', keep each file's Font Lock cache file in the same directory. + "*Directories in which Font Lock cache files are saved and read. +@@ -288,13 +288,19 @@ + ((\"^/your/true/home/directory/\" . \".\") \"~/.emacs-flc\") + + would cause a file's current directory to be used if the file is under your +-home directory hierarchy, or otherwise the absolute directory `~/.emacs-flc'." ++home directory hierarchy, or otherwise the absolute directory `~/.emacs-flc'. ++For security reasons, it is not advisable to use the file's current directory ++to avoid the possibility of using the cache of another user." ++ + :type '(repeat (radio (directory :tag "directory") + (cons :tag "Matching" + (regexp :tag "regexp") + (directory :tag "directory")))) + :group 'fast-lock) + ++;;;###autoload ++(put 'fast-lock-cache-directories 'risky-local-variable t) ++ + (defcustom fast-lock-save-events '(kill-buffer kill-emacs) + "*Events under which caches will be saved. + Valid events are `save-buffer', `kill-buffer' and `kill-emacs'. diff --git a/source/xapps/emacs/FrugalBuild b/source/xapps/emacs/FrugalBuild index 5332c48..f7d55b7 100644 --- a/source/xapps/emacs/FrugalBuild +++ b/source/xapps/emacs/FrugalBuild @@ -5,7 +5,7 @@ pkgname=emacs pkgver=22.1 pkgextraver= -pkgrel=3kalgan1 +pkgrel=3kalgan2 pkgdesc="An extensible, customizable, self-documenting real-time display editor" url="http://www.gnu.org/software/emacs/" Finclude texinfo @@ -15,8 +15,8 @@ groups=('xapps') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep stable|sed 's/.*: \([0-9\.]*\) .*/\1/'" source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver$pkgextraver.tar.gz emacs-21.4-amd64.patch CVE-2007-5795.diff \ - CVE-2008-1694.patch) -signatures=($source.sig '' '' '') + CVE-2008-1694.patch CVE-2008-2142.patch) +signatures=($source.sig '' '' '' '') build() { # LDFLAGS="-Wl,--hash-style=both" does not compile @@ -25,6 +25,7 @@ build() { [[ "$CARCH" == "x86_64" ]] && Fpatch emacs-21.4-amd64.patch Fpatch CVE-2007-5795.diff Fpatch CVE-2008-1694.patch + Fpatch CVE-2008-2142.patch Fmake --with-x11 --with-x-toolkit --with-pop Fmakeinstall [ -e $Fdestdir/usr/info/dir.old ] && Frm /usr/info/dir.old From vmiklos at frugalware.org Sun Jun 8 14:55:34 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 14:55:36 2008 Subject: [Frugalware-git] pacman-tools: syncpkgcd: avoid conflict resolutions for git Message-ID: <20080608125534.7920211901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=92529b5651483220fb26abcd8f9ded2f3f43b476 commit 92529b5651483220fb26abcd8f9ded2f3f43b476 Author: Miklos Vajna Date: Sun Jun 8 14:54:02 2008 +0200 syncpkgcd: avoid conflict resolutions for git - till now we tried to resolve conflicts and then we removed all conflict markers - now we just always reset to what the remote repo has - this speeds up updaiting e.g. when switching between stable versions diff --git a/syncpkgd/syncpkgcd.py b/syncpkgd/syncpkgcd.py index 0c92566..a83d04f 100644 --- a/syncpkgd/syncpkgcd.py +++ b/syncpkgd/syncpkgcd.py @@ -119,8 +119,8 @@ class Syncpkgcd: os.stat(tree) os.chdir(tree) if scm == "git": - self.system("git pull") - self.system("git checkout -f") + self.system("git fetch") + self.system("git reset --hard origin/master") elif scm == "darcs": self.system("darcs pull -a") self.system("darcs revert -a") From vmiklos at frugalware.org Sun Jun 8 14:55:57 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 14:55:58 2008 Subject: [Frugalware-git] frugalware-0.8: aterm-1.0.1-2kalgan1-i686 Message-ID: <20080608125557.9B10E11901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=81542be839fedaf2f38bd1148c2ae1dba15f2799 commit 81542be839fedaf2f38bd1148c2ae1dba15f2799 Author: Miklos Vajna Date: Sun Jun 8 14:55:26 2008 +0200 aterm-1.0.1-2kalgan1-i686 - added -display-security-issue.patch - closes #3088 diff --git a/source/xlib/aterm/FrugalBuild b/source/xlib/aterm/FrugalBuild index b4fa398..41d7cda 100644 --- a/source/xlib/aterm/FrugalBuild +++ b/source/xlib/aterm/FrugalBuild @@ -3,7 +3,7 @@ pkgname=aterm pkgver=1.0.1 -pkgrel=1 +pkgrel=2kalgan1 pkgdesc="A VT100 terminal emulator for X with transparency support" url="http://aterm.sourceforge.net/" depends=('libxext' 'libsm' 'libxt') @@ -11,7 +11,9 @@ groups=('xlib') archs=('i686' 'x86_64') _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -sha1sums=('a975753b415306a0734efc3773de8a86129bb54b') +source=($source aterm-1.0.1-display-security-issue.patch) +sha1sums=('a975753b415306a0734efc3773de8a86129bb54b' \ + '11f7a0e6c2bc6fa7400d4c3f360d0da331a5b816') Fconfopts="$Fconfopts --enable-transparency=yes --enable-background-image --enable-fading \ --enable-menubar --enable-graphics" # optimization OK diff --git a/source/xlib/aterm/aterm-1.0.1-display-security-issue.patch b/source/xlib/aterm/aterm-1.0.1-display-security-issue.patch new file mode 100644 index 0000000..e44c0b3 --- /dev/null +++ b/source/xlib/aterm/aterm-1.0.1-display-security-issue.patch @@ -0,0 +1,24 @@ +--- aterm-1.0.1/src/main.c 2007-08-01 16:08:29.000000000 +0200 ++++ aterm-1.0.1.new/src/main.c 2008-05-03 14:06:52.000000000 +0200 +@@ -2057,10 +2057,6 @@ + */ + get_options(argc, argv); + +- if( display_name == NULL ) +- if ((display_name = getenv("DISPLAY")) == NULL) +- display_name = ":0"; +- + #ifdef HAVE_AFTERSTEP + #ifdef MyArgs_IS_MACRO + MyArgsPtr = safecalloc(1, sizeof(ASProgArgs) ); +@@ -2102,7 +2098,9 @@ + Xdisplay = XOpenDisplay(display_name); + + if (!Xdisplay) { +- print_error("can't open display %s", display_name); ++ print_error("can't open display %s", display_name?display_name: ++ getenv("DISPLAY")?getenv("DISPLAY"): ++ "as no -d given and DISPLAY not set"); + exit(EXIT_FAILURE); + } + /* changed from _MOTIF_WM_INFO - Vaevictus - gentoo bug #139554 */ From vmiklos at frugalware.org Sun Jun 8 15:00:26 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 15:00:27 2008 Subject: [Frugalware-git] frugalware-0.8: mrxvt-0.5.3-2kalgan1-i686 Message-ID: <20080608130026.D401A11901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=d03e29c308858703806427f03481d3fbb9875d1d commit d03e29c308858703806427f03481d3fbb9875d1d Author: Miklos Vajna Date: Sun Jun 8 14:59:49 2008 +0200 mrxvt-0.5.3-2kalgan1-i686 - added display-security.patch - closes #3090 diff --git a/source/x11-extra/mrxvt/FrugalBuild b/source/x11-extra/mrxvt/FrugalBuild index 4450b88..b554749 100644 --- a/source/x11-extra/mrxvt/FrugalBuild +++ b/source/x11-extra/mrxvt/FrugalBuild @@ -4,7 +4,7 @@ pkgname=mrxvt pkgver=0.5.3 -pkgrel=1 +pkgrel=2kalgan1 pkgdesc="Mrxvt(Materm) is a portable, lightweight, fast and multi-tabbed X terminal emulator based on rxvt." depends=('libjpeg' 'libsm' 'libxft' 'libpng' 'libxpm') groups=('x11-extra') @@ -12,7 +12,9 @@ archs=('i686' 'x86_64') _F_sourceforge_dirname="materm" Finclude sourceforge up2date="lynx -dump http://materm.sourceforge.net/wiki/Main/Download |grep Unstable -A10 |grep Release |sed -ne 's/.*vt-\(.*\) (.*/\1/;$ p'" -sha1sums=('442006f1d797ea5464c5c49d26d0cdecf79160f4') +source=($source mrxvt-0.5.3-display-security.patch) +sha1sums=('442006f1d797ea5464c5c49d26d0cdecf79160f4' \ + 'af49d324e36b9a719fd6065a5bbf9279aa8fa272') Fconfopts="$Fconfopts --enable-everything --disable-debug \ --disable-greek --disable-cjk --disable-thai --disable-utmp \ diff --git a/source/x11-extra/mrxvt/mrxvt-0.5.3-display-security.patch b/source/x11-extra/mrxvt/mrxvt-0.5.3-display-security.patch new file mode 100644 index 0000000..69f24d8 --- /dev/null +++ b/source/x11-extra/mrxvt/mrxvt-0.5.3-display-security.patch @@ -0,0 +1,64 @@ +Index: src/init.c +=================================================================== +--- src/init.c (revision 265) ++++ src/init.c (working copy) +@@ -1030,38 +1030,38 @@ + /* + * Open display, get options/resources and create the window + */ +- if (IS_NULL(rs[Rs_display_name] = getenv("DISPLAY"))) +- rs[Rs_display_name] = ":0"; +- + rxvt_get_options( r, r_argc, r_argv ); + rxvt_free( r_argv ); /* XXX memory leak? */ + + #ifdef LOCAL_X_IS_UNIX +- if( rs[Rs_display_name][0] == ':' ) ++ /* ++ * 2008-04-29 gi1242: Force UNIX sockets for security (Gentoo Bug #219750) ++ */ ++ if( IS_NULL( rs[Rs_display_name] ) ) ++ rs[Rs_display_name] = getenv( "DISPLAY" ); ++ ++ if( rs[Rs_display_name] && rs[Rs_display_name][0] == ':' ) + { +- int l = 5 + STRLEN(rs[Rs_display_name]); ++ char *val; ++ int l = 5 + STRLEN(rs[Rs_display_name]); + if (l <= 0 || l > 1024) /* possible integer overflow */ + l = 1024; ++ + val = rxvt_malloc(l); +- STRCPY(val, "unix"); +- STRNCAT(val, rs[Rs_display_name], l-5); +- val[l-1] = (char) 0; +- rxvt_msg (DBG_INFO, DBG_INIT, "Open X display %s\n", val); +- r->Xdisplay = XOpenDisplay(val); +- rxvt_free(val); ++ STRCPY( val, "unix"); ++ STRNCAT( val, rs[Rs_display_name], l-5); ++ ++ rs[Rs_display_name] = val; + } +-#endif ++#endif /* LOCAL_X_IS_UNIX */ + +- if (IS_NULL(r->Xdisplay)) ++ rxvt_msg( DBG_INFO, DBG_INIT, "Open X display %s\n", rs[Rs_display_name] ); ++ r->Xdisplay = XOpenDisplay( rs[Rs_display_name] ); ++ if( IS_NULL(r->Xdisplay) ) + { +- rxvt_msg (DBG_INFO, DBG_INIT, "Open X display %s\n", +- rs[Rs_display_name] ? rs[Rs_display_name] : "nil"); +- r->Xdisplay = XOpenDisplay( rs[Rs_display_name] ); +- if (IS_NULL(r->Xdisplay)) +- { +- rxvt_msg (DBG_ERROR, DBG_INIT, "can't open display %s", rs[Rs_display_name] ); +- exit( EXIT_FAILURE ); +- } ++ rxvt_msg( DBG_ERROR, DBG_INIT, "Error opening display %s\n", ++ rs[Rs_display_name] ); ++ exit( EXIT_FAILURE ); + } + + From vmiklos at frugalware.org Sun Jun 8 15:02:21 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 15:02:22 2008 Subject: [Frugalware-git] frugalware-0.8: rxvt-2.7.10-1kalgan1-i686 Message-ID: <20080608130221.061D411901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=88ebf5e4fa359d151c147b290d58e203dea1a8f0 commit 88ebf5e4fa359d151c147b290d58e203dea1a8f0 Author: Miklos Vajna Date: Sun Jun 8 15:01:46 2008 +0200 rxvt-2.7.10-1kalgan1-i686 - secfix bump - closes #2925 diff --git a/source/x11-extra/rxvt/CVE-2008-1142.patch b/source/x11-extra/rxvt/CVE-2008-1142.patch new file mode 100644 index 0000000..e817f8d --- /dev/null +++ b/source/x11-extra/rxvt/CVE-2008-1142.patch @@ -0,0 +1,52 @@ +# CVE-2008-1142 (rxvt 2.6.4 opens an xterm on :0 if the DISPLAY environment variable is not set, which might allow local users to hijack X11 connections.) +# Based on http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=41;filename=diff;att=1;bug=469296 +# bug 217819 + +diff -Naur rxvt-2.7.10.orig/rclock/rclock.c rxvt-2.7.10/rclock/rclock.c +--- rxvt-2.7.10.orig/rclock/rclock.c 2008-05-03 14:23:07.264082222 +0200 ++++ rxvt-2.7.10/rclock/rclock.c 2008-05-03 14:24:55.433082735 +0200 +@@ -324,9 +324,6 @@ + CheckMaildir(); + #endif + +- if ((display_name = getenv ("DISPLAY")) == NULL) +- display_name = ":0"; +- + /* parse the command line */ + for (i = 1; i < argc; i += 2) + { +@@ -424,7 +421,9 @@ + Xdisplay = XOpenDisplay (display_name); + if (!Xdisplay) + { +- print_error ("can't open display %s", display_name); ++ print_error ("can't open display %s", display_name?display_name: ++ getenv("DISPLAY")?getenv("DISPLAY"): ++ "as no -d given and DISPLAY not set"); + goto Abort; + } + +diff -Naur rxvt-2.7.10.orig/src/init.c rxvt-2.7.10/src/init.c +--- rxvt-2.7.10.orig/src/init.c 2008-05-03 14:23:07.247082766 +0200 ++++ rxvt-2.7.10/src/init.c 2008-05-03 14:43:44.705227631 +0200 +@@ -532,8 +532,7 @@ + /* + * Open display, get options/resources and create the window + */ +- if ((rs[Rs_display_name] = getenv("DISPLAY")) == NULL) +- rs[Rs_display_name] = ":0"; ++ rs[Rs_display_name] = getenv("DISPLAY"); + + rxvt_get_options(r, r_argc, r_argv); + free(r_argv); +@@ -550,7 +549,9 @@ + + if (r->Xdisplay == NULL + && (r->Xdisplay = XOpenDisplay(rs[Rs_display_name])) == NULL) { +- rxvt_print_error("can't open display %s", rs[Rs_display_name]); ++ rxvt_print_error("can't open display %s", ++ rs[Rs_display_name]?rs[Rs_display_name]: ++ "as no -display option given and DISPLAY not set"); + exit(EXIT_FAILURE); + } + diff --git a/source/x11-extra/rxvt/FrugalBuild b/source/x11-extra/rxvt/FrugalBuild index a015407..d8b5e93 100644 --- a/source/x11-extra/rxvt/FrugalBuild +++ b/source/x11-extra/rxvt/FrugalBuild @@ -3,15 +3,18 @@ # Maintainer: voroskoi pkgname=rxvt -pkgver=2.6.4 -pkgrel=2 +pkgver=2.7.10 +pkgrel=1kalgan1 pkgdesc="rxvt is a colour vt102 terminal emulator" url="http://sourceforge.net/projects/rxvt" depends=('libx11' 'libxt') groups=('x11-extra') archs=('i686' 'x86_64') Finclude sourceforge -sha1sums=('8cb4f01b131136b999f7b6c9d8674288fc5c18bc') +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=221|grep Latest|sed -n 's/.*]\(.*\) \[.*\].*/\1/;s/-/_/g;$ p'" +source=($source CVE-2008-1142.patch) +sha1sums=('dabb960d94703d4f81e9a9a50749210a2977ef2b' \ + '57a89c98ce1cfd725d19d4148439b8bf72faba97') Fconfopts="$Fconfopts --with-term=rxvt" # optimization OK From vmiklos at frugalware.org Sun Jun 8 15:05:18 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 15:05:20 2008 Subject: [Frugalware-git] frugalware-0.8: rxvt-unicode-9.02-2kalgan1-i686 Message-ID: <20080608130518.E9DA711901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=64e3b67a51491e04852889231c07115c07c4183b commit 64e3b67a51491e04852889231c07115c07c4183b Author: Miklos Vajna Date: Sun Jun 8 15:04:52 2008 +0200 rxvt-unicode-9.02-2kalgan1-i686 - added CVE-2008-1142.patch - closes #3089 diff --git a/source/x11-extra/rxvt-unicode/CVE-2008-1142.patch b/source/x11-extra/rxvt-unicode/CVE-2008-1142.patch new file mode 100644 index 0000000..6bcfb5c --- /dev/null +++ b/source/x11-extra/rxvt-unicode/CVE-2008-1142.patch @@ -0,0 +1,24 @@ +diff -urN rxvt-unicode-9.02.orig/src/init.C rxvt-unicode-9.02/src/init.C +--- rxvt-unicode-9.02.orig/src/init.C 2008-05-04 20:16:26.000000000 +0200 ++++ rxvt-unicode-9.02/src/init.C 2008-05-04 20:24:14.000000000 +0200 +@@ -372,15 +372,16 @@ + * Open display, get options/resources and create the window + */ + +- if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) +- rs[Rs_display_name] = ":0"; ++ rs[Rs_display_name] = getenv ("DISPLAY"); + + get_options (r_argc, r_argv); + +- if (!(display = displays.get (rs[Rs_display_name]))) ++ if (!rs[Rs_display_name] || !(display = displays.get (rs[Rs_display_name]))) + { + free (r_argv); +- rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); ++ rxvt_fatal ("can't open display %s, aborting.\n", ++ (rs[Rs_display_name] ? rs[Rs_display_name] : ++ "as no -display option given and DISPLAY not set")); + } + + // using a local pointer decreases code size a lot diff --git a/source/x11-extra/rxvt-unicode/FrugalBuild b/source/x11-extra/rxvt-unicode/FrugalBuild index ccdda4d..5b3d2e3 100644 --- a/source/x11-extra/rxvt-unicode/FrugalBuild +++ b/source/x11-extra/rxvt-unicode/FrugalBuild @@ -3,16 +3,18 @@ pkgname=rxvt-unicode pkgver=9.02 -pkgrel=1 +pkgrel=2kalgan1 pkgdesc="rxvt-unicode is a clone of the well known terminal emulator rxvt" url="http://software.schmorp.de/" depends=('perl>=5.10.0-2' 'libxft' 'libgcc') groups=('x11-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://dist.schmorp.de/rxvt-unicode/ |Flasttarbz2" -source=(http://dist.schmorp.de/rxvt-unicode/$pkgname-$pkgver.tar.bz2) +source=(http://dist.schmorp.de/rxvt-unicode/$pkgname-$pkgver.tar.bz2 \ + CVE-2008-1142.patch) Fconfopts="${Fconfopts[@]} --enable-everything" -sha1sums=('f58a851ab4bf2da60a926a4885749302e73a92ed') +sha1sums=('f58a851ab4bf2da60a926a4885749302e73a92ed' \ + 'de0ef44bdf799c7a41469f1082f7981348379faa') build() { Fmkdir /usr/share/terminfo From vmiklos at frugalware.org Sun Jun 8 15:12:29 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 15:12:31 2008 Subject: [Frugalware-git] frugalware-0.8: net-snmp-5.4.1-4kalgan1-i686 Message-ID: <20080608131229.B123D11901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=624aad4c208e7c6eb1d5a1badd99dc8a8f8fb35c commit 624aad4c208e7c6eb1d5a1badd99dc8a8f8fb35c Author: Miklos Vajna Date: Sun Jun 8 15:12:15 2008 +0200 net-snmp-5.4.1-4kalgan1-i686 - added CVE-2008-2292.patch - closes #3092 diff --git a/source/network-extra/net-snmp/CVE-2008-2292.patch b/source/network-extra/net-snmp/CVE-2008-2292.patch new file mode 100644 index 0000000..2295f11 --- /dev/null +++ b/source/network-extra/net-snmp/CVE-2008-2292.patch @@ -0,0 +1,101 @@ +--- net-snmp/perl/SNMP/SNMP.xs 2007/12/20 16:26:01 16765 ++++ net-snmp/perl/SNMP/SNMP.xs 2007/12/22 19:22:44 16770 +@@ -470,14 +470,16 @@ + if (flag == USE_ENUMS) { + for(ep = tp->enums; ep; ep = ep->next) { + if (ep->value == *var->val.integer) { +- strcpy(buf, ep->label); ++ strncpy(buf, ep->label, buf_len); ++ buf[buf_len-1] = '\0'; + len = strlen(buf); + break; + } + } + } + if (!len) { +- sprintf(buf,"%ld", *var->val.integer); ++ snprintf(buf, buf_len, "%ld", *var->val.integer); ++ buf[buf_len-1] = '\0'; + len = strlen(buf); + } + break; +@@ -486,21 +488,25 @@ + case ASN_COUNTER: + case ASN_TIMETICKS: + case ASN_UINTEGER: +- sprintf(buf,"%lu", (unsigned long) *var->val.integer); ++ snprintf(buf, buf_len, "%lu", (unsigned long) *var->val.integer); ++ buf[buf_len-1] = '\0'; + len = strlen(buf); + break; + + case ASN_OCTET_STR: + case ASN_OPAQUE: +- memcpy(buf, (char*)var->val.string, var->val_len); + len = var->val_len; ++ if ( len > buf_len ) ++ len = buf_len; ++ memcpy(buf, (char*)var->val.string, len); + break; + + case ASN_IPADDRESS: +- ip = (u_char*)var->val.string; +- sprintf(buf, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]); +- len = strlen(buf); +- break; ++ ip = (u_char*)var->val.string; ++ snprintf(buf, buf_len, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]); ++ buf[buf_len-1] = '\0'; ++ len = strlen(buf); ++ break; + + case ASN_NULL: + break; +@@ -512,14 +518,14 @@ + break; + + case SNMP_ENDOFMIBVIEW: +- sprintf(buf,"%s", "ENDOFMIBVIEW"); +- break; ++ snprintf(buf, buf_len, "%s", "ENDOFMIBVIEW"); ++ break; + case SNMP_NOSUCHOBJECT: +- sprintf(buf,"%s", "NOSUCHOBJECT"); +- break; ++ snprintf(buf, buf_len, "%s", "NOSUCHOBJECT"); ++ break; + case SNMP_NOSUCHINSTANCE: +- sprintf(buf,"%s", "NOSUCHINSTANCE"); +- break; ++ snprintf(buf, buf_len, "%s", "NOSUCHINSTANCE"); ++ break; + + case ASN_COUNTER64: + #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES +@@ -538,19 +544,19 @@ + #endif + + case ASN_BIT_STR: +- snprint_bitstring(buf, sizeof(buf), var, NULL, NULL, NULL); ++ snprint_bitstring(buf, buf_len, var, NULL, NULL, NULL); + len = strlen(buf); + break; + #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES + case ASN_OPAQUE_FLOAT: +- if (var->val.floatVal) +- sprintf(buf,"%f", *var->val.floatVal); +- break; ++ if (var->val.floatVal) ++ snprintf(buf, buf_len, "%f", *var->val.floatVal); ++ break; + + case ASN_OPAQUE_DOUBLE: +- if (var->val.doubleVal) +- sprintf(buf,"%f", *var->val.doubleVal); +- break; ++ if (var->val.doubleVal) ++ snprintf(buf, buf_len, "%f", *var->val.doubleVal); ++ break; + #endif + + case ASN_NSAP: diff --git a/source/network-extra/net-snmp/FrugalBuild b/source/network-extra/net-snmp/FrugalBuild index 56cb130..807bd2e 100644 --- a/source/network-extra/net-snmp/FrugalBuild +++ b/source/network-extra/net-snmp/FrugalBuild @@ -4,7 +4,7 @@ pkgname=net-snmp pkgver=5.4.1 -pkgrel=3 +pkgrel=4kalgan1 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" url="http://www.net-snmp.org/" depends=('openssl' 'perl>=5.10.0') @@ -12,7 +12,10 @@ groups=('network-extra') archs=('i686' 'x86_64') Finclude sourceforge up2date="lynx -dump http://www.net-snmp.org/download.html |grep Supported -A 2 |sed -ne 's/.*\([0-9].[0-9].[0-9]\).*/\1/;$ p'" -source=(${source[@]} rc.snmpd) +source=(${source[@]} CVE-2008-2292.patch rc.snmpd) +sha1sums=('ac5ba033c10d53d3057415121f8c4936c643c208' \ + '7f7f770fcebdeb8bb19515937895c9c545cc0609' \ + 'df7a817499d12c53e9d2809f68c24fea9d3307b0') build() { unset MAKEFLAGS @@ -22,7 +25,5 @@ build() { --with-logfile="/var/log/snmpd.log" --with-persistent-directory="/var/net-snmp" Frcd2 snmpd } -sha1sums=('ac5ba033c10d53d3057415121f8c4936c643c208' \ - 'df7a817499d12c53e9d2809f68c24fea9d3307b0') # optimization OK From vmiklos at frugalware.org Sun Jun 8 15:21:08 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 15:21:09 2008 Subject: [Frugalware-git] frugalware-0.8: libvorbis-1.2.0-2kalgan1-i686 Message-ID: <20080608132108.4705911901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=f2e1e93b765bb5209bbc187cb7e39a7197da9e6d commit f2e1e93b765bb5209bbc187cb7e39a7197da9e6d Author: Miklos Vajna Date: Sun Jun 8 15:20:14 2008 +0200 libvorbis-1.2.0-2kalgan1-i686 - added CVE-2008-14{19,20,23}.patch - closes #3093 diff --git a/source/lib/libvorbis/CVE-2008-1419.patch b/source/lib/libvorbis/CVE-2008-1419.patch new file mode 100644 index 0000000..fd73f23 --- /dev/null +++ b/source/lib/libvorbis/CVE-2008-1419.patch @@ -0,0 +1,13 @@ +Index: lib/codebook.c +=================================================================== +--- lib/codebook.c (revision 14601) ++++ lib/codebook.c (revision 14602) +@@ -225,7 +225,7 @@ + int quantvals=0; + switch(s->maptype){ + case 1: +- quantvals=_book_maptype1_quantvals(s); ++ quantvals=(s->dim==0?0:_book_maptype1_quantvals(s)); + break; + case 2: + quantvals=s->entries*s->dim; diff --git a/source/lib/libvorbis/CVE-2008-1420.patch b/source/lib/libvorbis/CVE-2008-1420.patch new file mode 100644 index 0000000..819cbf0 --- /dev/null +++ b/source/lib/libvorbis/CVE-2008-1420.patch @@ -0,0 +1,34 @@ +Index: lib/res0.c +=================================================================== +--- lib/res0.c (revision 14597) ++++ lib/res0.c (revision 14598) +@@ -223,6 +223,20 @@ + for(j=0;jbooklist[j]>=ci->books)goto errout; + ++ /* verify the phrasebook is not specifying an impossible or ++ inconsistent partitioning scheme. */ ++ { ++ int entries = ci->book_param[info->groupbook]->entries; ++ int dim = ci->book_param[info->groupbook]->dim; ++ int partvals = 1; ++ while(dim>0){ ++ partvals *= info->partitions; ++ if(partvals > entries) goto errout; ++ dim--; ++ } ++ if(partvals != entries) goto errout; ++ } ++ + return(info); + errout: + res0_free_info(info); +@@ -263,7 +277,7 @@ + } + } + +- look->partvals=rint(pow((float)look->parts,(float)dim)); ++ look->partvals=look->phrasebook->entries; + look->stages=maxstage; + look->decodemap=_ogg_malloc(look->partvals*sizeof(*look->decodemap)); + for(j=0;jpartvals;j++){ diff --git a/source/lib/libvorbis/CVE-2008-1423.patch b/source/lib/libvorbis/CVE-2008-1423.patch new file mode 100644 index 0000000..8c7c479 --- /dev/null +++ b/source/lib/libvorbis/CVE-2008-1423.patch @@ -0,0 +1,13 @@ +Index: lib/codebook.c +=================================================================== +--- lib/codebook.c (revision 14603) ++++ lib/codebook.c (revision 14604) +@@ -159,6 +159,8 @@ + s->entries=oggpack_read(opb,24); + if(s->entries==-1)goto _eofout; + ++ if(_ilog(s->dim)+_ilog(s->entries)>24)goto _eofout; ++ + /* codeword ordering.... length ordered or unordered? */ + switch((int)oggpack_read(opb,1)){ + case 0: diff --git a/source/lib/libvorbis/FrugalBuild b/source/lib/libvorbis/FrugalBuild index afbfbb5..ae0ea78 100644 --- a/source/lib/libvorbis/FrugalBuild +++ b/source/lib/libvorbis/FrugalBuild @@ -4,20 +4,24 @@ pkgname=libvorbis pkgver=1.2.0 -pkgrel=1 +pkgrel=2kalgan1 pkgdesc="Vorbis codec library" url="http://www.vorbis.com/" groups=('lib') archs=('i686' 'x86_64' 'ppc') depends=('glibc' 'libogg') up2date="lynx -dump http://www.xiph.org/downloads/|grep libvorbis-|Flasttar" -source=(http://downloads.xiph.org/releases/vorbis/$pkgname-$pkgver.tar.gz) -sha1sums=('6ff5f9d9d71cc385ee180171cc21af5653b76a16') +source=(http://downloads.xiph.org/releases/vorbis/$pkgname-$pkgver.tar.gz \ + CVE-2008-1419.patch CVE-2008-1420.patch CVE-2008-1423.patch) +sha1sums=('6ff5f9d9d71cc385ee180171cc21af5653b76a16' \ + '4631f34d2586864aee96bdf93eb52ddd4c7aceaa' \ + 'ee5f3d023f6d9d756c433f7ce4af5d88996d2ab3' \ + '85b32994f2d2ebff248020857d4d44ecd7afeb85') build() { Fcd - ## god ... + ## god ... Fsed '-O20' '' configure* Fautoreconf Fbuild From crazy at frugalware.org Sun Jun 8 16:11:36 2008 From: crazy at frugalware.org (crazy) Date: Sun Jun 8 16:11:38 2008 Subject: [Frugalware-git] frugalware-current: vlc-0.8.6-18-x86_64 Message-ID: <20080608141136.19AE911901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=36d58b9340b548200beec84767c46c2464ab5b58 commit 36d58b9340b548200beec84767c46c2464ab5b58 Author: crazy Date: Sun Jun 8 16:09:43 2008 +0200 vlc-0.8.6-18-x86_64 * Version bump to patchlevel 'h' * added a note about live being broken at the moment * fixed typo for mad in Fconf * added libmodplug and libmpcdec to depends * added backport patch from 0.9 to fix broken volume * display with wx28 , this closes FS#2859 in -current diff --git a/source/xmultimedia-extra/vlc/FrugalBuild b/source/xmultimedia-extra/vlc/FrugalBuild index 134b393..d34aa03 100644 --- a/source/xmultimedia-extra/vlc/FrugalBuild +++ b/source/xmultimedia-extra/vlc/FrugalBuild @@ -4,15 +4,14 @@ pkgname=vlc pkgver=0.8.6 -pkgextraver=g -pkgrel=17 +pkgextraver=h +pkgrel=18 pkgdesc="The cross-platform media player and streaming server." url="http://www.videolan.org/vlc/" depends=('alsa-lib' 'dbus-glib>=0.71' 'hal>=0.5.7.1-3' 'libxml2' 'libdvdnav' 'libmad' 'libmatroska' \ - 'mpeg2dec' 'ffmpeg>=20080427' 'fribidi' 'wxgtk-u8>=2.8.7' 'live' 'speex>=1.2beta3.2' 'libdca' \ - 'sysfsutils' 'mesa' 'libdvbpsi' 'libxv' 'sdlimage' 'libcdio' \ - 'libid3tag' 'libtheora' 'faad2' 'xvidcore' 'libtheora' 'libebml>=0.7.8' \ - 'libtar') + 'mpeg2dec' 'ffmpeg>=20080427' 'fribidi' 'wxgtk-u8>=2.8.7' 'speex>=1.2beta3.2' 'libdca' \ + 'sysfsutils' 'mesa' 'libdvbpsi' 'libxv' 'sdlimage' 'libcdio' 'libid3tag' 'libtheora' 'faad2' \ + 'xvidcore' 'libtheora' 'libebml>=0.7.8' 'libmpcdec' 'libmodplug') makedepends=('firefox' 'samba' 'cvs') options=('scriptlet') groups=('xmultimedia-extra') @@ -20,11 +19,12 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url/download-sources.html|grep -m1 'Latest VLC'|sed 's/.*(\(.*\)).*/\1/;s/$pkgextraver//'" source=(http://download.videolan.org/pub/videolan/vlc/$pkgver$pkgextraver/$pkgname-$pkgver$pkgextraver.tar.bz2 \ $pkgname.desktop vlc-0.8.5-libintl.diff \ - libdca.patch) -sha1sums=('6dab0e1593607d3a1ee585ba009b99627477f467' \ + libdca.patch vlc-0.8.x-wx28-volume-backport.patch) +sha1sums=('142ff3362e46681ee2ace6276c4add5905d210ca' \ '0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0' \ '50bfbc12fc0ad94178b2e08df22a0b26da36c1d5' \ - 'edc3a14dfd9b022dca7593e006c324fa5cc17e48') + 'edc3a14dfd9b022dca7593e006c324fa5cc17e48' \ + 'd039b606217ab166e4fa3e50d91a0285478dab24') build() { @@ -38,21 +38,21 @@ build() ./bootstrap || return 1 #autoconf || Fdie Fconf \ + --enable-mpc \ --enable-faad \ --enable-dvdread \ --enable-dvdnav \ - --enable-madi \ + --enable-mad \ --enable-ffmpeg \ --enable-theora \ --disable-rpath \ --disable-nls \ + --disable-optimizations \ --enable-alsa \ --disable-skins2 \ --enable-mozilla \ --enable-v4l \ --enable-realrtsp \ - --enable-live555 \ - --with-live555-tree=/usr/lib/live \ --enable-speex \ --enable-wxwidgets \ --with-wx-config=wx-config-u8 \ @@ -62,6 +62,8 @@ build() --with-dvbpsi=/usr/include/dvbpsi \ --enable-libtool \ --with-ffmpeg-{mp3lame,faac,faad,dts,vorbis,theora,ogg} + ## broken , fpm size grows to near 70M , disabled for now + # --enable-live555 --with-live555-tree=/usr/lib/live Fsed '%{idldir}' '/usr/share/idl/firefox' mozilla/Makefile make || return 1 Fmakeinstall plugindir=/usr/lib/mozilla/plugins/ \ diff --git a/source/xmultimedia-extra/vlc/vlc-0.8.x-wx28-volume-backport.patch b/source/xmultimedia-extra/vlc/vlc-0.8.x-wx28-volume-backport.patch new file mode 100644 index 0000000..05d89e1 --- /dev/null +++ b/source/xmultimedia-extra/vlc/vlc-0.8.x-wx28-volume-backport.patch @@ -0,0 +1,286 @@ +diff -Naurp vlc-0.8.6h/modules/gui/wxwidgets/interface.cpp vlc-0.8.6h-fw-backport/modules/gui/wxwidgets/interface.cpp +--- vlc-0.8.6h/modules/gui/wxwidgets/interface.cpp 2008-05-25 20:28:57.000000000 +0200 ++++ vlc-0.8.6h-fw-backport/modules/gui/wxwidgets/interface.cpp 2008-06-08 15:55:02.000000000 +0200 +@@ -67,7 +67,7 @@ + /***************************************************************************** + * Local prototypes + *****************************************************************************/ +-static int InteractCallback( vlc_object_t *, const char *, vlc_value_t, ++ static int InteractCallback( vlc_object_t *, const char *, vlc_value_t, + vlc_value_t, void *); + + /***************************************************************************** +@@ -93,33 +93,6 @@ private: + + }; + +-class wxVolCtrl; +-class VLCVolCtrl : public wxControl +-{ +-public: +- VLCVolCtrl( intf_thread_t *p_intf, wxWindow *p_parent ); +- virtual ~VLCVolCtrl() {}; +- +- virtual void OnPaint( wxPaintEvent &event ); +- void OnChange( wxMouseEvent& event ); +- void UpdateVolume(); +- +- private: +- DECLARE_EVENT_TABLE() +- +- wxVolCtrl *gauge; +- int i_y_offset; +- vlc_bool_t b_mute; +- intf_thread_t *p_intf; +-}; +- +-BEGIN_EVENT_TABLE(VLCVolCtrl, wxControl) +- EVT_PAINT(VLCVolCtrl::OnPaint) +- +- /* Mouse events */ +- EVT_LEFT_UP(VLCVolCtrl::OnChange) +-END_EVENT_TABLE() +- + class Splitter : public wxSplitterWindow + { + public: +@@ -291,6 +264,8 @@ enum + NextStream_Event, + SlowStream_Event, + FastStream_Event, ++ ToggleMute_Event, ++ SlideVolume_Event, + + /* it is important for the id corresponding to the "About" command to have + * this standard value as otherwise it won't be handled properly under Mac +@@ -344,6 +319,8 @@ BEGIN_EVENT_TABLE(Interface, wxFrame) + EVT_MENU(NextStream_Event, Interface::OnNextStream) + EVT_MENU(SlowStream_Event, Interface::OnSlowStream) + EVT_MENU(FastStream_Event, Interface::OnFastStream) ++ EVT_MENU(ToggleMute_Event, Interface::OnToggleMute) ++ EVT_COMMAND_SCROLL(SlideVolume_Event, Interface::OnSlideVolume) + + /* Custom events */ + EVT_COMMAND(0, wxEVT_INTF, Interface::OnControlEvent) +@@ -530,7 +507,7 @@ void Interface::Init() + void Interface::Update() + { + /* Misc updates */ +- if( !(i_update_counter % 10) ) ((VLCVolCtrl *)volctrl)->UpdateVolume(); ++// if( !(i_update_counter % 10) ) ((VLCVolCtrl *)volctrl)->UpdateVolume(); + + if( playlist_manager ) playlist_manager->Update(); + +@@ -683,6 +660,7 @@ void Interface::CreateOurToolBar() + #define HELP_PLN N_("Next playlist item") + #define HELP_SLOW N_("Play slower") + #define HELP_FAST N_("Play faster") ++#define HELP_VOL N_("Toggle mute/unmute of the audio") + + #define LABEL_OPEN N_("Open") + #define LABEL_STOP N_("Stop") +@@ -694,6 +672,8 @@ void Interface::CreateOurToolBar() + #define LABEL_PLN N_("Next") + #define LABEL_SLOW N_("Slower") + #define LABEL_FAST N_("Faster") ++#define LABEL_VOL N_("Mute") ++ + int minimal = config_GetInt( p_intf, "wx-minimal" ); + bool label = config_GetInt( p_intf, "wx-labels" ); + +@@ -740,14 +720,15 @@ void Interface::CreateOurToolBar() + wxBitmap( playlist_small_xpm ), wxU(_(HELP_SPLO)) ); + } + +- wxControl *p_dummy_ctrl = +- new wxControl( toolbar, -1, wxDefaultPosition, +- wxSize(16, 16 ), wxBORDER_NONE ); +- +- toolbar->AddControl( p_dummy_ctrl ); +- +- volctrl = new VLCVolCtrl( p_intf, toolbar ); +- toolbar->AddControl( volctrl ); ++ wxToolBarToolBase *v_tool = toolbar->AddTool( ToggleMute_Event, ++ wxU(LABEL_VOL), wxBitmap( speaker_xpm ), ++ wxU(_(HELP_VOL)), wxITEM_CHECK ); ++ v_tool->SetClientData( v_tool ); ++ ++ wxSlider *v_gauge = new wxSlider(toolbar, SlideVolume_Event, 256, 0, ++ AOUT_VOLUME_MAX, wxDefaultPosition, ++ wxSize(64,TOOLBAR_BMP_HEIGHT), wxSL_HORIZONTAL); ++ toolbar->AddControl(v_gauge); + + toolbar->Realize(); + +@@ -1199,6 +1180,49 @@ void Interface::OnFastStream( wxCommandE + } + } + ++void Interface::OnToggleMute ( wxCommandEvent& WXUNUSED(event) ) ++{ ++ aout_VolumeMute(p_intf, NULL); ++ SyncVolume(); ++ ++} ++ ++void Interface::SyncVolume() ++{ ++ wxToolBarToolBase *p_tool = (wxToolBarToolBase *) ++ GetToolBar()->GetToolClientData( ToggleMute_Event ); ++ if ( !p_tool) return; ++ ++ audio_volume_t i_volume; ++ aout_VolumeGet(p_intf, &i_volume); ++ ++// Updating the Mute Button... IF the slider is completely moved to the left, ++// the mute icon is shown too. ++ p_tool->SetNormalBitmap( wxBitmap( i_volume ? speaker_xpm : speaker_mute_xpm ) ); ++ GetToolBar()->Realize(); ++#if defined( __WXMSW__ ) ++ /* Needed to work around a bug in wxToolBar::Realize() */ ++ GetToolBar()->SetSize( GetSize().GetWidth(), ++ GetToolBar()->GetSize().GetHeight() ); ++ GetToolBar()->Update(); ++#endif ++// the Toggle to true and false is nescessary; otherwise, the Icon is not repainted ++ GetToolBar()->ToggleTool( ToggleMute_Event, true ); ++ GetToolBar()->ToggleTool( ToggleMute_Event, false ); ++ GetToolBar()->Update(); ++} ++ ++void Interface::OnSlideVolume( wxScrollEvent& WXUNUSED(event)) ++{ ++ wxSlider *p_tool = (wxSlider *) ++ GetToolBar()->FindControl( SlideVolume_Event ); ++ if ( !p_tool) return; ++ ++ aout_VolumeSet(p_intf , p_tool->GetValue()); ++ SyncVolume(); ++ ++} ++ + void Interface::TogglePlayButton( int i_playing_status ) + { + wxToolBarToolBase *p_tool = (wxToolBarToolBase *) +@@ -1325,108 +1349,6 @@ bool DragAndDrop::OnDropFiles( wxCoord, + #endif + + /***************************************************************************** +- * Definition of VolCtrl class. +- *****************************************************************************/ +-class wxVolCtrl: public wxGauge +-{ +-public: +- /* Constructor */ +- wxVolCtrl( intf_thread_t *_p_intf, wxWindow* parent, wxWindowID id, +- wxPoint = wxDefaultPosition, wxSize = wxSize( 20, -1 ) ); +- virtual ~wxVolCtrl() {}; +- +- void UpdateVolume(); +- int GetVolume(); +- +- void OnChange( wxMouseEvent& event ); +- +-private: +- intf_thread_t *p_intf; +- +- DECLARE_EVENT_TABLE(); +-}; +- +-BEGIN_EVENT_TABLE(wxVolCtrl, wxWindow) +- /* Mouse events */ +- EVT_LEFT_DOWN(wxVolCtrl::OnChange) +- EVT_MOTION(wxVolCtrl::OnChange) +-END_EVENT_TABLE() +- +-wxVolCtrl::wxVolCtrl( intf_thread_t *_p_intf, wxWindow* parent, wxWindowID id, +- wxPoint point, wxSize size ) +- : wxGauge( parent, id, 200, point, size, wxGA_HORIZONTAL | wxGA_SMOOTH ) +-{ +- p_intf = _p_intf; +- UpdateVolume(); +-} +- +-void wxVolCtrl::OnChange( wxMouseEvent& event ) +-{ +- if( !event.LeftDown() && !event.LeftIsDown() ) return; +- +- int i_volume = event.GetX() * 200 / GetClientSize().GetWidth(); +- aout_VolumeSet( p_intf, i_volume * AOUT_VOLUME_MAX / 200 / 2 ); +- UpdateVolume(); +-} +- +-void wxVolCtrl::UpdateVolume() +-{ +- audio_volume_t i_volume; +- aout_VolumeGet( p_intf, &i_volume ); +- +- int i_gauge_volume = i_volume * 200 * 2 / AOUT_VOLUME_MAX; +- if( i_gauge_volume == GetValue() ) return; +- +- SetValue( i_gauge_volume ); +- SetToolTip( wxString::Format((wxString)wxU(_("Volume")) + wxT(" %d"), +- i_gauge_volume / 2 ) ); +-} +- +-#if defined(__WXGTK__) +-#define VLCVOL_HEIGHT p_parent->GetSize().GetHeight() +-#else +-#define VLCVOL_HEIGHT TOOLBAR_BMP_HEIGHT +-#endif +-VLCVolCtrl::VLCVolCtrl( intf_thread_t *_p_intf, wxWindow *p_parent ) +- :wxControl( p_parent, -1, wxDefaultPosition, wxSize(64, VLCVOL_HEIGHT ), +- wxBORDER_NONE ), +- i_y_offset((VLCVOL_HEIGHT - TOOLBAR_BMP_HEIGHT) / 2), +- b_mute(0), p_intf(_p_intf) +-{ +- gauge = new wxVolCtrl( p_intf, this, -1, wxPoint( 18, i_y_offset ), +- wxSize( 44, TOOLBAR_BMP_HEIGHT ) ); +-} +- +-void VLCVolCtrl::OnPaint( wxPaintEvent &evt ) +-{ +- wxPaintDC dc( this ); +- wxBitmap mPlayBitmap( b_mute ? speaker_mute_xpm : speaker_xpm ); +- dc.DrawBitmap( mPlayBitmap, 0, i_y_offset, TRUE ); +-} +- +-void VLCVolCtrl::OnChange( wxMouseEvent& event ) +-{ +- if( event.GetX() < TOOLBAR_BMP_WIDTH ) +- { +- int i_volume; +- aout_VolumeMute( p_intf, (audio_volume_t *)&i_volume ); +- +- b_mute = !b_mute; +- Refresh(); +- } +-} +- +-void VLCVolCtrl::UpdateVolume() +-{ +- gauge->UpdateVolume(); +- +- int i_volume = gauge->GetValue(); +- if( !!i_volume == !b_mute ) return; +- b_mute = !b_mute; +- Refresh(); +-} +- +-/***************************************************************************** + * Systray class. + *****************************************************************************/ + +diff -Naurp vlc-0.8.6h/modules/gui/wxwidgets/interface.hpp vlc-0.8.6h-fw-backport/modules/gui/wxwidgets/interface.hpp +--- vlc-0.8.6h/modules/gui/wxwidgets/interface.hpp 2008-05-25 20:28:57.000000000 +0200 ++++ vlc-0.8.6h-fw-backport/modules/gui/wxwidgets/interface.hpp 2008-06-08 15:55:02.000000000 +0200 +@@ -147,6 +147,9 @@ namespace wxvlc + void OnNextStream( wxCommandEvent& event ); + void OnSlowStream( wxCommandEvent& event ); + void OnFastStream( wxCommandEvent& event ); ++ void OnToggleMute( wxCommandEvent& event ); ++ void OnSlideVolume( wxScrollEvent& event ); ++ void SyncVolume( ); + + void OnInteraction( wxCommandEvent& event ); + From crazy at frugalware.org Sun Jun 8 16:24:34 2008 From: crazy at frugalware.org (crazy) Date: Sun Jun 8 16:24:35 2008 Subject: [Frugalware-git] frugalware-current: msmtp-1.4.15-1-x86_64 Message-ID: <20080608142434.3A95E11901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=df3d461dabbe728870a59426451ffc5db1a9c1aa commit df3d461dabbe728870a59426451ffc5db1a9c1aa Author: crazy Date: Sun Jun 8 16:23:51 2008 +0200 msmtp-1.4.15-1-x86_64 * Version bump diff --git a/source/network-extra/msmtp/FrugalBuild b/source/network-extra/msmtp/FrugalBuild index 6d97c2f..16a2c75 100644 --- a/source/network-extra/msmtp/FrugalBuild +++ b/source/network-extra/msmtp/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=msmtp -pkgver=1.4.14 +pkgver=1.4.15 pkgrel=1 pkgdesc="msmtp is small light SMTP Client" license="GPL 2" @@ -11,6 +11,6 @@ archs=('i686' 'x86_64') _F_sourceforge_ext=".tar.bz2" Finclude sourceforge depends=('libgcrypt' 'gnutls>=2.2' 'zlib' 'libidn' 'gettext') -sha1sums=('f42403348a3c7dd3ca802714915aab8f90142381') +sha1sums=('fbbd6e0f818ab0c0ffd2eeb1e3843114481ae5ca') # optimization OK From crazy at frugalware.org Sun Jun 8 16:29:49 2008 From: crazy at frugalware.org (crazy) Date: Sun Jun 8 16:29:51 2008 Subject: [Frugalware-git] frugalware-current: cherokee-0.7.1-1-x86_64 Message-ID: <20080608142949.ABD7711901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e9210a5b19fdaab00f6613ef7c0d88a0f61adf04 commit e9210a5b19fdaab00f6613ef7c0d88a0f61adf04 Author: crazy Date: Sun Jun 8 16:28:25 2008 +0200 cherokee-0.7.1-1-x86_64 * Version bump diff --git a/source/network-extra/cherokee/FrugalBuild b/source/network-extra/cherokee/FrugalBuild index 926175c..8b908b5 100644 --- a/source/network-extra/cherokee/FrugalBuild +++ b/source/network-extra/cherokee/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Laszlo Dvornik pkgname=cherokee -pkgver=0.7.0 +pkgver=0.7.1 pkgrel=1 pkgdesc="A flexible, very fast, lightweight HTTP server" url="http://www.cherokee-project.com/" @@ -21,7 +21,7 @@ source=($pkgurl/0.7/$pkgver/cherokee-$pkgver.tar.gz \ generatessl \ index.html \ http://frugalware.org/images/frugalware.png) -sha1sums=('33d3668b641b7f4b7d361169f0c389d97d4720b5' \ +sha1sums=('d45363eb8321fb85388988091b1a16503f07a596' \ '7559de6a098bbc3e460ef396a7aaea27c551311b' \ '90db20b5183c6e22e91488fd6d44df47018b1942' \ 'f3afa484129a065ce22f326ec13104af87a9fca5' \ From vmiklos at frugalware.org Sun Jun 8 16:39:28 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 16:39:30 2008 Subject: [Frugalware-git] frugalware-0.8: blender-2.45-2kalgan1-i686 Message-ID: <20080608143928.4E2F31770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=c4bbc6f06466cdd2c10844a0301bc03ef4a84235 commit c4bbc6f06466cdd2c10844a0301bc03ef4a84235 Author: Miklos Vajna Date: Sun Jun 8 16:38:02 2008 +0200 blender-2.45-2kalgan1-i686 - added 20_gcc4.3_support.diff - added 30_fix_CVE-2008-1102.diff - closes #3039 diff --git a/source/xapps-extra/blender/20_gcc4.3_support.diff b/source/xapps-extra/blender/20_gcc4.3_support.diff new file mode 100644 index 0000000..32b2dbd --- /dev/null +++ b/source/xapps-extra/blender/20_gcc4.3_support.diff @@ -0,0 +1,85 @@ +--- a/intern/SoundSystem/intern/SND_Utils.cpp ++++ b/intern/SoundSystem/intern/SND_Utils.cpp +@@ -47,6 +47,7 @@ + #include + #include + #include ++#include + + #if defined(WIN32) + #include +--- a/intern/ghost/intern/GHOST_WindowX11.cpp ++++ b/intern/ghost/intern/GHOST_WindowX11.cpp +@@ -42,6 +42,8 @@ + #include + #endif + ++#include ++ + + // For obscure full screen mode stuuf + // lifted verbatim from blut. +--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/glext.h ++++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/glext.h +@@ -54,7 +54,9 @@ + /* Header file version number, required by OpenGL ABI for Linux */ + /* glext.h last updated 2005/06/20 */ + /* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */ ++#ifndef GL_GLEXT_VERSION + #define GL_GLEXT_VERSION 29 ++#endif + + #ifndef GL_VERSION_1_2 + #define GL_UNSIGNED_BYTE_3_3_2 0x8032 +--- a/intern/string/STR_String.h ++++ b/intern/string/STR_String.h +@@ -47,6 +47,8 @@ + + #include + #include ++#include ++#include + using namespace std; + + +--- a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp ++++ b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp +@@ -30,6 +30,8 @@ + * ***** END GPL/BL DUAL LICENSE BLOCK ***** + */ + ++#include ++ + #include "GPC_KeyboardDevice.h" + + /** +--- a/source/blender/yafray/intern/yafray_Render.cpp ++++ b/source/blender/yafray/intern/yafray_Render.cpp +@@ -7,6 +7,7 @@ + #include "yafray_Render.h" + + #include ++#include + + using namespace std; + +--- a/source/blender/yafray/intern/export_Plugin.cpp ++++ b/source/blender/yafray/intern/export_Plugin.cpp +@@ -1,6 +1,7 @@ + #include "export_Plugin.h" + + #include ++#include + using namespace std; + + +--- a/source/blender/yafray/intern/export_File.cpp ++++ b/source/blender/yafray/intern/export_File.cpp +@@ -1,6 +1,7 @@ + #include "export_File.h" + + #include ++#include + + using namespace std; + diff --git a/source/xapps-extra/blender/30_fix_CVE-2008-1102.diff b/source/xapps-extra/blender/30_fix_CVE-2008-1102.diff new file mode 100644 index 0000000..75e093d --- /dev/null +++ b/source/xapps-extra/blender/30_fix_CVE-2008-1102.diff @@ -0,0 +1,12 @@ +--- a/source/blender/imbuf/intern/radiance_hdr.c ++++ b/source/blender/imbuf/intern/radiance_hdr.c +@@ -191,7 +191,8 @@ struct ImBuf *imb_loadhdr(unsigned char + } + } + if (found) { +- sscanf((char*)&mem[x+1], "%s %d %s %d", (char*)&oriY, &height, (char*)&oriX, &width); ++ if (sscanf((char *)&mem[x+1], "%79s %d %79s %d", (char*)&oriY, &height, ++ (char*)&oriX, &width) != 4) return NULL; + + /* find end of this line, data right behind it */ + ptr = (unsigned char *)strchr((char*)&mem[x+1], '\n'); diff --git a/source/xapps-extra/blender/FrugalBuild b/source/xapps-extra/blender/FrugalBuild index 40ea028..81d9424 100644 --- a/source/xapps-extra/blender/FrugalBuild +++ b/source/xapps-extra/blender/FrugalBuild @@ -5,25 +5,26 @@ pkgname=blender pkgver=2.45 pkgextraver= -pkgrel=1 +pkgrel=2kalgan1 pkgdesc="A 3D modeling/rendering/animation/gaming application" url="http://blender.org" Finclude python -depends=('libjpeg' 'libpng' 'freetype2' 'freealut' 'openexr' 'ffmpeg>=20070422' 'openal>=0.0.8-4' "python>=$_F_python_ver" 'libtiff') +depends=('libjpeg' 'libpng' 'freetype2' 'freealut' 'openexr' 'openal>=0.0.8-4' "python>=$_F_python_ver" 'libtiff') groups=('xapps-extra') archs=('i686' 'x86_64') makedepends=('cmake' 'ftgl') up2date="lynx -dump http://www.blender.org/download/source-code/ |grep tar |sed -ne 's/.*r \(.*\).ta.*/\1/;1p' -e s/$pkgextraver//" source=(http://download.blender.org/source/$pkgname-$pkgver$pkgextraver.tar.gz \ - blender.desktop blender.png py$_F_python_ver.patch) + blender.desktop blender.png py$_F_python_ver.patch 20_gcc4.3_support.diff 30_fix_CVE-2008-1102.diff) build() { + unset MAKEFLAGS Fpatchall #Fsed 'ADD_LIBRARY(${name} ${INC_ALL} ${sources})' 'ADD_LIBRARY(${name} SHARED ${INC_ALL} ${sources})' CMake/macros.cmake mkdir -p ../build || Fdie cd ../build || Fdie cmake ../$pkgname-$pkgver -DCMAKE_INSTALL_PREFIX=$Fprefix \ - -DWITH_BULLET=ON -DWITH_ELBEEM=ON -DWITH_FFMPEG=ON -DWITH_GAMEENGINE=ON \ + -DWITH_BULLET=ON -DWITH_ELBEEM=ON -DWITH_FFMPEG=OFF -DWITH_GAMEENGINE=ON \ -DWITH_INTERNATIONAL=ON -DWITH_OPENAL=ON -DWITH_OPENEXR=ON \ -DWITH_PLAYER=ON -DWITH_QUICKTIME=OFF -DWITH_VERSE=ON -DYESIAMSTUPID=ON || Fdie make || Fdie @@ -44,6 +45,8 @@ build() { sha1sums=('ff66ec5f0129fd04a2ba5c063627ef13033c0598' \ '44ee67a0ed814481aacca0dfc8cf45ae7a48eed5' \ '5d2583d847735c913c26c96ace8192a646323da8' \ - 'c7357731664aa7fa704d05d74b75d9e101cf7af5') + 'c7357731664aa7fa704d05d74b75d9e101cf7af5' \ + 'ca4a990b760be8415444241e3950eb929937e8bb' \ + 'e9dae2704eec86ec1d042097ddf2d39b16949137') # optimization OK From vmiklos at frugalware.org Sun Jun 8 17:05:58 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 17:06:01 2008 Subject: [Frugalware-git] frugalware-0.8: vlc-0.8.6-12kalgan3-i686 Message-ID: <20080608150558.EDEAC1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=3a6324949f6991208f5eb89d9793b8211f37cc7b commit 3a6324949f6991208f5eb89d9793b8211f37cc7b Author: Miklos Vajna Date: Sun Jun 8 17:05:23 2008 +0200 vlc-0.8.6-12kalgan3-i686 - display with wx28 - closes #2859 diff --git a/source/xmultimedia-extra/vlc/FrugalBuild b/source/xmultimedia-extra/vlc/FrugalBuild index ac9de69..8126f64 100644 --- a/source/xmultimedia-extra/vlc/FrugalBuild +++ b/source/xmultimedia-extra/vlc/FrugalBuild @@ -5,7 +5,7 @@ pkgname=vlc pkgver=0.8.6 pkgextraver=e -pkgrel=12kalgan2 +pkgrel=12kalgan3 pkgdesc="The cross-platform media player and streaming server." url="http://www.videolan.org/vlc/" depends=('alsa-lib' 'dbus-glib>=0.71' 'hal>=0.5.7.1-3' 'libxml2' 'libdvdnav' 'libmad' 'libmatroska' \ @@ -21,7 +21,8 @@ up2date="lynx -dump $url/download-sources.html|grep -m1 'Latest VLC'|sed 's/.*(\ source=(http://download.videolan.org/pub/videolan/vlc/$pkgver$pkgextraver/$pkgname-$pkgver$pkgextraver.tar.bz2 \ $pkgname-ffmpeg.diff $pkgname.desktop vlc-0.8.5-libintl.diff \ libdca.patch CVE-2008-1489.patch cinepak-mem-corruption-fixes.patch \ - changeset_r8060b3457e20e6223b70927693f8da8f547b8fef.diff) + changeset_r8060b3457e20e6223b70927693f8da8f547b8fef.diff \ + vlc-0.8.x-wx28-volume-backport.patch) sha1sums=('6b981ddbe7f6b95cd566ee195b4445b5773c21bd' \ '888a02c9f81331fce1f6ee5f705ce68e5b486ffd' \ '0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0' \ @@ -29,7 +30,8 @@ sha1sums=('6b981ddbe7f6b95cd566ee195b4445b5773c21bd' \ 'edc3a14dfd9b022dca7593e006c324fa5cc17e48' \ '3e794876f5e5a50d4eb8cb3ae1382524a60b37c4' \ '5cd2b133b73a44beb34600e48573c3f717bd4545' \ - '5a618ca1340352598786273b6e886f3afab6aa0d') + '5a618ca1340352598786273b6e886f3afab6aa0d' \ + 'd039b606217ab166e4fa3e50d91a0285478dab24') build() { diff --git a/source/xmultimedia-extra/vlc/vlc-0.8.x-wx28-volume-backport.patch b/source/xmultimedia-extra/vlc/vlc-0.8.x-wx28-volume-backport.patch new file mode 100644 index 0000000..05d89e1 --- /dev/null +++ b/source/xmultimedia-extra/vlc/vlc-0.8.x-wx28-volume-backport.patch @@ -0,0 +1,286 @@ +diff -Naurp vlc-0.8.6h/modules/gui/wxwidgets/interface.cpp vlc-0.8.6h-fw-backport/modules/gui/wxwidgets/interface.cpp +--- vlc-0.8.6h/modules/gui/wxwidgets/interface.cpp 2008-05-25 20:28:57.000000000 +0200 ++++ vlc-0.8.6h-fw-backport/modules/gui/wxwidgets/interface.cpp 2008-06-08 15:55:02.000000000 +0200 +@@ -67,7 +67,7 @@ + /***************************************************************************** + * Local prototypes + *****************************************************************************/ +-static int InteractCallback( vlc_object_t *, const char *, vlc_value_t, ++ static int InteractCallback( vlc_object_t *, const char *, vlc_value_t, + vlc_value_t, void *); + + /***************************************************************************** +@@ -93,33 +93,6 @@ private: + + }; + +-class wxVolCtrl; +-class VLCVolCtrl : public wxControl +-{ +-public: +- VLCVolCtrl( intf_thread_t *p_intf, wxWindow *p_parent ); +- virtual ~VLCVolCtrl() {}; +- +- virtual void OnPaint( wxPaintEvent &event ); +- void OnChange( wxMouseEvent& event ); +- void UpdateVolume(); +- +- private: +- DECLARE_EVENT_TABLE() +- +- wxVolCtrl *gauge; +- int i_y_offset; +- vlc_bool_t b_mute; +- intf_thread_t *p_intf; +-}; +- +-BEGIN_EVENT_TABLE(VLCVolCtrl, wxControl) +- EVT_PAINT(VLCVolCtrl::OnPaint) +- +- /* Mouse events */ +- EVT_LEFT_UP(VLCVolCtrl::OnChange) +-END_EVENT_TABLE() +- + class Splitter : public wxSplitterWindow + { + public: +@@ -291,6 +264,8 @@ enum + NextStream_Event, + SlowStream_Event, + FastStream_Event, ++ ToggleMute_Event, ++ SlideVolume_Event, + + /* it is important for the id corresponding to the "About" command to have + * this standard value as otherwise it won't be handled properly under Mac +@@ -344,6 +319,8 @@ BEGIN_EVENT_TABLE(Interface, wxFrame) + EVT_MENU(NextStream_Event, Interface::OnNextStream) + EVT_MENU(SlowStream_Event, Interface::OnSlowStream) + EVT_MENU(FastStream_Event, Interface::OnFastStream) ++ EVT_MENU(ToggleMute_Event, Interface::OnToggleMute) ++ EVT_COMMAND_SCROLL(SlideVolume_Event, Interface::OnSlideVolume) + + /* Custom events */ + EVT_COMMAND(0, wxEVT_INTF, Interface::OnControlEvent) +@@ -530,7 +507,7 @@ void Interface::Init() + void Interface::Update() + { + /* Misc updates */ +- if( !(i_update_counter % 10) ) ((VLCVolCtrl *)volctrl)->UpdateVolume(); ++// if( !(i_update_counter % 10) ) ((VLCVolCtrl *)volctrl)->UpdateVolume(); + + if( playlist_manager ) playlist_manager->Update(); + +@@ -683,6 +660,7 @@ void Interface::CreateOurToolBar() + #define HELP_PLN N_("Next playlist item") + #define HELP_SLOW N_("Play slower") + #define HELP_FAST N_("Play faster") ++#define HELP_VOL N_("Toggle mute/unmute of the audio") + + #define LABEL_OPEN N_("Open") + #define LABEL_STOP N_("Stop") +@@ -694,6 +672,8 @@ void Interface::CreateOurToolBar() + #define LABEL_PLN N_("Next") + #define LABEL_SLOW N_("Slower") + #define LABEL_FAST N_("Faster") ++#define LABEL_VOL N_("Mute") ++ + int minimal = config_GetInt( p_intf, "wx-minimal" ); + bool label = config_GetInt( p_intf, "wx-labels" ); + +@@ -740,14 +720,15 @@ void Interface::CreateOurToolBar() + wxBitmap( playlist_small_xpm ), wxU(_(HELP_SPLO)) ); + } + +- wxControl *p_dummy_ctrl = +- new wxControl( toolbar, -1, wxDefaultPosition, +- wxSize(16, 16 ), wxBORDER_NONE ); +- +- toolbar->AddControl( p_dummy_ctrl ); +- +- volctrl = new VLCVolCtrl( p_intf, toolbar ); +- toolbar->AddControl( volctrl ); ++ wxToolBarToolBase *v_tool = toolbar->AddTool( ToggleMute_Event, ++ wxU(LABEL_VOL), wxBitmap( speaker_xpm ), ++ wxU(_(HELP_VOL)), wxITEM_CHECK ); ++ v_tool->SetClientData( v_tool ); ++ ++ wxSlider *v_gauge = new wxSlider(toolbar, SlideVolume_Event, 256, 0, ++ AOUT_VOLUME_MAX, wxDefaultPosition, ++ wxSize(64,TOOLBAR_BMP_HEIGHT), wxSL_HORIZONTAL); ++ toolbar->AddControl(v_gauge); + + toolbar->Realize(); + +@@ -1199,6 +1180,49 @@ void Interface::OnFastStream( wxCommandE + } + } + ++void Interface::OnToggleMute ( wxCommandEvent& WXUNUSED(event) ) ++{ ++ aout_VolumeMute(p_intf, NULL); ++ SyncVolume(); ++ ++} ++ ++void Interface::SyncVolume() ++{ ++ wxToolBarToolBase *p_tool = (wxToolBarToolBase *) ++ GetToolBar()->GetToolClientData( ToggleMute_Event ); ++ if ( !p_tool) return; ++ ++ audio_volume_t i_volume; ++ aout_VolumeGet(p_intf, &i_volume); ++ ++// Updating the Mute Button... IF the slider is completely moved to the left, ++// the mute icon is shown too. ++ p_tool->SetNormalBitmap( wxBitmap( i_volume ? speaker_xpm : speaker_mute_xpm ) ); ++ GetToolBar()->Realize(); ++#if defined( __WXMSW__ ) ++ /* Needed to work around a bug in wxToolBar::Realize() */ ++ GetToolBar()->SetSize( GetSize().GetWidth(), ++ GetToolBar()->GetSize().GetHeight() ); ++ GetToolBar()->Update(); ++#endif ++// the Toggle to true and false is nescessary; otherwise, the Icon is not repainted ++ GetToolBar()->ToggleTool( ToggleMute_Event, true ); ++ GetToolBar()->ToggleTool( ToggleMute_Event, false ); ++ GetToolBar()->Update(); ++} ++ ++void Interface::OnSlideVolume( wxScrollEvent& WXUNUSED(event)) ++{ ++ wxSlider *p_tool = (wxSlider *) ++ GetToolBar()->FindControl( SlideVolume_Event ); ++ if ( !p_tool) return; ++ ++ aout_VolumeSet(p_intf , p_tool->GetValue()); ++ SyncVolume(); ++ ++} ++ + void Interface::TogglePlayButton( int i_playing_status ) + { + wxToolBarToolBase *p_tool = (wxToolBarToolBase *) +@@ -1325,108 +1349,6 @@ bool DragAndDrop::OnDropFiles( wxCoord, + #endif + + /***************************************************************************** +- * Definition of VolCtrl class. +- *****************************************************************************/ +-class wxVolCtrl: public wxGauge +-{ +-public: +- /* Constructor */ +- wxVolCtrl( intf_thread_t *_p_intf, wxWindow* parent, wxWindowID id, +- wxPoint = wxDefaultPosition, wxSize = wxSize( 20, -1 ) ); +- virtual ~wxVolCtrl() {}; +- +- void UpdateVolume(); +- int GetVolume(); +- +- void OnChange( wxMouseEvent& event ); +- +-private: +- intf_thread_t *p_intf; +- +- DECLARE_EVENT_TABLE(); +-}; +- +-BEGIN_EVENT_TABLE(wxVolCtrl, wxWindow) +- /* Mouse events */ +- EVT_LEFT_DOWN(wxVolCtrl::OnChange) +- EVT_MOTION(wxVolCtrl::OnChange) +-END_EVENT_TABLE() +- +-wxVolCtrl::wxVolCtrl( intf_thread_t *_p_intf, wxWindow* parent, wxWindowID id, +- wxPoint point, wxSize size ) +- : wxGauge( parent, id, 200, point, size, wxGA_HORIZONTAL | wxGA_SMOOTH ) +-{ +- p_intf = _p_intf; +- UpdateVolume(); +-} +- +-void wxVolCtrl::OnChange( wxMouseEvent& event ) +-{ +- if( !event.LeftDown() && !event.LeftIsDown() ) return; +- +- int i_volume = event.GetX() * 200 / GetClientSize().GetWidth(); +- aout_VolumeSet( p_intf, i_volume * AOUT_VOLUME_MAX / 200 / 2 ); +- UpdateVolume(); +-} +- +-void wxVolCtrl::UpdateVolume() +-{ +- audio_volume_t i_volume; +- aout_VolumeGet( p_intf, &i_volume ); +- +- int i_gauge_volume = i_volume * 200 * 2 / AOUT_VOLUME_MAX; +- if( i_gauge_volume == GetValue() ) return; +- +- SetValue( i_gauge_volume ); +- SetToolTip( wxString::Format((wxString)wxU(_("Volume")) + wxT(" %d"), +- i_gauge_volume / 2 ) ); +-} +- +-#if defined(__WXGTK__) +-#define VLCVOL_HEIGHT p_parent->GetSize().GetHeight() +-#else +-#define VLCVOL_HEIGHT TOOLBAR_BMP_HEIGHT +-#endif +-VLCVolCtrl::VLCVolCtrl( intf_thread_t *_p_intf, wxWindow *p_parent ) +- :wxControl( p_parent, -1, wxDefaultPosition, wxSize(64, VLCVOL_HEIGHT ), +- wxBORDER_NONE ), +- i_y_offset((VLCVOL_HEIGHT - TOOLBAR_BMP_HEIGHT) / 2), +- b_mute(0), p_intf(_p_intf) +-{ +- gauge = new wxVolCtrl( p_intf, this, -1, wxPoint( 18, i_y_offset ), +- wxSize( 44, TOOLBAR_BMP_HEIGHT ) ); +-} +- +-void VLCVolCtrl::OnPaint( wxPaintEvent &evt ) +-{ +- wxPaintDC dc( this ); +- wxBitmap mPlayBitmap( b_mute ? speaker_mute_xpm : speaker_xpm ); +- dc.DrawBitmap( mPlayBitmap, 0, i_y_offset, TRUE ); +-} +- +-void VLCVolCtrl::OnChange( wxMouseEvent& event ) +-{ +- if( event.GetX() < TOOLBAR_BMP_WIDTH ) +- { +- int i_volume; +- aout_VolumeMute( p_intf, (audio_volume_t *)&i_volume ); +- +- b_mute = !b_mute; +- Refresh(); +- } +-} +- +-void VLCVolCtrl::UpdateVolume() +-{ +- gauge->UpdateVolume(); +- +- int i_volume = gauge->GetValue(); +- if( !!i_volume == !b_mute ) return; +- b_mute = !b_mute; +- Refresh(); +-} +- +-/***************************************************************************** + * Systray class. + *****************************************************************************/ + +diff -Naurp vlc-0.8.6h/modules/gui/wxwidgets/interface.hpp vlc-0.8.6h-fw-backport/modules/gui/wxwidgets/interface.hpp +--- vlc-0.8.6h/modules/gui/wxwidgets/interface.hpp 2008-05-25 20:28:57.000000000 +0200 ++++ vlc-0.8.6h-fw-backport/modules/gui/wxwidgets/interface.hpp 2008-06-08 15:55:02.000000000 +0200 +@@ -147,6 +147,9 @@ namespace wxvlc + void OnNextStream( wxCommandEvent& event ); + void OnSlowStream( wxCommandEvent& event ); + void OnFastStream( wxCommandEvent& event ); ++ void OnToggleMute( wxCommandEvent& event ); ++ void OnSlideVolume( wxScrollEvent& event ); ++ void SyncVolume( ); + + void OnInteraction( wxCommandEvent& event ); + From vmiklos at frugalware.org Sun Jun 8 17:32:51 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 8 17:32:53 2008 Subject: [Frugalware-git] frugalware-0.8: samba-3.0.30-1kalgan1-i686 Message-ID: <20080608153251.585E61770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=705b4db47c3534f8b49efcda0437d34878394f7d commit 705b4db47c3534f8b49efcda0437d34878394f7d Author: Miklos Vajna Date: Sun Jun 8 17:32:29 2008 +0200 samba-3.0.30-1kalgan1-i686 - secfix bump - closes #3115 diff --git a/source/network/samba/FrugalBuild b/source/network/samba/FrugalBuild index a2b987d..0334c66 100644 --- a/source/network/samba/FrugalBuild +++ b/source/network/samba/FrugalBuild @@ -3,9 +3,9 @@ # Contributor: VMiklos pkgname=samba -pkgver=3.0.28 +pkgver=3.0.30 pkgextraver= -pkgrel=1 +pkgrel=1kalgan1 pkgdesc="SMB file and print server." url="http://www.samba.org" backup=(etc/logrotate.d/samba) @@ -86,7 +86,7 @@ build() Fsplit samba-swat usr/sbin/swat Fsplit samba-swat usr/share/swat } -sha1sums=('4fcad8134f89a123a254138de0ace4a13993b007' \ +sha1sums=('609c602d9a17ea05954fc9fc021cfd95227eaefb' \ '13fd371189bfe637f3f13c62d44d9e761268119e' \ '0e407642fe6aa0c032df38aac3815eb08f07e35b') From janny at frugalware.org Sun Jun 8 17:33:17 2008 From: janny at frugalware.org (Janos Kovacs) Date: Sun Jun 8 17:33:18 2008 Subject: [Frugalware-git] frugalware-current: virtualbox-1.6.2-2-i686 Message-ID: <20080608153317.4D7171770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=671fb62afb375955a96870f3e28f6a62cb414b36 commit 671fb62afb375955a96870f3e28f6a62cb414b36 Author: Janos Kovacs Date: Sun Jun 8 17:13:27 2008 +0200 virtualbox-1.6.2-2-i686 * correction in up2date() (thx vmiklos) diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index 1e039cf..9bc27d9 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -17,7 +17,7 @@ makedepends=(${makedepends[@]} 'gcc-4.1') rodepends=('wget') groups=('xapps-extra') archs=('i686' '!x86_64') -up2date="lynx -dump http://www.virtualbox.org/wiki/Downloads | grep 'OSE tarball' | sed 's/.*VirtualBox //' | sed 's/ OSE.*//'" +up2date="lynx -dump ${url}|grep released|sed 's/.* \([0-9.]*\) .*/\1/;q'" source=(http://www.virtualbox.org/download/${pkgver}/${realname}-${pkgver}-OSE.tar.bz2 \ vboxsvc virtualbox get-vbox-additions README.Frugalware 60-virtualbox.rules) _F_cd_path="${realname}-${pkgver}" From ryuo at frugalware.org Sun Jun 8 17:50:53 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 8 17:50:55 2008 Subject: [Frugalware-git] frugalware-current: dzen-0.8.5-1-i686 Message-ID: <20080608155053.B992D1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=588d77d851220e61eb95b3ff943c0cadd97d0b85 commit 588d77d851220e61eb95b3ff943c0cadd97d0b85 Author: James Buren Date: Sun Jun 8 10:46:15 2008 -0500 dzen-0.8.5-1-i686 * new package diff --git a/source/x11-extra/dzen/FrugalBuild b/source/x11-extra/dzen/FrugalBuild new file mode 100644 index 0000000..be6748f --- /dev/null +++ b/source/x11-extra/dzen/FrugalBuild @@ -0,0 +1,43 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=dzen +pkgver=0.8.5 +pkgrel=1 +pkgdesc="A general purpose messaging, notification and menuing program for X11." +url="http://gotmor.googlepages.com/dzen" +depends=('glibc' 'libxpm' 'libxinerama') +groups=('x11-extra') +archs=('i686' 'x86_64') +_F_archive_name=$pkgname-svn +up2date="lynx -dump -source http://dzen.geekmode.org/dwl/dzen.xml | Flasttar" +source=(http://dzen.geekmode.org/dwl/$_F_archive_name-$pkgver.tar.gz) +sha1sums=('77ddd426cb65914ab5bd63e809c599c7c63ba933') + +build() +{ + Fsed "-Os" "$CFLAGS" config.mk + Fsed "gcc" "gcc $CFLAGS" gadgets/config.mk + make clean || Fdie + make || Fdie + make -C gadgets clean || Fdie + make -C gadgets || Fdie + Fexerel /usr/bin/dzen2 + Ffilerel bitmaps/*.xbm /usr/share/$pkgname + # modifying help script to work on system install + Fsed './' '' help + Fsed 'dzen2' '/usr/bin/dzen2' help + Fsed "README.$pkgname" "/usr/share/doc/$pkgname-$pkgver/README.$pkgname" help + # rename to avoid possible conflicts + Fexerel help /usr/bin/$pkgname-help + Fdocrel gadgets/README* + for i in gadgets/*; do + if [ -x $i ]; then + Fexerel $i /usr/bin/`echo $i | sed 's|^.*/||'` + fi + done + # fix read permissions + find -execdir chmod 644 '{}' \; || Fdie +} + +# optimization OK From boobaa at frugalware.org Sun Jun 8 19:49:17 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Sun Jun 8 19:49:19 2008 Subject: [Frugalware-git] frugalware-current: perl-xml-rss-1.33-1-i686 Message-ID: <20080608174917.067EE1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=626511054d96c1a31f60d9acc993cce23624513f commit 626511054d96c1a31f60d9acc993cce23624513f Author: CSCSY Lszl Date: Sun Jun 8 19:48:59 2008 +0200 perl-xml-rss-1.33-1-i686 version bump diff --git a/source/devel-extra/perl-xml-rss/FrugalBuild b/source/devel-extra/perl-xml-rss/FrugalBuild index d9572f9..7965365 100644 --- a/source/devel-extra/perl-xml-rss/FrugalBuild +++ b/source/devel-extra/perl-xml-rss/FrugalBuild @@ -3,7 +3,7 @@ _F_perl_name=XML-RSS _F_perl_author=S/SH/SHLOMIF -pkgver=1.32 +pkgver=1.33 pkgrel=1 pkgdesc="A perl module to manage RDF Site Summary (RSS) files" url="http://search.cpan.org/dist/XML-RSS/" @@ -12,4 +12,4 @@ makedepends=('perl-test-manifest') groups=('devel-extra') Finclude perl archs=('i686' 'x86_64') -sha1sums=('b184396e061f3c59d627ff4b0abb46651061a965') +sha1sums=('a2edc7bc8002354b84fa6e3449bea8d63cfd4840') From boobaa at frugalware.org Sun Jun 8 19:51:54 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Sun Jun 8 19:51:56 2008 Subject: [Frugalware-git] frugalware-current: drupal-admin_menu-5.x_2.5-1-i686 Message-ID: <20080608175154.D89FF1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a84107b49d2365b6e7067c9d7dee22a84ad3f870 commit a84107b49d2365b6e7067c9d7dee22a84ad3f870 Author: CSCSY Lszl Date: Sun Jun 8 19:51:32 2008 +0200 drupal-admin_menu-5.x_2.5-1-i686 version bump diff --git a/source/network-extra/drupal-admin_menu/FrugalBuild b/source/network-extra/drupal-admin_menu/FrugalBuild index 994fcff..74f7698 100644 --- a/source/network-extra/drupal-admin_menu/FrugalBuild +++ b/source/network-extra/drupal-admin_menu/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSCSY Lszl _F_drupal_module=admin_menu -pkgver=5.x_2.4 +pkgver=5.x_2.5 pkgrel=1 pkgdesc="Provides a handy theme-independent administration interface" Finclude drupal -sha1sums=('e66e211d5bc1d4b23ac10cd8a5f4199716b996c2') +sha1sums=('c570c2cb37a107c62751230720427ed2e5b3deb3') From boobaa at frugalware.org Sun Jun 8 19:57:11 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Sun Jun 8 19:57:12 2008 Subject: [Frugalware-git] frugalware-current: sword-institutes-1.2-1-i686 Message-ID: <20080608175711.5F23E1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d73a25852f87cbd80fecaac2091a698211cf0182 commit d73a25852f87cbd80fecaac2091a698211cf0182 Author: CSCSY Lszl Date: Sun Jun 8 19:57:01 2008 +0200 sword-institutes-1.2-1-i686 version bump diff --git a/source/locale-extra/sword-institutes/FrugalBuild b/source/locale-extra/sword-institutes/FrugalBuild index 5e7921a..2f174d0 100644 --- a/source/locale-extra/sword-institutes/FrugalBuild +++ b/source/locale-extra/sword-institutes/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CSCSY Lszl pkgname=sword-institutes -pkgver=1.1 +pkgver=1.2 pkgrel=1 pkgdesc="Calvin's Institutes module for Sword" url='http://www.crosswire.org/sword/modules/ModInfo.jsp?modName=Institutes' @@ -19,5 +19,5 @@ build() cp -R $Fsrcdir/{modules,mods.d} $Fdestdir/usr/share/sword } -sha1sums=('17f4817c8bf260892ca174f285688c38afab5ccb') +sha1sums=('fb41c0998c7eceeda529c42bdd7f9035ba6bff9b') From ryuo at frugalware.org Mon Jun 9 07:23:05 2008 From: ryuo at frugalware.org (James Buren) Date: Mon Jun 9 07:23:08 2008 Subject: [Frugalware-git] frugalware-current: karmen-0.14-1-i686 Message-ID: <20080609052305.806801770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1a22f37a6953793d8a8693c7705b01eb8b99c2fb commit 1a22f37a6953793d8a8693c7705b01eb8b99c2fb Author: James Buren Date: Mon Jun 9 00:19:35 2008 -0500 karmen-0.14-1-i686 * new package diff --git a/source/x11-extra/karmen/FrugalBuild b/source/x11-extra/karmen/FrugalBuild new file mode 100644 index 0000000..062076a --- /dev/null +++ b/source/x11-extra/karmen/FrugalBuild @@ -0,0 +1,23 @@ +# Compiling Time: 0.05 SBU +# Maintainer: James Buren + +pkgname=karmen +pkgver=0.14 +pkgrel=1 +pkgdesc="A simple window manager with EWMH/ICCCM support." +Finclude sourceforge +depends=('libsm' 'libx11' 'glibc') +groups=('x11-extra') +archs=('i686' 'x86_64') +sha1sums=('b7b314f88cc707ea3f72563cc3dd3ddc75ec2b10') + +build() +{ + # change default font to a more universal one + Fsed 'helvetica' 'fixed' src/global.h + Fbuild + # remove duplicate docs + Frm /usr/share/doc/karmen +} + +# optimization OK From ryuo at frugalware.org Mon Jun 9 09:40:28 2008 From: ryuo at frugalware.org (James Buren) Date: Mon Jun 9 09:40:30 2008 Subject: [Frugalware-git] frugalware-current: pawm-2.2.9-1-i686 Message-ID: <20080609074028.F024E1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=88c8eff46525dd885d1ae359873addeb537514dc commit 88c8eff46525dd885d1ae359873addeb537514dc Author: James Buren Date: Mon Jun 9 02:37:38 2008 -0500 pawm-2.2.9-1-i686 * new package diff --git a/source/x11-extra/pawm/FrugalBuild b/source/x11-extra/pawm/FrugalBuild new file mode 100644 index 0000000..be96ff5 --- /dev/null +++ b/source/x11-extra/pawm/FrugalBuild @@ -0,0 +1,28 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=pawm +pkgver=2.2.9 +pkgrel=1 +pkgdesc="A simple, small, and functional window manager." +url="http://www.pleyades.net/pawm" +depends=('libxpm' 'libxft' 'libxrandr' 'zlib' 'startup-notification') +groups=('x11-extra') +archs=('i686' 'x86_64') +backup=('etc/pawm.conf') +up2date="Flasttar $url/down.php" +source=(http://www.pleyades.net/$pkgname/files/$pkgname-$pkgver.tar.bz2) +sha1sums=('414da1ffa143d4995abb8e87bf6a8b3f79bf4d57') + +build() +{ + Fcd + ./0 $Fconfopts --confdir=/etc + Fmake + Ffilerel conf/pawm.conf /etc/pawm.conf + Ffilerel data/icons/* /usr/share/pawm/icons + Fexerel src/pawm /usr/bin/pawm + Fdocrel GPL +} + +# optimization OK From ryuo at frugalware.org Mon Jun 9 11:00:47 2008 From: ryuo at frugalware.org (James Buren) Date: Mon Jun 9 11:00:48 2008 Subject: [Frugalware-git] frugalware-current: pawm-2.2.9-2-i686 Message-ID: <20080609090047.6EB141770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e563c26055083796bc02e503cde0075586847e68 commit e563c26055083796bc02e503cde0075586847e68 Author: James Buren Date: Mon Jun 9 03:58:00 2008 -0500 pawm-2.2.9-2-i686 * added README.Frugalware diff --git a/source/x11-extra/pawm/FrugalBuild b/source/x11-extra/pawm/FrugalBuild index be96ff5..80f1036 100644 --- a/source/x11-extra/pawm/FrugalBuild +++ b/source/x11-extra/pawm/FrugalBuild @@ -3,7 +3,7 @@ pkgname=pawm pkgver=2.2.9 -pkgrel=1 +pkgrel=2 pkgdesc="A simple, small, and functional window manager." url="http://www.pleyades.net/pawm" depends=('libxpm' 'libxft' 'libxrandr' 'zlib' 'startup-notification') diff --git a/source/x11-extra/pawm/README.Frugalware b/source/x11-extra/pawm/README.Frugalware new file mode 100644 index 0000000..f3154c6 --- /dev/null +++ b/source/x11-extra/pawm/README.Frugalware @@ -0,0 +1,20 @@ +Copy /etc/pawm.conf to $HOME/.pawm for your own local changes. If you want +icons on your desktop, add a file to your $HOME/.pawm directory that starts +with "app" and append an alphanumerical phrase of your choice to it. Then, +write the file structure as follows: + + + + + + +Example: + +firefox.xpm +40 40 +firefox +firefox + +Other things to remember, you can only use xpm files for this method, and it +takes the files from /usr/share/pixmaps. If I knew how to change this path to +a directory the user has, I would. From crazy at frugalware.org Mon Jun 9 11:17:11 2008 From: crazy at frugalware.org (crazy) Date: Mon Jun 9 11:17:13 2008 Subject: [Frugalware-git] frugalware-current: Revert "include/util.sh: add a CFLAGS trick in Fmake()" Message-ID: <20080609091711.E8CF71770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=74ca4b19af2f95c73b8d57baf5303a3e1db6f599 commit 74ca4b19af2f95c73b8d57baf5303a3e1db6f599 Author: crazy Date: Mon Jun 9 11:14:31 2008 +0200 Revert "include/util.sh: add a CFLAGS trick in Fmake()" * This reverts commit 429d47ebcd2c5972c2c8d9a5078a3bab7eb6f854. * this is not going to work that way .. you'll kill *FLAGS set from * build system , this 'trick' may work when you compile broken apps * and use sed on the *FLAGS diff --git a/source/include/util.sh b/source/include/util.sh index b66cc2a..44d433a 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -548,7 +548,7 @@ Fmake() { Fconf "$@" Fmessage "Compiling..." if [ -f GNUmakefile -o -f makefile -o -f Makefile ]; then - make CFLAGS="$CFLAGS" || Fdie + make || Fdie elif [ -f setup.py ]; then python setup.py build "$@" || Fdie elif [ -f setup.rb ]; then From crazy at frugalware.org Mon Jun 9 12:03:21 2008 From: crazy at frugalware.org (crazy) Date: Mon Jun 9 12:03:23 2008 Subject: [Frugalware-git] frugalware-current: wireshark-1.0.0-3-x86_64 Message-ID: <20080609100321.2EFF61770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5c88b263d553b1f5fa608db1c9c505c1e6019051 commit 5c88b263d553b1f5fa608db1c9c505c1e6019051 Author: crazy Date: Mon Jun 9 11:50:25 2008 +0200 wireshark-1.0.0-3-x86_64 * release bump * removed duplicated depends() * removed gksu from depends() * added 2 desktop files, for KDE and XFCE/GNOME * added missing _F_*desktop/iconcache * added TODO , package need splitting. diff --git a/source/xapps-extra/wireshark/FrugalBuild b/source/xapps-extra/wireshark/FrugalBuild index f08b529..7b01c62 100644 --- a/source/xapps-extra/wireshark/FrugalBuild +++ b/source/xapps-extra/wireshark/FrugalBuild @@ -3,18 +3,23 @@ pkgname=wireshark pkgver=1.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="The world's most popular network protocol analyzer" url="http://www.wireshark.org/" -depends=('heimdal>=1.2' 'gtk+2>=2.10.2' 'pcre' 'libpcap' 'gnutls' 'gksu>=1.9.4-2' 'gnutls>=2.2.0') +depends=('heimdal>=1.2' 'gtk+2>=2.10.2' 'pcre' 'libpcap' 'gnutls>=2.2.0') replaces=('ethereal') groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') +_F_gnome_iconcache="y" +_F_gnome_desktop="y" +Finclude gnome-scriptlet up2date="lynx -dump 'http://www.wireshark.org/download/src/?C=M;O=D' | grep -m1 tar.gz | sed 's/.*wireshark-\(.*\)\.tar\.gz.*/\1/'" source=(http://www.wireshark.org/download/src/$pkgname-$pkgver.tar.bz2) sha1sums=('4f53f526359a072665812deca980999bd26e6ab0') +## TODO: split GUI / utils + build() { Fbuild --with-ssl @@ -27,7 +32,22 @@ build() /usr/share/icons/locolor/${i}x$i/apps/$pkgname.png done Fdesktop "gksu $pkgname" "$pkgname.png" "Qt;Gtk;Network;" - + ## GNOME/XFCE one + _F_desktop_name="Wireshark" + _F_desktop_categories="Qt;Gtk;Network;" + _F_desktop_exec="gksu $pkgname" + _F_desktop_icon="$pkgname.png" + _F_desktop_show_in="XFCE;GNOME;" + Fdesktop2 + ## KDE one + _F_desktop_name="Wireshark" + _F_desktop_categories="Qt;Gtk;Network;" + _F_desktop_exec="kdesu $pkgname" + _F_desktop_icon="$pkgname.png" + _F_desktop_filename="$pkgname-kde" + _F_desktop_show_in="KDE;" + Fdesktop2 + Fbuild_gnome_scriptlet } # optimization OK From crazy at frugalware.org Mon Jun 9 12:03:21 2008 From: crazy at frugalware.org (crazy) Date: Mon Jun 9 12:03:23 2008 Subject: [Frugalware-git] frugalware-current: wireshark-1.0.0-3-x86_64 Message-ID: <20080609100321.402941778001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0ce5b113d68ca5585fe485d7ae5963443b2a4c2f commit 0ce5b113d68ca5585fe485d7ae5963443b2a4c2f Author: crazy Date: Mon Jun 9 11:57:02 2008 +0200 wireshark-1.0.0-3-x86_64 * uupss :) forgot to remove old Fdesktop diff --git a/source/xapps-extra/wireshark/FrugalBuild b/source/xapps-extra/wireshark/FrugalBuild index 7b01c62..66532af 100644 --- a/source/xapps-extra/wireshark/FrugalBuild +++ b/source/xapps-extra/wireshark/FrugalBuild @@ -31,7 +31,7 @@ build() Ffilerel image/lo${i}-app-wireshark.png \ /usr/share/icons/locolor/${i}x$i/apps/$pkgname.png done - Fdesktop "gksu $pkgname" "$pkgname.png" "Qt;Gtk;Network;" + ## GNOME/XFCE one _F_desktop_name="Wireshark" _F_desktop_categories="Qt;Gtk;Network;" From crazy at frugalware.org Mon Jun 9 12:09:56 2008 From: crazy at frugalware.org (crazy) Date: Mon Jun 9 12:09:56 2008 Subject: [Frugalware-git] frugalware-current: 7zip-4.58-1-x86_64 Message-ID: <20080609100956.201AD1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bf19acdaf79812a17601a072085c922669c8546b commit bf19acdaf79812a17601a072085c922669c8546b Author: crazy Date: Mon Jun 9 12:08:24 2008 +0200 7zip-4.58-1-x86_64 * Version bump diff --git a/source/apps-extra/7zip/FrugalBuild b/source/apps-extra/7zip/FrugalBuild index f171ffc..919c8f5 100644 --- a/source/apps-extra/7zip/FrugalBuild +++ b/source/apps-extra/7zip/FrugalBuild @@ -3,10 +3,12 @@ # Contributor: Tuxbubling pkgname=7zip -pkgver=4.57 +pkgver=4.58 pkgrel=1 pkgdesc="7-Zip is a file archiver with high compression ratio." +_F_sourceforge_dirname="p7zip" _F_sourceforge_name="p7zip" +_F_sourceforge_sep="_" _F_sourceforge_ext="_src_all.tar.bz2" Finclude sourceforge url="http://www.7-zip.org/" @@ -15,7 +17,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') options=('nodocs' 'nostrip') up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=111810|grep -m1 'src_all'|sed 's/.*_\(.*\)_src.*/\1/'" -source=(${source/-$pkgver/_$pkgver}) +sha1sums=('7525bbb12ec94186e9e40d3614cdfd5f6f63cab6') build() { @@ -28,13 +30,9 @@ build() fi make all3 || return 1 chmod +x install.sh || Fdie - ./install.sh || Fdie + sh ./install.sh || Fdie chmod 0755 $Fdestdir/usr/lib/p7zip/{7z,7za,7zr,7zCon.sfx} chmod 0755 $Fdestdir/usr/bin/{7z,7za,7zr} Fln /usr/lib/p7zip/7zCon.sfx /usr/bin/7zCon.sfx Fmv usr/share/doc/p7zip /usr/share/doc/$pkgname-$pkgver } - - -sha1sums=('eda5de3d35567e2633373dbe60313527a6a4db27') -# optimization OK From ryuo at frugalware.org Mon Jun 9 12:30:31 2008 From: ryuo at frugalware.org (James Buren) Date: Mon Jun 9 12:30:32 2008 Subject: [Frugalware-git] frugalware-current: ctwm-3.8a-1-i686 Message-ID: <20080609103031.13E101770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=76206924a283ecc7bb87bec82266fa254279bb21 commit 76206924a283ecc7bb87bec82266fa254279bb21 Author: James Buren Date: Mon Jun 9 05:27:40 2008 -0500 ctwm-3.8a-1-i686 * new package diff --git a/source/x11-extra/ctwm/FrugalBuild b/source/x11-extra/ctwm/FrugalBuild new file mode 100644 index 0000000..d41f6bf --- /dev/null +++ b/source/x11-extra/ctwm/FrugalBuild @@ -0,0 +1,28 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=ctwm +pkgver=3.8a +pkgrel=1 +pkgdesc="A window manager derived with TWM." +url="http://ctwm.free.lp.se/" +depends=('libxpm' 'libjpeg' 'libxmu' 'libsm') +makedepends=('imake') +groups=('x11-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url" +source=($url/dist/$pkgname-$pkgver.tar.gz) +sha1sums=('c3a31d669bef7dd5ec78d89950c0e575d6c51c77') + +build() +{ + Fcd + mv Imakefile.local-template Imakefile.local || Fdie + xmkmf || Fdie + # changing path from its unusual defaults + Fsed '$(LIBDIR)/twm' '/usr/share/ctwm' Makefile + make CDEBUGFLAGS="$CFLAGS" || Fdie + Fmakeinstall +} + +# optimization OK From crazy at frugalware.org Mon Jun 9 12:58:30 2008 From: crazy at frugalware.org (crazy) Date: Mon Jun 9 12:58:32 2008 Subject: [Frugalware-git] frugalware-current: telepathy-glib-0.7.10-1-x86_64 Message-ID: <20080609105830.E6BE41770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2003f793e0e4403665ac00467f66c4cd5a3f5eed commit 2003f793e0e4403665ac00467f66c4cd5a3f5eed Author: crazy Date: Mon Jun 9 12:57:25 2008 +0200 telepathy-glib-0.7.10-1-x86_64 * Version bump diff --git a/source/lib-extra/telepathy-glib/FrugalBuild b/source/lib-extra/telepathy-glib/FrugalBuild index 0561183..4adfa43 100644 --- a/source/lib-extra/telepathy-glib/FrugalBuild +++ b/source/lib-extra/telepathy-glib/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=telepathy-glib -pkgver=0.7.9 +pkgver=0.7.10 pkgrel=1 pkgdesc="A glib library to ease writing telepathy clients in glib." url="http://telepathy.freedesktop.org/wiki/" @@ -13,6 +13,6 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://telepathy.freedesktop.org/releases/telepathy-glib/ | Flasttar" source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('059cfdf7faae08f7b52a0615b4fbf7959e6cb467') +sha1sums=('540fe33a37a8a3291c86549345e6086d5b00b9fe') # optimization OK From vmiklos at frugalware.org Mon Jun 9 14:38:05 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 9 14:38:07 2008 Subject: [Frugalware-git] frugalware-current: stgit-0.14.3-1-i686 Message-ID: <20080609123805.050E01770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3cff2f8487fffd62999af1c8ba03c03565bb0952 commit 3cff2f8487fffd62999af1c8ba03c03565bb0952 Author: Miklos Vajna Date: Mon Jun 9 14:37:32 2008 +0200 stgit-0.14.3-1-i686 - version bump diff --git a/source/devel-extra/stgit/FrugalBuild b/source/devel-extra/stgit/FrugalBuild index 6e115d9..a999c86 100644 --- a/source/devel-extra/stgit/FrugalBuild +++ b/source/devel-extra/stgit/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=stgit -pkgver=0.14.2 -pkgrel=2 +pkgver=0.14.3 +pkgrel=1 pkgdesc="Provides similar functionality to Quilt on top of GIT." url="http://www.procode.org/stgit/" depends=('python' 'git') @@ -11,7 +11,7 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|Flasttar" source=(http://homepage.ntlworld.com/cmarinas/stgit/stgit-$pkgver.tar.gz) -sha1sums=('9cd3e4368fd36ea77c48eff4fd305d05469e8010') +sha1sums=('9ea2e859281f8fe3cbb7f2bd9fd83b9846923cbe') build() { From vmiklos at frugalware.org Mon Jun 9 16:09:14 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 9 16:09:16 2008 Subject: [Frugalware-git] frugalware-current: evolution-sharp-0.17.3-1-i686 Message-ID: <20080609140914.947E11770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8a3d63bc6320f63dc63fb90e128ff2074b3af02b commit 8a3d63bc6320f63dc63fb90e128ff2074b3af02b Author: Miklos Vajna Date: Mon Jun 9 16:08:52 2008 +0200 evolution-sharp-0.17.3-1-i686 - version bump diff --git a/source/gnome-extra/evolution-sharp/FrugalBuild b/source/gnome-extra/evolution-sharp/FrugalBuild index 0dc0790..104684d 100644 --- a/source/gnome-extra/evolution-sharp/FrugalBuild +++ b/source/gnome-extra/evolution-sharp/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=evolution-sharp -pkgver=0.17.2 +pkgver=0.17.3 pkgrel=1 pkgdesc="Mono bindings for evolution." url="http://www.gnome.org" @@ -12,7 +12,7 @@ _F_gnome_devel="y" Finclude gnome mono groups=('gnome-extra') archs=('i686' 'x86_64') -sha1sums=('ca070a3db5e99fcf824d77bbe63ea5bf077b4508') +sha1sums=('185aceaac89c154cacfdb5354ca0dd74432cf6f9') build() { Fmonoexport From vmiklos at frugalware.org Mon Jun 9 16:43:30 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 9 16:43:35 2008 Subject: [Frugalware-git] frugalware-current: kaa-imlib2-0.2.3-1-i686 Message-ID: <20080609144330.F37F41778001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e1eed015165eece002b81ec35776c1ebf8895cda commit e1eed015165eece002b81ec35776c1ebf8895cda Author: Miklos Vajna Date: Mon Jun 9 16:37:07 2008 +0200 kaa-imlib2-0.2.3-1-i686 - version bump diff --git a/source/xlib-extra/kaa-imlib2/FrugalBuild b/source/xlib-extra/kaa-imlib2/FrugalBuild index e12d871..2cbc728 100644 --- a/source/xlib-extra/kaa-imlib2/FrugalBuild +++ b/source/xlib-extra/kaa-imlib2/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=kaa-imlib2 -pkgver=0.2.1 +pkgver=0.2.3 pkgrel=1 pkgdesc="The Kaa Media Repository is a set of python modules related to media" depends=('kaa-base' 'imlib2') @@ -11,6 +11,6 @@ archs=('i686' 'x86_64') _F_sourceforge_dirname="freevo" Finclude sourceforge url="http://www.freevo.org/kaa" -sha1sums=('48db1e9add467e2164bd68998061164f3257c851') +sha1sums=('870c66358c8c9f08416b01b6232a6037655dac3d') # optimization OK From vmiklos at frugalware.org Mon Jun 9 16:43:30 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 9 16:43:37 2008 Subject: [Frugalware-git] frugalware-current: libvirt-0.4.2-1-i686 Message-ID: <20080609144330.DC6B21770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=07461ccc59d69f2e5d9063de6423d5eefaf726f4 commit 07461ccc59d69f2e5d9063de6423d5eefaf726f4 Author: Miklos Vajna Date: Mon Jun 9 16:27:53 2008 +0200 libvirt-0.4.2-1-i686 - version bump diff --git a/source/xlib-extra/libvirt/FrugalBuild b/source/xlib-extra/libvirt/FrugalBuild index 6533912..b840ee6 100644 --- a/source/xlib-extra/libvirt/FrugalBuild +++ b/source/xlib-extra/libvirt/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: AlexExtreme pkgname=libvirt -pkgver=0.2.2 +pkgver=0.4.2 pkgrel=1 pkgdesc="libvirt is a library providing access to information from various virtualization tools" url="http://libvirt.org" -depends=('libxml2' 'xen>=3.0.4' 'gnutls') +depends=('libxml2' 'xen>=3.0.4' 'gnutls' 'cyrus-sasl' 'parted') makedepends=('python' 'gtk-doc') groups=('xlib-extra') archs=('x86_64' 'i686') up2date="lynx -dump ftp://libvirt.org/libvirt/|grep "[0-9].tar.gz$"|sed 's/.*-\(.*\).t.*/\1/'|Fsort|sed -n '$ p'" source=(ftp://ftp.libvirt.org/libvirt/$pkgname-$pkgver.tar.gz) -sha1sums=('20a4f414fd5012421bd383a46a7a30a6bc59fcd1') +sha1sums=('7076e542f34d4cffc2b8f9fd1ecc41d40ad83b07') subpkgs=('libvirt-python') subdescs=('Python bindings for libvirt') From vmiklos at frugalware.org Mon Jun 9 16:43:31 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 9 16:43:38 2008 Subject: [Frugalware-git] frugalware-current: kaa-base-0.4.0-1-i686 Message-ID: <20080609144331.2237817780AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7398e15a67686ef47e2d6d2945f3f979e8f5f516 commit 7398e15a67686ef47e2d6d2945f3f979e8f5f516 Author: Miklos Vajna Date: Mon Jun 9 16:38:10 2008 +0200 kaa-base-0.4.0-1-i686 - version bump diff --git a/source/lib-extra/kaa-base/FrugalBuild b/source/lib-extra/kaa-base/FrugalBuild index e5d9518..ec6b35a 100644 --- a/source/lib-extra/kaa-base/FrugalBuild +++ b/source/lib-extra/kaa-base/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: AlexExtreme pkgname=kaa-base -pkgver=0.1.3 +pkgver=0.4.0 pkgrel=1 pkgdesc="The Kaa Media Repository is a set of python modules related to media" depends=('glib2' 'pysqlite2' 'libxml2') @@ -11,6 +11,6 @@ archs=('i686' 'x86_64') _F_sourceforge_dirname=freevo Finclude sourceforge url="http://www.freevo.org/kaa" -sha1sums=('14f81db1a4890516c48eccdca0e6d722aa6cd494') +sha1sums=('f9b0af0ffd17d99629f61dea198b4c8004045e53') # optimization OK From vmiklos at frugalware.org Mon Jun 9 16:43:31 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 9 16:43:39 2008 Subject: [Frugalware-git] frugalware-current: beautifulsoup-3.0.6-1-i686 Message-ID: <20080609144331.31C5317780AC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cd54197510271cc6eebf93d9a7e8ecdd0394bb19 commit cd54197510271cc6eebf93d9a7e8ecdd0394bb19 Author: Miklos Vajna Date: Mon Jun 9 16:41:32 2008 +0200 beautifulsoup-3.0.6-1-i686 - version bump diff --git a/source/lib-extra/beautifulsoup/FrugalBuild b/source/lib-extra/beautifulsoup/FrugalBuild index 4fd13d3..43d8fe1 100644 --- a/source/lib-extra/beautifulsoup/FrugalBuild +++ b/source/lib-extra/beautifulsoup/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: AlexExtreme pkgname=beautifulsoup -realname=BeautifulSoup -pkgver=3.0.4 +pkgver=3.0.6 pkgrel=1 pkgdesc="Beautiful Soup is a Python HTML/XML parser designed for quick turnaround projects like screen-scraping" url="http://www.crummy.com/software/BeautifulSoup/" depends=('python>=2.5') groups=('lib-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://www.crummy.com/software/BeautifulSoup/ | grep -i 'latest version' | sed 's/.*Soup version //' | sed 's/\,.*//'" -source=(http://www.crummy.com/software/BeautifulSoup/download/BeautifulSoup.tar.gz) -sha1sums=('431121839a83393aa3f161bd756c4fa2acf063ef') -_F_cd_path="$realname-$pkgver" +up2date="Flasttar $url/download" +_F_archive_name="BeautifulSoup" +source=($url/download/BeautifulSoup-$pkgver.tar.gz) +sha1sums=('a40d8a4b283ef34445d4aeb99483fff52b5ddb41') +_F_cd_path="$_F_archive_name-$pkgver" From vmiklos at frugalware.org Mon Jun 9 17:22:41 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 9 17:22:43 2008 Subject: [Frugalware-git] frugalware-current: activerecord-2.1.0-1-i686 Message-ID: <20080609152241.D96411778001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a99e3d65723178e85b9ae16ec01c047a6386776a commit a99e3d65723178e85b9ae16ec01c047a6386776a Author: Miklos Vajna Date: Mon Jun 9 16:54:25 2008 +0200 activerecord-2.1.0-1-i686 - version bump diff --git a/source/devel-extra/activerecord/FrugalBuild b/source/devel-extra/activerecord/FrugalBuild index 05874b5..e90c0a8 100644 --- a/source/devel-extra/activerecord/FrugalBuild +++ b/source/devel-extra/activerecord/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Bence Nagy pkgname=activerecord -pkgver=2.0.2 +pkgver=2.1.0 pkgrel=1 pkgdesc="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM" url="http://rubyforge.org/projects/actionpack/" @@ -10,4 +10,4 @@ depends=('activesupport>=1.4.1') groups=('devel-extra') archs=('i686' 'x86_64') Finclude gem -sha1sums=('9a7a0356fd20e65dd61d2a2c8441ad336c2fba80') +sha1sums=('561c85de72c90aad0986a6cd415b15e62d1b6cf8') From vmiklos at frugalware.org Mon Jun 9 17:22:42 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 9 17:22:45 2008 Subject: [Frugalware-git] frugalware-current: activesupport-2.1.0-1-i686 Message-ID: <20080609152242.1073417780AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=65ca05a6b1a281fc4c52d8a5486b4368a4aba65e commit 65ca05a6b1a281fc4c52d8a5486b4368a4aba65e Author: Miklos Vajna Date: Mon Jun 9 16:59:37 2008 +0200 activesupport-2.1.0-1-i686 - version bump diff --git a/source/devel-extra/activesupport/FrugalBuild b/source/devel-extra/activesupport/FrugalBuild index 967cb9f..b17dc15 100644 --- a/source/devel-extra/activesupport/FrugalBuild +++ b/source/devel-extra/activesupport/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Bence Nagy pkgname=activesupport -pkgver=2.0.2 +pkgver=2.1.0 pkgrel=1 pkgdesc="Eases web-request routing, handling, and response." url="http://rubyforge.org/projects/actionpack/" groups=('devel-extra') archs=('i686' 'x86_64') Finclude gem -sha1sums=('e5699d9441f6a9f2b3ea70f2b132146033ff3451') +sha1sums=('92064e31e115bbf50f144ac7f52c8b8e031bdcc2') # optimization OK From vmiklos at frugalware.org Mon Jun 9 17:22:42 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 9 17:22:47 2008 Subject: [Frugalware-git] frugalware-current: include/gem.sh: warning fixes Message-ID: <20080609152242.22B0817780AC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=50571e8781685ffb8fd6e3c70c3a052174110706 commit 50571e8781685ffb8fd6e3c70c3a052174110706 Author: Miklos Vajna Date: Mon Jun 9 16:59:48 2008 +0200 include/gem.sh: warning fixes diff --git a/source/include/gem.sh b/source/include/gem.sh index 085f285..2d4adfa 100644 --- a/source/include/gem.sh +++ b/source/include/gem.sh @@ -72,9 +72,9 @@ Finstallgem() { Fmkdir "$archdir" cp -R ext/* "$Fdestdir"/"$archdir" || Fdie fi - if [ -d doc -a -n "`ls doc`" ]; then + if [ -d doc -a -n "`ls doc 2>/dev/null`" ]; then Fmkdir /usr/share/doc/"$pkgname"-"$pkgver" - if [ -d doc/"$_F_gem_name"-"$pkgver" -a -n "`ls doc/$pkgname-$pkgver`" ]; then + if [ -d doc/"$_F_gem_name"-"$pkgver" -a -n "`ls doc/$pkgname-$pkgver 2>/dev/null`" ]; then cp -R doc/"$_F_gem_name"-"$pkgver"/* "$Fdestdir"/usr/share/doc/"$pkgname"-"$pkgver" || Fdie rm -rf doc/"$_F_gem_name"-"$pkgver"/ || Fdie fi From vmiklos at frugalware.org Mon Jun 9 17:22:42 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 9 17:22:48 2008 Subject: [Frugalware-git] frugalware-current: actionmailer-2.1.0-1-i686 Message-ID: <20080609152242.483191778001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4ade539ce5934be1dea85518151e2a7d0d90d755 commit 4ade539ce5934be1dea85518151e2a7d0d90d755 Author: Miklos Vajna Date: Mon Jun 9 17:10:52 2008 +0200 actionmailer-2.1.0-1-i686 - version bump diff --git a/source/devel-extra/actionmailer/FrugalBuild b/source/devel-extra/actionmailer/FrugalBuild index 902aaf6..fbdeeec 100644 --- a/source/devel-extra/actionmailer/FrugalBuild +++ b/source/devel-extra/actionmailer/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Bence Nagy pkgname=actionmailer -pkgver=2.0.2 +pkgver=2.1.0 pkgrel=1 pkgdesc="Framework for designing email-service layers" url="http://rubyforge.org/projects/actionmailer/" @@ -10,4 +10,4 @@ depends=('actionpack>=1.13.2') groups=('devel-extra') archs=('i686' 'x86_64') Finclude gem -sha1sums=('6ea83fb10f2d318627dc9de01e3772605bffbad4') +sha1sums=('53d0a243ae820e18032598dc027937b33e8a08d1') From vmiklos at frugalware.org Mon Jun 9 17:22:42 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 9 17:22:52 2008 Subject: [Frugalware-git] frugalware-current: actionpack-2.1.0-1-i686 Message-ID: <20080609152242.5A30C17780AD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b3d96d3b5218fcb571d1e9b37544796b49fdca71 commit b3d96d3b5218fcb571d1e9b37544796b49fdca71 Author: Miklos Vajna Date: Mon Jun 9 17:13:52 2008 +0200 actionpack-2.1.0-1-i686 - version bump diff --git a/source/devel-extra/actionpack/FrugalBuild b/source/devel-extra/actionpack/FrugalBuild index 9f9a13a..aef79fc 100644 --- a/source/devel-extra/actionpack/FrugalBuild +++ b/source/devel-extra/actionpack/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Bence Nagy pkgname=actionpack -pkgver=2.0.2 +pkgver=2.1.0 pkgrel=1 pkgdesc="Eases web-request routing, handling, and response." url="http://rubyforge.org/projects/actionpack/" @@ -10,4 +10,4 @@ depends=('activesupport>=1.4.1') groups=('devel-extra') archs=('i686' 'x86_64') Finclude gem -sha1sums=('90afb3597274565f56cc489e0fdfc139157f7035') +sha1sums=('859f5c385126e61d1a810d50a3b7d786b72ecca9') From vmiklos at frugalware.org Mon Jun 9 17:22:42 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 9 17:22:52 2008 Subject: [Frugalware-git] frugalware-current: rails-2.1.0-1-i686 Message-ID: <20080609152242.74F1F17780AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2963ad15236d0d7ed7c98aa98ab9c363bee1e63d commit 2963ad15236d0d7ed7c98aa98ab9c363bee1e63d Author: Miklos Vajna Date: Mon Jun 9 17:14:46 2008 +0200 rails-2.1.0-1-i686 - version bump diff --git a/source/devel-extra/rails/FrugalBuild b/source/devel-extra/rails/FrugalBuild index 7fd070b..7a64656 100644 --- a/source/devel-extra/rails/FrugalBuild +++ b/source/devel-extra/rails/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Bence Nagy pkgname=rails -pkgver=2.0.2 +pkgver=2.1.0 pkgrel=1 pkgdesc="Ruby on Rails is a web-application and persistance framework" url="http://www.rubyonrails.org/" @@ -31,4 +31,4 @@ build() { # optimization OK -sha1sums=('35428ad8ed0e1ee76d040283d5333ff4fb5f4261') +sha1sums=('7c5ab9edba65923d7332d842217e0e7fc6b66404') From vmiklos at frugalware.org Mon Jun 9 17:22:43 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 9 17:22:54 2008 Subject: [Frugalware-git] frugalware-current: sqlite3-ruby-1.2.2-1-i686 Message-ID: <20080609152243.C2B691778001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=39f024bbd9ed30f1e4c8453b77cc5300da7517f0 commit 39f024bbd9ed30f1e4c8453b77cc5300da7517f0 Author: Miklos Vajna Date: Mon Jun 9 17:21:34 2008 +0200 sqlite3-ruby-1.2.2-1-i686 - version bump diff --git a/source/devel-extra/sqlite3-ruby/FrugalBuild b/source/devel-extra/sqlite3-ruby/FrugalBuild index 401644f..2843343 100644 --- a/source/devel-extra/sqlite3-ruby/FrugalBuild +++ b/source/devel-extra/sqlite3-ruby/FrugalBuild @@ -2,19 +2,12 @@ # Maintainer: Bence Nagy pkgname=sqlite3-ruby -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc="A Ruby interface for the SQLite database engine" url="http://rubyforge.org/projects/sqlite-ruby/" depends=('sqlite3') groups=('devel-extra') archs=('i686' 'x86_64') - Finclude gem - -build() { - Finstallgem - Frm "$archdir" -} - -sha1sums=('b749ca7ceff3f568965918d68259081bdd650802') +sha1sums=('72cd1c3d3a82af4a220178ae61f324d0e380e545') From vmiklos at frugalware.org Mon Jun 9 17:35:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 9 17:35:06 2008 Subject: [Frugalware-git] frugalware-current: perl-anyevent-4.151-1-i686 Message-ID: <20080609153504.980A61770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3656c89ef159be2636819fc6e969bd44095926ed commit 3656c89ef159be2636819fc6e969bd44095926ed Author: Miklos Vajna Date: Mon Jun 9 17:34:51 2008 +0200 perl-anyevent-4.151-1-i686 - version bump diff --git a/source/devel-extra/perl-anyevent/FrugalBuild b/source/devel-extra/perl-anyevent/FrugalBuild index a28324b..81ddfda 100644 --- a/source/devel-extra/perl-anyevent/FrugalBuild +++ b/source/devel-extra/perl-anyevent/FrugalBuild @@ -4,9 +4,9 @@ _F_perl_name=AnyEvent _F_perl_author=M/ML/MLEHMANN -pkgver=3.5 +pkgver=4.151 pkgdesc="Perl framework for multiple event loops." depends=('perl-event>=1.10') Finclude perl archs=('i686' 'x86_64') -sha1sums=('fe71ee9a994fadd425ce37fe511a7376ce479afd') +sha1sums=('12dddb47149ef2e4bb0576b4224f7abbe8c948fc') From devil505linux at gmail.com Mon Jun 9 18:58:09 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 9 18:58:12 2008 Subject: [Frugalware-git] frugalware-current: galculator-1.3.1-2-i686 Message-ID: <20080609165809.CA8FB1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4e5555d854abefd3ceb153fa0d550fe2c805f433 commit 4e5555d854abefd3ceb153fa0d550fe2c805f433 Author: Devil505 Date: Mon Jun 9 18:52:49 2008 +0200 galculator-1.3.1-2-i686 * fixed desktop icon (FS#3138) * fixed depends diff --git a/source/xapps-extra/galculator/FrugalBuild b/source/xapps-extra/galculator/FrugalBuild index cba0141..cbc6e3f 100644 --- a/source/xapps-extra/galculator/FrugalBuild +++ b/source/xapps-extra/galculator/FrugalBuild @@ -3,15 +3,20 @@ pkgname=galculator pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="galculator is a GTK 2 based scientific calculator supporting algebraic mode as well as RPN." -_F_sourceforge_broken_up2date=1 Finclude sourceforge -depends=('libglade' 'libxdamage') +depends=('libglade' 'glibc' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' 'libxext') makedepends=('pkgconfig') options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') sha1sums=('095765206cab968d6f00c1ae58b1bd8425c454d6') +build() +{ + Fbuild + Fsed 'gnome-calc2.png' '/usr/share/pixmaps/galculator/galculator_48x48.png' $Fdestdir/usr/share/applications/$pkgname.desktop +} + # optimization OK From vmiklos at frugalware.org Mon Jun 9 19:09:11 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 9 19:09:14 2008 Subject: [Frugalware-git] frugalware-current: include/kernel.sh: always include the correct patchlevel in config Message-ID: <20080609170911.C93BF1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=66904a0bb4eeba3ce2538db5ac6f0c0e7e0e6d88 commit 66904a0bb4eeba3ce2538db5ac6f0c0e7e0e6d88 Author: Miklos Vajna Date: Mon Jun 9 19:08:36 2008 +0200 include/kernel.sh: always include the correct patchlevel in config - so that if a user has a kernel like 2.6.25-fw2, it'll be still obvious what kernel version it was based on diff --git a/source/include/kernel.sh b/source/include/kernel.sh index 5875fb1..9ced994 100644 --- a/source/include/kernel.sh +++ b/source/include/kernel.sh @@ -249,6 +249,9 @@ Fbuildkernel() cp $Fsrcdir/config .config || Fdie fi + if [ -n "$_F_kernel_stable" ]; then + sed -i "/Linux kernel version:/s/: .*/: $_F_kernel_ver.$_F_kernel_stable/" .config + fi [ $_F_kernel_stable -gt 0 ] && Fpatch patch-$_F_kernel_ver.$_F_kernel_stable [ $_F_kernel_rc -gt 0 ] && Fpatch patch-$_F_kernel_rcver From bouleetbil at frogdev.info Mon Jun 9 22:22:10 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jun 9 22:22:12 2008 Subject: [Frugalware-git] frugalware-current: gtkmathview-0.8.0-1-i686 Message-ID: <20080609202210.D57371770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5c905afffaee194f3a590e2cf5ab170ba13156f5 commit 5c905afffaee194f3a590e2cf5ab170ba13156f5 Author: bouleetbil Date: Mon Jun 9 22:01:28 2008 +0200 gtkmathview-0.8.0-1-i686 *new package diff --git a/source/xlib-extra/gtkmathview/FrugalBuild b/source/xlib-extra/gtkmathview/FrugalBuild new file mode 100644 index 0000000..4350f35 --- /dev/null +++ b/source/xlib-extra/gtkmathview/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: 2.42 SBU +# Maintainer: bouleetbil + +pkgname=gtkmathview +pkgver=0.8.0 +pkgrel=1 +pkgdesc="Rendering engine for MathML documents" +depends=('popt' 'libxml2' 'gtk+2' 't1lib' 'pango') +groups=('xlib-extra') +archs=('i686') +url="http://helm.cs.unibo.it/mml-widget/" +up2date="lynx -dump $url/sources/ | Flasttar" +source=($url/sources/$pkgname-$pkgver.tar.gz gcc43.patch) +Fconfopts="${Fconfopts[@]} --enable-svg + --enable-popt \ + --enable-libxml2 \ + --enable-libxml2-reader \ + --enable-ps \ + --enable-tfm=2 \ + --enable-builder-cache \ + --enable-breaks \ + --enable-boxml" +sha1sums=('dc6db75a64b8dcde05185c3c54eec310dd7b14d6' \ + '6818e6d50d6bb739e0bcb9c89c879aebb730bee5') + +# optimization OK diff --git a/source/xlib-extra/gtkmathview/gcc43.patch b/source/xlib-extra/gtkmathview/gcc43.patch new file mode 100644 index 0000000..5edfa92 --- /dev/null +++ b/source/xlib-extra/gtkmathview/gcc43.patch @@ -0,0 +1,56 @@ +diff -urN gtkmathview-0.8.0-orig/mathmlps/main.cc gtkmathview-0.8.0/mathmlps/main.cc +--- gtkmathview-0.8.0-orig/mathmlps/main.cc 2008-04-03 22:43:06.000000000 +0400 ++++ gtkmathview-0.8.0/mathmlps/main.cc 2008-04-03 23:53:16.000000000 +0400 +@@ -20,6 +20,7 @@ + + #include + #include ++#include + + #include + +diff -urN gtkmathview-0.8.0-orig/mathmlsvg/main.cc gtkmathview-0.8.0/mathmlsvg/main.cc +--- gtkmathview-0.8.0-orig/mathmlsvg/main.cc 2008-04-03 22:43:05.000000000 +0400 ++++ gtkmathview-0.8.0/mathmlsvg/main.cc 2008-04-03 23:43:31.000000000 +0400 +@@ -20,6 +20,7 @@ + + #include + #include ++#include + + #include + +diff -urN gtkmathview-0.8.0-orig/mathmlsvg/SMS.cc gtkmathview-0.8.0/mathmlsvg/SMS.cc +--- gtkmathview-0.8.0-orig/mathmlsvg/SMS.cc 2008-04-03 22:43:05.000000000 +0400 ++++ gtkmathview-0.8.0/mathmlsvg/SMS.cc 2008-04-03 23:25:12.000000000 +0400 +@@ -19,6 +19,7 @@ + #include + + #include ++#include + #include "defs.h" + #include "AbstractLogger.hh" + #include "ValueConversion.hh" +diff -urN gtkmathview-0.8.0-orig/src/engine/mathml/mathVariantAux.cc gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc +--- gtkmathview-0.8.0-orig/src/engine/mathml/mathVariantAux.cc 2008-04-03 22:43:05.000000000 +0400 ++++ gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc 2008-04-03 23:10:05.000000000 +0400 +@@ -20,6 +20,8 @@ + + #include + ++#include ++ + #include "mathVariantAux.hh" + + static MathVariantAttributes vattr[] = { +diff -urN gtkmathview-0.8.0-orig/src/backend/ps/T1_FontDataBase.cc gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc +--- gtkmathview-0.8.0-orig/src/backend/ps/T1_FontDataBase.cc 2007-08-17 12:02:40.000000000 +0200 ++++ gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc 2008-06-07 12:26:01.000000000 +0200 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #include "String.hh" + #include "T1_FontDataBase.hh" From bouleetbil at frogdev.info Mon Jun 9 22:35:49 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jun 9 22:35:51 2008 Subject: [Frugalware-git] frugalware-current: perl-gtk2-ex-simple-list-0.50-1-i686 Message-ID: <20080609203549.78D8A1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0a67cb014695417f24fee38fc88632580d0deaf9 commit 0a67cb014695417f24fee38fc88632580d0deaf9 Author: bouleetbil Date: Mon Jun 9 22:26:09 2008 +0200 perl-gtk2-ex-simple-list-0.50-1-i686 *new package diff --git a/source/xlib-extra/perl-gtk2-ex-simple-list/FrugalBuild b/source/xlib-extra/perl-gtk2-ex-simple-list/FrugalBuild new file mode 100644 index 0000000..fefb200 --- /dev/null +++ b/source/xlib-extra/perl-gtk2-ex-simple-list/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.06 SBU +# Maintainer: bouleetbil + +pkgname=perl-gtk2-ex-simple-list +pkgver=0.50 +pkgrel=1 +pkgdesc="A simple interface to Gtk2's complex MVC list widget" +url="http://search.cpan.org/~rmcfarla/" +depends=('gtk+2' 'perl-gtk2') +makedepends=('perl-glib') +_F_perl_name=Gtk2-Ex-Simple-List +_F_perl_author=R/RM/RMCFARLA/Gtk2-Perl-Ex +Finclude perl +groups=('xlib-extra') +archs=('i686') +sha1sums=('0bf571ef6bac747a83a3a696981dba27b10ce109') From vmiklos at frugalware.org Mon Jun 9 22:41:00 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 9 22:41:03 2008 Subject: [Frugalware-git] bmf: git-1.5.6.rc2-1-i686 Message-ID: <20080609204100.137861770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=0198936c575f864ad8242bbae17af68e22a53ed7 commit 0198936c575f864ad8242bbae17af68e22a53ed7 Author: Miklos Vajna Date: Mon Jun 9 22:40:06 2008 +0200 git-1.5.6.rc2-1-i686 - bump to rc2 - tmp disable texinfo doc diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index 770e7ca..4ff88c7 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -8,8 +8,8 @@ USE_DEVEL=${USE_DEVEL:-"y"} USE_HTMLMAN=${USE_HTMLMAN:-"y"} pkgname=git -pkgver=1.5.5.2 -Fuse $USE_DEVEL && pkgver=1.5.6.rc0 +pkgver=1.5.5.4 +Fuse $USE_DEVEL && pkgver=1.5.6.rc2 pkgrel=1 pkgdesc="A fast, scalable, distributed revision control system." url="http://www.kernel.org/pub/software/scm/git/" @@ -62,8 +62,11 @@ build() Fconf build_settings="V=1 ETC_GITCONFIG=/etc/gitconfig htmldir=/usr/share/doc/$pkgname-$pkgver mandir=/usr/share/man" - make $build_settings DOCBOOK2X_TEXI=docbook2texi all doc info || return 1 - Fmakeinstall $build_settings install-doc install-info + # 'info' is currently broken, see + # http://mid.gmane.org/20080605234016.GO29404@genesis.frugalware.org + make $build_settings DOCBOOK2X_TEXI=docbook2texi all doc || return 1 + # likewise, install-info is currently disabled + Fmakeinstall $build_settings install-doc Ffilerel perl/private-Error.pm /usr/lib/perl5/site_perl/current/Error.pm make -C Documentation WEBDOC_DEST=$Fdestdir/usr/share/doc/$pkgname-$pkgver install-webdoc || return 1 # broken symlink From bouleetbil at frogdev.info Mon Jun 9 23:14:39 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jun 9 23:14:42 2008 Subject: [Frugalware-git] frugalware-current: mousetweaks-2.22.2-1-i686 Message-ID: <20080609211439.A44B11770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5d849a93e795ad34fbeaacef0c01aa97f1b81f3a commit 5d849a93e795ad34fbeaacef0c01aa97f1b81f3a Author: bouleetbil Date: Mon Jun 9 23:08:18 2008 +0200 mousetweaks-2.22.2-1-i686 *version bump diff --git a/source/gnome-extra/mousetweaks/FrugalBuild b/source/gnome-extra/mousetweaks/FrugalBuild index eadb338..6d64d99 100644 --- a/source/gnome-extra/mousetweaks/FrugalBuild +++ b/source/gnome-extra/mousetweaks/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=mousetweaks -pkgver=2.22.1 +pkgver=2.22.2 pkgrel=1 pkgdesc="The Mousetweaks package provides mouse accessibility enhancements for the GNOME desktop." url="http://www.gnome.org/" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/mousetweaks.schemas' \ '/etc/gconf/schemas/pointer-capture-applet.schemas') Finclude gnome -sha1sums=('68633df345fa9d0eaf59df80a5e1194e7f7eb076') +sha1sums=('846c9ee24bdfe01282d214367b710da138a101cc') # optimization OK From hermier at frugalware.org Mon Jun 9 23:15:22 2008 From: hermier at frugalware.org (Michel Hermier) Date: Mon Jun 9 23:15:24 2008 Subject: [Frugalware-git] homepage-ng: news_fr.xml Message-ID: <20080609211522.20DC21770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=f59601de6eaa0706890a39a300c75ab646f860ff commit f59601de6eaa0706890a39a300c75ab646f860ff Author: Michel Hermier Date: Mon Jun 9 23:15:10 2008 +0200 news_fr.xml * Add news 100. diff --git a/frugalware/xml/news_fr.xml b/frugalware/xml/news_fr.xml index bb47d23..1429c34 100644 --- a/frugalware/xml/news_fr.xml +++ b/frugalware/xml/news_fr.xml @@ -22,6 +22,25 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> + 100 + Lettre d'information Frugalware numéro 25 + Thu, 05 Jun 2008 21:46:39 +1000 + phayz + 0 + + Dans ce numéro: +
    +
  • Les développeurs de Frugalware sont des personnes également! - IroniQ
    • +
  • Astuce - man - des symboles étranges apparaissent
    • +
  • ryuo est maintenant un développeur!
    • +
  • Les utilisateurs se battent sur irc
    • +
+ Vous pouvez la lire ici (anglais). Nous espérons que vous l'apprécierez! + ]]> + + + 99 Lettre d'information Frugalware numéro 24 Tue, 27 May 2008 22:57:50 +1000 From vmiklos at frugalware.org Mon Jun 9 23:18:31 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 9 23:18:32 2008 Subject: [Frugalware-git] frugalware-current: java-gcj-compat-1.0.78-2-i686 Message-ID: <20080609211831.5CDE01770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2afb0318c0cdc438646e738b4a93c609e27dafeb commit 2afb0318c0cdc438646e738b4a93c609e27dafeb Author: Miklos Vajna Date: Mon Jun 9 23:18:16 2008 +0200 java-gcj-compat-1.0.78-2-i686 - forgot to pkgrel++ diff --git a/source/devel-extra/java-gcj-compat/FrugalBuild b/source/devel-extra/java-gcj-compat/FrugalBuild index 4c796b7..4f1e260 100644 --- a/source/devel-extra/java-gcj-compat/FrugalBuild +++ b/source/devel-extra/java-gcj-compat/FrugalBuild @@ -3,7 +3,7 @@ pkgname=java-gcj-compat pkgver=1.0.78 -pkgrel=1 +pkgrel=2 gccver=4.3.1 javaver="1.5.0-gcj-1.5.0.0" pkgdesc="A collection of wrapper scripts, symlinks and jar files." From janny at frugalware.org Tue Jun 10 07:18:51 2008 From: janny at frugalware.org (Janos Kovacs) Date: Tue Jun 10 07:18:53 2008 Subject: [Frugalware-git] frugalware-current: clamav-0.93.1-1-i686 Message-ID: <20080610051851.A87F21770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0ac16ed2ea3294d55a566a25023eac43e396ba67 commit 0ac16ed2ea3294d55a566a25023eac43e396ba67 Author: Janos Kovacs Date: Tue Jun 10 07:18:16 2008 +0200 clamav-0.93.1-1-i686 * version bump diff --git a/source/apps-extra/clamav/FrugalBuild b/source/apps-extra/clamav/FrugalBuild index 1059aa3..38d7702 100644 --- a/source/apps-extra/clamav/FrugalBuild +++ b/source/apps-extra/clamav/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Janny pkgname=clamav -pkgver=0.93 +pkgver=0.93.1 pkgrel=1 pkgdesc="Clam AntiVirus is a GPL anti-virus toolkit for UNIX" depends=('gmp' 'bzip2' 'curl>=7.16.0') @@ -12,7 +12,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') Finclude sourceforge source=($source rc.clamav rc.clamav-hu.po) -sha1sums=('bae5f70331e8592e9c53a04517038890845d406d' \ +sha1sums=('3306f3cd289aac3793962c9834cd1bd500abfb0c' \ '90b22c99927b56992ac05042029d2702db79a8b0' \ '57d36966c45adfd6b3ebd10b91874194924ab2c3') From janny at frugalware.org Tue Jun 10 07:30:04 2008 From: janny at frugalware.org (Janos Kovacs) Date: Tue Jun 10 07:30:05 2008 Subject: [Frugalware-git] frugalware-current: gdal-1.5.2-1-i686 Message-ID: <20080610053004.170D81770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d036d444e3840235b499816166a16de5d4c88658 commit d036d444e3840235b499816166a16de5d4c88658 Author: Janos Kovacs Date: Tue Jun 10 07:29:05 2008 +0200 gdal-1.5.2-1-i686 * version bump diff --git a/source/apps-extra/gdal/FrugalBuild b/source/apps-extra/gdal/FrugalBuild index 90e7196..7f1ae72 100644 --- a/source/apps-extra/gdal/FrugalBuild +++ b/source/apps-extra/gdal/FrugalBuild @@ -1,8 +1,8 @@ -# Compiling time: 2.48 SBU +# Compiling time: 1.58 SBU # Maintainer: Janny pkgname=gdal -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=1 pkgdesc="GDAL - a translator library for raster geospatial data formats" url="http://www.gdal.org/" @@ -12,10 +12,9 @@ makedepends=('postgresql>=8.2.1' 'mysql') archs=('i686' 'x86_64') groups=('apps-extra') up2date="lynx -dump http://download.osgeo.org/gdal/|grep $pkgname-[0-9\.]*\.tar.gz$ |tail -n 1 |sed -ne 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=($url/dl/$pkgname-$pkgver.tar.gz gdal-gcc43.patch) +source=($url/dl/$pkgname-$pkgver.tar.gz) Finclude python -sha1sums=('e188b82f0c4f12c6925afecfde742e3eab627d49' \ - 'f7932fd9eca6cd52dabd61e343845d5053db380c') +sha1sums=('bf759b28d2218919212484c2b593edbc1c09aabb') build() { Fbuild --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin \ diff --git a/source/apps-extra/gdal/gdal-gcc43.patch b/source/apps-extra/gdal/gdal-gcc43.patch deleted file mode 100644 index 2505d98..0000000 --- a/source/apps-extra/gdal/gdal-gcc43.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp.orig 2008-02-14 02:43:16.000000000 +0200 -+++ ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp 2008-02-14 13:21:22.000000000 +0200 -@@ -26,10 +26,11 @@ - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - ****************************************************************************/ -+#include // for_each, find_if -+ - #include "ogr_geojson.h" - #include "ogrgeojsonwriter.h" - #include // JSON-C --#include // for_each, find_if - - /************************************************************************/ - /* STATIC MEMBERS DEFINITION */ From janny at frugalware.org Tue Jun 10 07:35:08 2008 From: janny at frugalware.org (Janos Kovacs) Date: Tue Jun 10 07:35:10 2008 Subject: [Frugalware-git] frugalware-current: courier-authlib-0.60.6-1-i686 Message-ID: <20080610053508.998B91770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e84052c7282c5a9adaed45d399fcc22fc9dfd875 commit e84052c7282c5a9adaed45d399fcc22fc9dfd875 Author: Janos Kovacs Date: Tue Jun 10 07:34:43 2008 +0200 courier-authlib-0.60.6-1-i686 * version bump diff --git a/source/network-extra/courier-authlib/FrugalBuild b/source/network-extra/courier-authlib/FrugalBuild index 50fa658..2c54470 100644 --- a/source/network-extra/courier-authlib/FrugalBuild +++ b/source/network-extra/courier-authlib/FrugalBuild @@ -1,9 +1,9 @@ -# Compiling Time: 0.93 SBU -# Maintainer: Janny +# Compiling Time: 0.61 SBU +# Maintainer: Janos Kovacs # Contributor: Karoly CZOVEK pkgname=courier-authlib -pkgver=0.60.5 +pkgver=0.60.6 pkgrel=1 pkgdesc="The Courier authentication library & daemon" _F_sourceforge_dirname="courier" @@ -19,7 +19,7 @@ backup=('etc/courier/authdaemonrc' 'etc/courier/authlib/userdb') up2date="lynx -dump 'http://www.courier-mta.org/download.php'|grep authlib|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=($source rc.courier-authlib rc.courier-authlib-de.po authdaemonrc.frugal \ README.frugalware) -sha1sums=('5618a4ef3cebc01e01a1ef1137322c1c67d7056e' \ +sha1sums=('31224309d6cde82e57fcddf73fc1999fd7529fd4' \ '0f9b61c096dc7d164c1c2733cdd9742534731c79' \ '2ac194885e90df15d3d7fc3f38f3822cd931fa9a' \ '57669b3fd1d3dda9d4e00d91a6a53ab31fd8e5a0' \ From krics at linuxforum.hu Tue Jun 10 09:12:36 2008 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Jun 10 09:12:39 2008 Subject: [Frugalware-git] frugalware-current: wesnoth-1.4.3-1-x86_64 Message-ID: <20080610071236.40FC61770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=48d552c5d71de98ad4f89610aef278486143f415 commit 48d552c5d71de98ad4f89610aef278486143f415 Author: Christian Hamar alias krix Date: Tue Jun 10 09:11:59 2008 +0200 wesnoth-1.4.3-1-x86_64 * Version bump diff --git a/source/games-extra/wesnoth/FrugalBuild b/source/games-extra/wesnoth/FrugalBuild index 295e30f..48418b3 100644 --- a/source/games-extra/wesnoth/FrugalBuild +++ b/source/games-extra/wesnoth/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=wesnoth -pkgver=1.4.2 +pkgver=1.4.3 pkgrel=1 pkgdesc="Wesnoth is a turn based strategy game played in the fantasy world" depends=('sdl' 'sdlimage' 'sdl_net' 'sdl_mixer>=1.2.8' 'libpng' 'libjpeg' 'libogg' \ @@ -17,6 +17,6 @@ up2date="lynx -dump $url |grep 'Download Wesnoth' |grep stable|sed 's/.* \([^ ]* Fconfopts="$Fconfopts --enable-server --enable-editor --enable-tools \ --enable-campaign-server --with-kde --with-gnome \ --with-fifodir=/var/run/wesnothd --enable-optipng" -sha1sums=('8dca4b1cb06ccc87a2bfbe6deeb632e2bcfe5740') +sha1sums=('e26fb7e569a536b5c3bafe5cf7846a4955297d91') # optimization OK From crazy at frugalware.org Tue Jun 10 10:16:51 2008 From: crazy at frugalware.org (crazy) Date: Tue Jun 10 10:16:55 2008 Subject: [Frugalware-git] frugalware-current: Janny -> Janos Kovacs Message-ID: <20080610081651.281A71770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1eabfb98a3f7bd9d818fa57d3cdab5678c12b26d commit 1eabfb98a3f7bd9d818fa57d3cdab5678c12b26d Author: crazy Date: Tue Jun 10 10:16:01 2008 +0200 Janny -> Janos Kovacs * changed m8r name for Janny in all FrugalBuilds diff --git a/source/apps-extra/clamav/FrugalBuild b/source/apps-extra/clamav/FrugalBuild index 38d7702..cd098b7 100644 --- a/source/apps-extra/clamav/FrugalBuild +++ b/source/apps-extra/clamav/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.51 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=clamav pkgver=0.93.1 diff --git a/source/apps-extra/dazuko/FrugalBuild b/source/apps-extra/dazuko/FrugalBuild index 7424c52..49c1289 100644 --- a/source/apps-extra/dazuko/FrugalBuild +++ b/source/apps-extra/dazuko/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=dazuko pkgver=2.3.4 diff --git a/source/apps-extra/gdal/FrugalBuild b/source/apps-extra/gdal/FrugalBuild index 7f1ae72..eacdc83 100644 --- a/source/apps-extra/gdal/FrugalBuild +++ b/source/apps-extra/gdal/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 1.58 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=gdal pkgver=1.5.2 diff --git a/source/apps-extra/progsreiserfs/FrugalBuild b/source/apps-extra/progsreiserfs/FrugalBuild index 1892493..355586c 100644 --- a/source/apps-extra/progsreiserfs/FrugalBuild +++ b/source/apps-extra/progsreiserfs/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=progsreiserfs pkgver=0.3.0.5 diff --git a/source/apps-extra/proj/FrugalBuild b/source/apps-extra/proj/FrugalBuild index fbe9d48..426a7c0 100644 --- a/source/apps-extra/proj/FrugalBuild +++ b/source/apps-extra/proj/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.52 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=proj pkgver=4.6.0 diff --git a/source/apps-extra/txt2tags/FrugalBuild b/source/apps-extra/txt2tags/FrugalBuild index 4304450..736bf46 100644 --- a/source/apps-extra/txt2tags/FrugalBuild +++ b/source/apps-extra/txt2tags/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=txt2tags pkgver=2.4 diff --git a/source/devel-extra/gcc-4.1/FrugalBuild b/source/devel-extra/gcc-4.1/FrugalBuild index f026bf6..ca54831 100644 --- a/source/devel-extra/gcc-4.1/FrugalBuild +++ b/source/devel-extra/gcc-4.1/FrugalBuild @@ -1,6 +1,6 @@ # Compiling Time: 4.43 SBU # Contributor: VMiklos -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=gcc-4.1 pkgver=4.1.2 diff --git a/source/devel-extra/perl-bit-vector/FrugalBuild b/source/devel-extra/perl-bit-vector/FrugalBuild index 8fe655c..c4cfedc 100644 --- a/source/devel-extra/perl-bit-vector/FrugalBuild +++ b/source/devel-extra/perl-bit-vector/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.1 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs _F_perl_name=Bit-Vector _F_perl_author=S/ST/STBEY diff --git a/source/devel-extra/perl-carp-clan/FrugalBuild b/source/devel-extra/perl-carp-clan/FrugalBuild index fbadab9..4cd11f3 100644 --- a/source/devel-extra/perl-carp-clan/FrugalBuild +++ b/source/devel-extra/perl-carp-clan/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.1 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs _F_perl_name=Carp-Clan _F_perl_author=J/JJ/JJORE diff --git a/source/devel-extra/perl-date-calc/FrugalBuild b/source/devel-extra/perl-date-calc/FrugalBuild index fc40607..07ef130 100644 --- a/source/devel-extra/perl-date-calc/FrugalBuild +++ b/source/devel-extra/perl-date-calc/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.1 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs _F_perl_name=Date-Calc _F_perl_author=S/ST/STBEY diff --git a/source/devel-extra/perl-file-find-closures/FrugalBuild b/source/devel-extra/perl-file-find-closures/FrugalBuild index f63e072..6c6e8e2 100644 --- a/source/devel-extra/perl-file-find-closures/FrugalBuild +++ b/source/devel-extra/perl-file-find-closures/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.1 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs _F_perl_name=File-Find-Closures _F_perl_author=B/BD/BDFOY diff --git a/source/devel-extra/perl-file-find-rule/FrugalBuild b/source/devel-extra/perl-file-find-rule/FrugalBuild index 4cfcac4..458f5ec 100644 --- a/source/devel-extra/perl-file-find-rule/FrugalBuild +++ b/source/devel-extra/perl-file-find-rule/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.1 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs _F_perl_name=File-Find-Rule _F_perl_author=R/RC/RCLAMP diff --git a/source/devel-extra/perl-number-compare/FrugalBuild b/source/devel-extra/perl-number-compare/FrugalBuild index 37d1449..8ede425 100644 --- a/source/devel-extra/perl-number-compare/FrugalBuild +++ b/source/devel-extra/perl-number-compare/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.1 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs _F_perl_name=Number-Compare _F_perl_author=R/RC/RCLAMP diff --git a/source/devel-extra/perl-text-glob/FrugalBuild b/source/devel-extra/perl-text-glob/FrugalBuild index e454b10..90e52aa 100644 --- a/source/devel-extra/perl-text-glob/FrugalBuild +++ b/source/devel-extra/perl-text-glob/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.1 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs _F_perl_name=Text-Glob _F_perl_author=R/RC/RCLAMP diff --git a/source/games-extra/supertux/FrugalBuild b/source/games-extra/supertux/FrugalBuild index 9a1ec3e..c7790bf 100644 --- a/source/games-extra/supertux/FrugalBuild +++ b/source/games-extra/supertux/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 2.53 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=supertux pkgver=0.3.0 diff --git a/source/gnome-extra/avidemux/FrugalBuild b/source/gnome-extra/avidemux/FrugalBuild index fa0be6a..bdfb16f 100644 --- a/source/gnome-extra/avidemux/FrugalBuild +++ b/source/gnome-extra/avidemux/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 1.56 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=avidemux pkgver=2.4.1 diff --git a/source/gnome-extra/firestarter/FrugalBuild b/source/gnome-extra/firestarter/FrugalBuild index d701261..ca85d75 100644 --- a/source/gnome-extra/firestarter/FrugalBuild +++ b/source/gnome-extra/firestarter/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.15 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=firestarter pkgver=1.0.3 diff --git a/source/gnome-extra/tsclient/FrugalBuild b/source/gnome-extra/tsclient/FrugalBuild index 3086152..3cf7319 100644 --- a/source/gnome-extra/tsclient/FrugalBuild +++ b/source/gnome-extra/tsclient/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.09 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=tsclient pkgver=0.148 diff --git a/source/gnome-extra/zapping/FrugalBuild b/source/gnome-extra/zapping/FrugalBuild index 3a62958..c5c2fc0 100644 --- a/source/gnome-extra/zapping/FrugalBuild +++ b/source/gnome-extra/zapping/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 1.56 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=zapping pkgver=0.10cvs6 diff --git a/source/kde-extra/kasablanca/FrugalBuild b/source/kde-extra/kasablanca/FrugalBuild index f8125a3..bcb4ee0 100644 --- a/source/kde-extra/kasablanca/FrugalBuild +++ b/source/kde-extra/kasablanca/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.21 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=kasablanca pkgver=0.4.0.2 diff --git a/source/kde-extra/kat/FrugalBuild b/source/kde-extra/kat/FrugalBuild index 4d485e3..dd0edb0 100644 --- a/source/kde-extra/kat/FrugalBuild +++ b/source/kde-extra/kat/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 1.50 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=kat pkgver=0.6.4 diff --git a/source/kde-extra/kcheckgmail/FrugalBuild b/source/kde-extra/kcheckgmail/FrugalBuild index 99c9313..ba8877b 100644 --- a/source/kde-extra/kcheckgmail/FrugalBuild +++ b/source/kde-extra/kcheckgmail/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.15 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=kcheckgmail pkgver=0.5.7.4 diff --git a/source/kde-extra/kdeqemu/FrugalBuild b/source/kde-extra/kdeqemu/FrugalBuild index 5caac40..998359b 100644 --- a/source/kde-extra/kdeqemu/FrugalBuild +++ b/source/kde-extra/kdeqemu/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.00 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=kdeqemu pkgver=0.3Alpha diff --git a/source/kde-extra/kiosktool/FrugalBuild b/source/kde-extra/kiosktool/FrugalBuild index ecac110..23f0e3b 100644 --- a/source/kde-extra/kiosktool/FrugalBuild +++ b/source/kde-extra/kiosktool/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.35 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=kiosktool pkgver=1.0 diff --git a/source/kde-extra/kipi-plugins/FrugalBuild b/source/kde-extra/kipi-plugins/FrugalBuild index 72d98b1..dc0a2c3 100644 --- a/source/kde-extra/kipi-plugins/FrugalBuild +++ b/source/kde-extra/kipi-plugins/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 3.85 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=kipi-plugins pkgver=0.1.5 diff --git a/source/kde-extra/klamav/FrugalBuild b/source/kde-extra/klamav/FrugalBuild index 26dcd13..ca3216d 100644 --- a/source/kde-extra/klamav/FrugalBuild +++ b/source/kde-extra/klamav/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.72 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=klamav pkgver=0.43 diff --git a/source/kde-extra/kmplayer/FrugalBuild b/source/kde-extra/kmplayer/FrugalBuild index 6e330c3..082bd9d 100644 --- a/source/kde-extra/kmplayer/FrugalBuild +++ b/source/kde-extra/kmplayer/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.90 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=kmplayer pkgver=0.10.0 diff --git a/source/kde-extra/knetstats/FrugalBuild b/source/kde-extra/knetstats/FrugalBuild index 29351af..076c115 100644 --- a/source/kde-extra/knetstats/FrugalBuild +++ b/source/kde-extra/knetstats/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.41 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=knetstats pkgver=1.6.1 diff --git a/source/kde-extra/kphotoalbum/FrugalBuild b/source/kde-extra/kphotoalbum/FrugalBuild index 8c4440d..e65d9d8 100644 --- a/source/kde-extra/kphotoalbum/FrugalBuild +++ b/source/kde-extra/kphotoalbum/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.88 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=kphotoalbum pkgver=3.1.1 diff --git a/source/kde-extra/krename/FrugalBuild b/source/kde-extra/krename/FrugalBuild index 750aafc..09c475b 100644 --- a/source/kde-extra/krename/FrugalBuild +++ b/source/kde-extra/krename/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.21 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=krename pkgver=3.0.14 diff --git a/source/kde-extra/krusader/FrugalBuild b/source/kde-extra/krusader/FrugalBuild index 84a25c9..a00fa18 100644 --- a/source/kde-extra/krusader/FrugalBuild +++ b/source/kde-extra/krusader/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.90 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs # Contributor: VMiklos pkgname=krusader diff --git a/source/kde-extra/ksniffer/FrugalBuild b/source/kde-extra/ksniffer/FrugalBuild index b5941f5..01e87d3 100644 --- a/source/kde-extra/ksniffer/FrugalBuild +++ b/source/kde-extra/ksniffer/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.33 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=ksniffer pkgver=0.3.2 diff --git a/source/kde-extra/ksudoku/FrugalBuild b/source/kde-extra/ksudoku/FrugalBuild index 4590032..29b272f 100644 --- a/source/kde-extra/ksudoku/FrugalBuild +++ b/source/kde-extra/ksudoku/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.14 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=ksudoku pkgver=0.4 diff --git a/source/kde-extra/ktechlab/FrugalBuild b/source/kde-extra/ktechlab/FrugalBuild index 6bff9dc..96d72d6 100644 --- a/source/kde-extra/ktechlab/FrugalBuild +++ b/source/kde-extra/ktechlab/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 2.80 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=ktechlab pkgver=0.3.6 diff --git a/source/kde-extra/kvpnc/FrugalBuild b/source/kde-extra/kvpnc/FrugalBuild index c6021ab..31b50c4 100644 --- a/source/kde-extra/kvpnc/FrugalBuild +++ b/source/kde-extra/kvpnc/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 1.06 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=kvpnc pkgver=0.9.0 diff --git a/source/kde-extra/kzenexplorer/FrugalBuild b/source/kde-extra/kzenexplorer/FrugalBuild index a99a877..814a4a2 100644 --- a/source/kde-extra/kzenexplorer/FrugalBuild +++ b/source/kde-extra/kzenexplorer/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.26 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=kzenexplorer pkgver=0.6 diff --git a/source/kde-extra/libkdcraw/FrugalBuild b/source/kde-extra/libkdcraw/FrugalBuild index 5339921..1c17877 100644 --- a/source/kde-extra/libkdcraw/FrugalBuild +++ b/source/kde-extra/libkdcraw/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=libkdcraw pkgver=0.1.3 diff --git a/source/lib-extra/freetds/FrugalBuild b/source/lib-extra/freetds/FrugalBuild index 07c73cd..7563eab 100644 --- a/source/lib-extra/freetds/FrugalBuild +++ b/source/lib-extra/freetds/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.46 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=freetds pkgver=0.82 diff --git a/source/lib-extra/geos/FrugalBuild b/source/lib-extra/geos/FrugalBuild index aea4a5d..3c76175 100644 --- a/source/lib-extra/geos/FrugalBuild +++ b/source/lib-extra/geos/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.70 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=geos pkgver=3.0.0 diff --git a/source/lib-extra/gputils/FrugalBuild b/source/lib-extra/gputils/FrugalBuild index e77ecd0..85668c7 100644 --- a/source/lib-extra/gputils/FrugalBuild +++ b/source/lib-extra/gputils/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.08 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=gputils pkgver=0.13.6 diff --git a/source/lib-extra/libdvdplay/FrugalBuild b/source/lib-extra/libdvdplay/FrugalBuild index 71e6ec4..aa103a8 100644 --- a/source/lib-extra/libdvdplay/FrugalBuild +++ b/source/lib-extra/libdvdplay/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.04 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=libdvdplay pkgver=1.0.1 diff --git a/source/lib-extra/o3read/FrugalBuild b/source/lib-extra/o3read/FrugalBuild index df0acac..2d5693d 100644 --- a/source/lib-extra/o3read/FrugalBuild +++ b/source/lib-extra/o3read/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=o3read pkgver=0.0.4 diff --git a/source/lib-extra/rte/FrugalBuild b/source/lib-extra/rte/FrugalBuild index e4af345..1898310 100644 --- a/source/lib-extra/rte/FrugalBuild +++ b/source/lib-extra/rte/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=rte pkgver=0.5.6 diff --git a/source/lib-extra/spidermonkey/FrugalBuild b/source/lib-extra/spidermonkey/FrugalBuild index 34e66ab..049e5e1 100644 --- a/source/lib-extra/spidermonkey/FrugalBuild +++ b/source/lib-extra/spidermonkey/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.14 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=spidermonkey pkgver=1.60 diff --git a/source/lib-extra/zvbi/FrugalBuild b/source/lib-extra/zvbi/FrugalBuild index e4671bd..c1d0d30 100644 --- a/source/lib-extra/zvbi/FrugalBuild +++ b/source/lib-extra/zvbi/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.31 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=zvbi pkgver=0.2.30 diff --git a/source/lib/fftw/FrugalBuild b/source/lib/fftw/FrugalBuild index 4653d25..396d9ce 100644 --- a/source/lib/fftw/FrugalBuild +++ b/source/lib/fftw/FrugalBuild @@ -1,6 +1,6 @@ # Compiling time: 2.27 SBU # Maintainer: crazy -# Contributor: Janny +# Contributor: Janos Kovacs pkgname=fftw pkgver=3.1.2 diff --git a/source/locale-extra/jdictionary-smartde-hu/FrugalBuild b/source/locale-extra/jdictionary-smartde-hu/FrugalBuild index 3d6e388..4f38286 100644 --- a/source/locale-extra/jdictionary-smartde-hu/FrugalBuild +++ b/source/locale-extra/jdictionary-smartde-hu/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=jdictionary-smartde-hu pkgver=1.4 diff --git a/source/locale-extra/jdictionary-smarten-de/FrugalBuild b/source/locale-extra/jdictionary-smarten-de/FrugalBuild index f04308a..c66e3ab 100644 --- a/source/locale-extra/jdictionary-smarten-de/FrugalBuild +++ b/source/locale-extra/jdictionary-smarten-de/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=jdictionary-smarten-de pkgver=1.4 diff --git a/source/locale-extra/jdictionary-smarten-es/FrugalBuild b/source/locale-extra/jdictionary-smarten-es/FrugalBuild index 0d509c9..d9140a8 100644 --- a/source/locale-extra/jdictionary-smarten-es/FrugalBuild +++ b/source/locale-extra/jdictionary-smarten-es/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=jdictionary-smarten-es pkgver=1.0 diff --git a/source/locale-extra/jdictionary-smarten-hu/FrugalBuild b/source/locale-extra/jdictionary-smarten-hu/FrugalBuild index e0c468e..7254b59 100644 --- a/source/locale-extra/jdictionary-smarten-hu/FrugalBuild +++ b/source/locale-extra/jdictionary-smarten-hu/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=jdictionary-smarten-hu pkgver=1.4 diff --git a/source/locale-extra/jdictionary-smarten-sr/FrugalBuild b/source/locale-extra/jdictionary-smarten-sr/FrugalBuild index 0cbffb0..54ba682 100644 --- a/source/locale-extra/jdictionary-smarten-sr/FrugalBuild +++ b/source/locale-extra/jdictionary-smarten-sr/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=jdictionary-smarten-sr pkgver=1.0 diff --git a/source/locale-extra/jdictionary-smartexpren-hu/FrugalBuild b/source/locale-extra/jdictionary-smartexpren-hu/FrugalBuild index a062cf9..ce33cce 100644 --- a/source/locale-extra/jdictionary-smartexpren-hu/FrugalBuild +++ b/source/locale-extra/jdictionary-smartexpren-hu/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=jdictionary-smartexpren-hu pkgver=1.4 diff --git a/source/locale-extra/jdictionary-smartfr-hu/FrugalBuild b/source/locale-extra/jdictionary-smartfr-hu/FrugalBuild index afcaa22..bc5c76f 100644 --- a/source/locale-extra/jdictionary-smartfr-hu/FrugalBuild +++ b/source/locale-extra/jdictionary-smartfr-hu/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=jdictionary-smartfr-hu pkgver=1.0 diff --git a/source/locale-extra/jdictionary-smartia-en/FrugalBuild b/source/locale-extra/jdictionary-smartia-en/FrugalBuild index 510e28b..98c0368 100644 --- a/source/locale-extra/jdictionary-smartia-en/FrugalBuild +++ b/source/locale-extra/jdictionary-smartia-en/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=jdictionary-smartia-en pkgver=1.0 diff --git a/source/locale-extra/jdictionary-smartia-sv/FrugalBuild b/source/locale-extra/jdictionary-smartia-sv/FrugalBuild index f3f4a8b..094944d 100644 --- a/source/locale-extra/jdictionary-smartia-sv/FrugalBuild +++ b/source/locale-extra/jdictionary-smartia-sv/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=jdictionary-smartia-sv pkgver=1.0 diff --git a/source/locale-extra/jdictionary-smartlex-en/FrugalBuild b/source/locale-extra/jdictionary-smartlex-en/FrugalBuild index 96e811e..0e12f55 100644 --- a/source/locale-extra/jdictionary-smartlex-en/FrugalBuild +++ b/source/locale-extra/jdictionary-smartlex-en/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=jdictionary-smartlex-en pkgver=1.0 diff --git a/source/locale-extra/xqed-hu/FrugalBuild b/source/locale-extra/xqed-hu/FrugalBuild index d76f71e..d756215 100644 --- a/source/locale-extra/xqed-hu/FrugalBuild +++ b/source/locale-extra/xqed-hu/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=xqed-hu origname=xqed diff --git a/source/multimedia-extra/gspcav1/FrugalBuild b/source/multimedia-extra/gspcav1/FrugalBuild index 63fe341..4c255aa 100644 --- a/source/multimedia-extra/gspcav1/FrugalBuild +++ b/source/multimedia-extra/gspcav1/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.04 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=gspcav1 pkgver=1.00.20 diff --git a/source/multimedia-extra/vamps/FrugalBuild b/source/multimedia-extra/vamps/FrugalBuild index f26c4ee..1a4f300 100644 --- a/source/multimedia-extra/vamps/FrugalBuild +++ b/source/multimedia-extra/vamps/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.02 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=vamps pkgver=0.99.2 diff --git a/source/multimedia/xvidcore/FrugalBuild b/source/multimedia/xvidcore/FrugalBuild index 5f9d5ac..5e4ba52 100644 --- a/source/multimedia/xvidcore/FrugalBuild +++ b/source/multimedia/xvidcore/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=xvidcore pkgver=1.1.3 diff --git a/source/network-extra/abook/FrugalBuild b/source/network-extra/abook/FrugalBuild index ca7ed2e..4703982 100644 --- a/source/network-extra/abook/FrugalBuild +++ b/source/network-extra/abook/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.04 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=abook pkgver=0.5.6 diff --git a/source/network-extra/atl2/FrugalBuild b/source/network-extra/atl2/FrugalBuild index 962eded..f342b10 100644 --- a/source/network-extra/atl2/FrugalBuild +++ b/source/network-extra/atl2/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=atl2 pkgver=2.0.4 diff --git a/source/network-extra/courier-imap/FrugalBuild b/source/network-extra/courier-imap/FrugalBuild index f9ab841..6c24be0 100644 --- a/source/network-extra/courier-imap/FrugalBuild +++ b/source/network-extra/courier-imap/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 1.00 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs # Contributor: Karoly CZOVEK pkgname=courier-imap diff --git a/source/network-extra/iwlwifi-3945-ucode/FrugalBuild b/source/network-extra/iwlwifi-3945-ucode/FrugalBuild index dd6a074..46faf65 100644 --- a/source/network-extra/iwlwifi-3945-ucode/FrugalBuild +++ b/source/network-extra/iwlwifi-3945-ucode/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=iwlwifi-3945-ucode pkgver=2.14.1.5 diff --git a/source/network-extra/iwlwifi-4965-ucode/FrugalBuild b/source/network-extra/iwlwifi-4965-ucode/FrugalBuild index 2bff3b6..bb245a0 100644 --- a/source/network-extra/iwlwifi-4965-ucode/FrugalBuild +++ b/source/network-extra/iwlwifi-4965-ucode/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=iwlwifi-4965-ucode pkgver=4.44.1.20 diff --git a/source/network-extra/mutt-devel/FrugalBuild b/source/network-extra/mutt-devel/FrugalBuild index 50c82a1..c7cdf20 100644 --- a/source/network-extra/mutt-devel/FrugalBuild +++ b/source/network-extra/mutt-devel/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 1.91 SBU -# Contributor: Janny +# Contributor: Janos Kovacs # Maintainer: voroskoi pkgname=mutt-devel diff --git a/source/network-extra/mutt-ng/FrugalBuild b/source/network-extra/mutt-ng/FrugalBuild index d48bc40..08f6c7b 100644 --- a/source/network-extra/mutt-ng/FrugalBuild +++ b/source/network-extra/mutt-ng/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.39 SBU -# Contributor: Janny +# Contributor: Janos Kovacs # Maintainer: voroskoi pkgname=mutt-ng diff --git a/source/network-extra/squirrelmail/FrugalBuild b/source/network-extra/squirrelmail/FrugalBuild index e9eff4b..dd0b8eb 100644 --- a/source/network-extra/squirrelmail/FrugalBuild +++ b/source/network-extra/squirrelmail/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs # Contributor: Kapolnasi Tamas pkgname=squirrelmail diff --git a/source/network-extra/sugarcrm/FrugalBuild b/source/network-extra/sugarcrm/FrugalBuild index 784b902..c9acc5e 100644 --- a/source/network-extra/sugarcrm/FrugalBuild +++ b/source/network-extra/sugarcrm/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.02 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=sugarcrm origname=SugarOS diff --git a/source/network-extra/xcache/FrugalBuild b/source/network-extra/xcache/FrugalBuild index 8bcdf0a..afccba0 100644 --- a/source/network-extra/xcache/FrugalBuild +++ b/source/network-extra/xcache/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.06 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=xcache pkgver=1.2.2 diff --git a/source/network-extra/zd1211-firmware/FrugalBuild b/source/network-extra/zd1211-firmware/FrugalBuild index 3d1c448..b102a7f 100644 --- a/source/network-extra/zd1211-firmware/FrugalBuild +++ b/source/network-extra/zd1211-firmware/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=zd1211-firmware pkgver=1.1 diff --git a/source/network/fetchmail/FrugalBuild b/source/network/fetchmail/FrugalBuild index 795f3af..d5f1f58 100644 --- a/source/network/fetchmail/FrugalBuild +++ b/source/network/fetchmail/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.10 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=fetchmail pkgver=6.3.8 diff --git a/source/xapps-extra/clamtk/FrugalBuild b/source/xapps-extra/clamtk/FrugalBuild index 2e9e5fb..8654715 100644 --- a/source/xapps-extra/clamtk/FrugalBuild +++ b/source/xapps-extra/clamtk/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=clamtk pkgver=3.09 diff --git a/source/xapps-extra/fwbuilder/FrugalBuild b/source/xapps-extra/fwbuilder/FrugalBuild index 27ebc2a..f116f81 100644 --- a/source/xapps-extra/fwbuilder/FrugalBuild +++ b/source/xapps-extra/fwbuilder/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.06 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs # Contributor: AlexExtreme pkgname=fwbuilder diff --git a/source/xapps-extra/gadmin-proftpd/FrugalBuild b/source/xapps-extra/gadmin-proftpd/FrugalBuild index 3d6562f..711eec0 100644 --- a/source/xapps-extra/gadmin-proftpd/FrugalBuild +++ b/source/xapps-extra/gadmin-proftpd/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.03 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=gadmin-proftpd pkgver=0.2.8 diff --git a/source/xapps-extra/gadmin-samba/FrugalBuild b/source/xapps-extra/gadmin-samba/FrugalBuild index 85ab9d6..975a55e 100644 --- a/source/xapps-extra/gadmin-samba/FrugalBuild +++ b/source/xapps-extra/gadmin-samba/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.24 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=gadmin-samba pkgver=0.2.7 diff --git a/source/xapps-extra/gpsim/FrugalBuild b/source/xapps-extra/gpsim/FrugalBuild index 6c529d1..24c7bc3 100644 --- a/source/xapps-extra/gpsim/FrugalBuild +++ b/source/xapps-extra/gpsim/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: ~1.80 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=gpsim pkgver=0.22.0 diff --git a/source/xapps-extra/grass/FrugalBuild b/source/xapps-extra/grass/FrugalBuild index 3e6d9f9..7e61d2a 100644 --- a/source/xapps-extra/grass/FrugalBuild +++ b/source/xapps-extra/grass/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 1.91 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=grass pkgver=6.3.0 diff --git a/source/xapps-extra/habak/FrugalBuild b/source/xapps-extra/habak/FrugalBuild index c26589b..a45a79b 100644 --- a/source/xapps-extra/habak/FrugalBuild +++ b/source/xapps-extra/habak/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=habak pkgver=0.2.5 diff --git a/source/xapps-extra/infobox/FrugalBuild b/source/xapps-extra/infobox/FrugalBuild index 018bc08..5fedf5b 100644 --- a/source/xapps-extra/infobox/FrugalBuild +++ b/source/xapps-extra/infobox/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=infobox origname=InfoBox diff --git a/source/xapps-extra/jdictionary/FrugalBuild b/source/xapps-extra/jdictionary/FrugalBuild index 28b2080..344fe5b 100644 --- a/source/xapps-extra/jdictionary/FrugalBuild +++ b/source/xapps-extra/jdictionary/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=jdictionary pkgver=1.8 diff --git a/source/xapps-extra/mysql-administrator/FrugalBuild b/source/xapps-extra/mysql-administrator/FrugalBuild index 9944e1b..7579246 100644 --- a/source/xapps-extra/mysql-administrator/FrugalBuild +++ b/source/xapps-extra/mysql-administrator/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 2.23 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=mysql-administrator pkgver=1.2 diff --git a/source/xapps-extra/openclipart/FrugalBuild b/source/xapps-extra/openclipart/FrugalBuild index 83eee3f..9a389f5 100644 --- a/source/xapps-extra/openclipart/FrugalBuild +++ b/source/xapps-extra/openclipart/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.86 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=openclipart pkgver=0.18 diff --git a/source/xapps-extra/qemu-launcher/FrugalBuild b/source/xapps-extra/qemu-launcher/FrugalBuild index d5fb4dc..e9183ea 100644 --- a/source/xapps-extra/qemu-launcher/FrugalBuild +++ b/source/xapps-extra/qemu-launcher/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=qemu-launcher pkgver=1.7.4 diff --git a/source/xapps-extra/qtparted/FrugalBuild b/source/xapps-extra/qtparted/FrugalBuild index 4c34596..5065592 100644 --- a/source/xapps-extra/qtparted/FrugalBuild +++ b/source/xapps-extra/qtparted/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.49 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=qtparted pkgver=0.4.5 diff --git a/source/xapps-extra/skype/FrugalBuild b/source/xapps-extra/skype/FrugalBuild index ea0bd52..2c01a33 100644 --- a/source/xapps-extra/skype/FrugalBuild +++ b/source/xapps-extra/skype/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.02 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=skype pkgver=2.0.0.68 diff --git a/source/xapps-extra/stellarium/FrugalBuild b/source/xapps-extra/stellarium/FrugalBuild index ad94e02..999bb4f 100644 --- a/source/xapps-extra/stellarium/FrugalBuild +++ b/source/xapps-extra/stellarium/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.83 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs # Contributor: Mcklaren pkgname=stellarium diff --git a/source/xapps-extra/tightvnc/FrugalBuild b/source/xapps-extra/tightvnc/FrugalBuild index ba9ad85..8f95634 100644 --- a/source/xapps-extra/tightvnc/FrugalBuild +++ b/source/xapps-extra/tightvnc/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.62 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=tightvnc pkgver=1.3.9 diff --git a/source/xapps-extra/tovid/FrugalBuild b/source/xapps-extra/tovid/FrugalBuild index 2cda230..4c25166 100644 --- a/source/xapps-extra/tovid/FrugalBuild +++ b/source/xapps-extra/tovid/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.02 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs # Contributor: TranzeManiaC pkgname=tovid diff --git a/source/xapps-extra/transcode/FrugalBuild b/source/xapps-extra/transcode/FrugalBuild index 4bb22e2..f103bca 100644 --- a/source/xapps-extra/transcode/FrugalBuild +++ b/source/xapps-extra/transcode/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 1.16 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=transcode pkgver=1.0.5 diff --git a/source/xapps-extra/usbview/FrugalBuild b/source/xapps-extra/usbview/FrugalBuild index 399d02d..5b3bfe1 100644 --- a/source/xapps-extra/usbview/FrugalBuild +++ b/source/xapps-extra/usbview/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs # Contributor: Christian Hamar alias krix pkgname=usbview diff --git a/source/xapps-extra/vnc/FrugalBuild b/source/xapps-extra/vnc/FrugalBuild index 598db8e..375fc15 100644 --- a/source/xapps-extra/vnc/FrugalBuild +++ b/source/xapps-extra/vnc/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=vnc pkgver=4.1.1 diff --git a/source/xapps-extra/x11vnc/FrugalBuild b/source/xapps-extra/x11vnc/FrugalBuild index f697d56..c1786ea 100644 --- a/source/xapps-extra/x11vnc/FrugalBuild +++ b/source/xapps-extra/x11vnc/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.42 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=x11vnc pkgver=0.9.3 diff --git a/source/xapps-extra/xaralx/FrugalBuild b/source/xapps-extra/xaralx/FrugalBuild index e648c3b..af099ff 100644 --- a/source/xapps-extra/xaralx/FrugalBuild +++ b/source/xapps-extra/xaralx/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 7.08 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs # Contributor: jedifox pkgname=xaralx diff --git a/source/xapps-extra/xawtv/FrugalBuild b/source/xapps-extra/xawtv/FrugalBuild index a772687..c4d6962 100644 --- a/source/xapps-extra/xawtv/FrugalBuild +++ b/source/xapps-extra/xawtv/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.08 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=xawtv pkgver=3.95 diff --git a/source/xapps-extra/xrestop/FrugalBuild b/source/xapps-extra/xrestop/FrugalBuild index 08ea84e..880a6e7 100644 --- a/source/xapps-extra/xrestop/FrugalBuild +++ b/source/xapps-extra/xrestop/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.02 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=xrestop pkgver=0.4 diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild index 25ac716..a1af6dc 100644 --- a/source/xapps/firefox/FrugalBuild +++ b/source/xapps/firefox/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 18.33 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs # Contributor: VMiklos pkgname=firefox diff --git a/source/xapps/gimp/FrugalBuild b/source/xapps/gimp/FrugalBuild index 5664cf5..74d8e25 100644 --- a/source/xapps/gimp/FrugalBuild +++ b/source/xapps/gimp/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 7.08 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs # Contributor: VMiklos pkgname=gimp diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild index 76caa8c..d4ad7c3 100644 --- a/source/xapps/openoffice.org/FrugalBuild +++ b/source/xapps/openoffice.org/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 262.13 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs # Contributor: Laszlo Dvornik pkgname=openoffice.org diff --git a/source/xlib-extra/fvwm-crystal/FrugalBuild b/source/xlib-extra/fvwm-crystal/FrugalBuild index 5c83014..df3ca4a 100644 --- a/source/xlib-extra/fvwm-crystal/FrugalBuild +++ b/source/xlib-extra/fvwm-crystal/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=fvwm-crystal pkgver=3.0.2 diff --git a/source/xlib-extra/fvwm-devel/FrugalBuild b/source/xlib-extra/fvwm-devel/FrugalBuild index bf217ee..ddc91fe 100644 --- a/source/xlib-extra/fvwm-devel/FrugalBuild +++ b/source/xlib-extra/fvwm-devel/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 1.36 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs # Contributor: VMiklos pkgname=fvwm-devel diff --git a/source/xlib-extra/gtk+extra/FrugalBuild b/source/xlib-extra/gtk+extra/FrugalBuild index de93f32..2a29c71 100644 --- a/source/xlib-extra/gtk+extra/FrugalBuild +++ b/source/xlib-extra/gtk+extra/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: ~0.83 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=gtk+extra pkgver=2.1.1 diff --git a/source/xlib-extra/libfwbuilder/FrugalBuild b/source/xlib-extra/libfwbuilder/FrugalBuild index c3fac62..03cf296 100644 --- a/source/xlib-extra/libfwbuilder/FrugalBuild +++ b/source/xlib-extra/libfwbuilder/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.48 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs # Contributor: AlexExtreme pkgname=libfwbuilder diff --git a/source/xmultimedia-extra/devede/FrugalBuild b/source/xmultimedia-extra/devede/FrugalBuild index d752c74..27f7e8c 100644 --- a/source/xmultimedia-extra/devede/FrugalBuild +++ b/source/xmultimedia-extra/devede/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.01 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=devede pkgver=3.8c diff --git a/source/xmultimedia/nas/FrugalBuild b/source/xmultimedia/nas/FrugalBuild index ec274c8..b065d93 100644 --- a/source/xmultimedia/nas/FrugalBuild +++ b/source/xmultimedia/nas/FrugalBuild @@ -1,5 +1,5 @@ # Compiling time: 0.29 SBU -# Maintainer: Janny +# Maintainer: Janos Kovacs pkgname=nas pkgver=1.9 From crazy at frugalware.org Tue Jun 10 10:27:07 2008 From: crazy at frugalware.org (crazy) Date: Tue Jun 10 10:27:09 2008 Subject: [Frugalware-git] frugalware-current: poppler-0.8.3-1-x86_64 Message-ID: <20080610082707.B63291770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9dc8ea37e78d7d93ba5f39ffdda1f1ab14cf0a25 commit 9dc8ea37e78d7d93ba5f39ffdda1f1ab14cf0a25 Author: crazy Date: Tue Jun 10 10:25:11 2008 +0200 poppler-0.8.3-1-x86_64 * Version bump diff --git a/source/xlib/poppler/FrugalBuild b/source/xlib/poppler/FrugalBuild index cc3538b..956a2e1 100644 --- a/source/xlib/poppler/FrugalBuild +++ b/source/xlib/poppler/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=poppler -pkgver=0.8.2 +pkgver=0.8.3 pkgrel=1 pkgdesc="A PDF rendering library" url="http://poppler.freedesktop.org/" @@ -46,6 +46,6 @@ build() { Frm usr/share/man } -sha1sums=('afa4baa4e0b65c9663cddae7b0b3da8efb1c9263' \ +sha1sums=('763d18d9f0e625a936b3a3fbbcd00b58ddd2f84f' \ 'a048348d9a8c6d545714350d3ab66dc7028e4b7f') # optimization OK From crazy at frugalware.org Tue Jun 10 10:30:54 2008 From: crazy at frugalware.org (crazy) Date: Tue Jun 10 10:30:55 2008 Subject: [Frugalware-git] frugalware-current: eric4-4.1.5-1-x86_64 Message-ID: <20080610083054.81C831770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6c966b830dbe0eae07c84da42c832a83ca5b1ebc commit 6c966b830dbe0eae07c84da42c832a83ca5b1ebc Author: crazy Date: Tue Jun 10 10:28:31 2008 +0200 eric4-4.1.5-1-x86_64 * Version bump diff --git a/source/xapps-extra/eric4/FrugalBuild b/source/xapps-extra/eric4/FrugalBuild index 6b24404..92b012f 100644 --- a/source/xapps-extra/eric4/FrugalBuild +++ b/source/xapps-extra/eric4/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=eric4 -pkgver=4.1.4 +pkgver=4.1.5 pkgrel=1 pkgdesc="Eric4 is a full featured Python (and Ruby) IDE that is written in PyQt4." _F_sourceforge_dirname="eric-ide" @@ -15,11 +15,11 @@ source=($source \ ${source/eric4-$pkgver/eric4-i18n-ru-$pkgver} \ ${source/eric4-$pkgver/eric4-i18n-cs-$pkgver} $pkgname.desktop) -sha1sums=('1b925b8d90e0120a806f2eca65732471e329a855' \ - 'a6ea86f6a21d46e4ad9017f4920d514a855b0634' \ - '3a271c963351ec1d1aa3f21aea996c58327be149' \ - '81f4e6ccf9d7b96a61233a91d0d78ff4d4c3054e' \ - '28d4241ae861ccd5388512941f96259ebff1702b' \ +sha1sums=('729076badb1b2efb975fcca79ec696359974ebac' \ + 'cd6083968607a05fa917e4243a30987193094fd0' \ + '9ddcbdbf0ee1276dd89e5138de84c29be9fac22a' \ + '0a76c59ddeedb6eddf4133ebfb3d2d1ddb41b040' \ + '48fd71f352f18e9e862096c0256b038150691125' \ 'bdc6b72e48c1cab4bf779ed72a61b42cc1f997e5') groups=('xapps-extra') archs=('i686' 'x86_64') From crazy at frugalware.org Tue Jun 10 10:31:58 2008 From: crazy at frugalware.org (crazy) Date: Tue Jun 10 10:31:59 2008 Subject: [Frugalware-git] frugalware-current: perl-yaml-syck-1.05-1-x86_64 Message-ID: <20080610083158.AFD041770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a5e1ee50c47785a6b9827f1177be89a4b7329528 commit a5e1ee50c47785a6b9827f1177be89a4b7329528 Author: crazy Date: Tue Jun 10 10:31:15 2008 +0200 perl-yaml-syck-1.05-1-x86_64 * Version bump diff --git a/source/devel-extra/perl-yaml-syck/FrugalBuild b/source/devel-extra/perl-yaml-syck/FrugalBuild index 89af90d..63d08b7 100644 --- a/source/devel-extra/perl-yaml-syck/FrugalBuild +++ b/source/devel-extra/perl-yaml-syck/FrugalBuild @@ -3,10 +3,10 @@ _F_perl_name=YAML-Syck _F_perl_author=A/AU/AUDREYT -pkgver=1.04 +pkgver=1.05 pkgdesc="Fast, lightweight YAML loader and dumper" Finclude perl archs=('i686' 'x86_64') -sha1sums=('8e62acf801e029222c671e474a1f55f13ec71152') +sha1sums=('566f58683e6d64e4b920fee113c84916361a186d') # optimization OK From crazy at frugalware.org Tue Jun 10 11:30:41 2008 From: crazy at frugalware.org (crazy) Date: Tue Jun 10 11:30:46 2008 Subject: [Frugalware-git] frugalware-current: mtpaint-3.21-1-x86_64 Message-ID: <20080610093041.790801770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7c371e788c8b67f6ec9f99321147eb5d2a2a5f3f commit 7c371e788c8b67f6ec9f99321147eb5d2a2a5f3f Author: crazy Date: Tue Jun 10 11:29:46 2008 +0200 mtpaint-3.21-1-x86_64 * Version bump * added x86_64 to archs * fixed depends , cflag , man , intl ( we may want the po files installed he ? ) * remove all custom stuff nothing from there was needed at all * well kind rewrote the whole FB , sometimes I really have to wonder.. diff --git a/source/xapps-extra/mtpaint/FrugalBuild b/source/xapps-extra/mtpaint/FrugalBuild index 3e49115..1316fef 100644 --- a/source/xapps-extra/mtpaint/FrugalBuild +++ b/source/xapps-extra/mtpaint/FrugalBuild @@ -3,32 +3,24 @@ # Contributor: devil505 pkgname=mtpaint -pkgver=3.20 +pkgver=3.21 pkgrel=1 pkgdesc="mtPaint is a simple GTK2 painting program designed for creating icons and pixel based artwork." _F_sourceforge_ext=".tar.bz2" -_F_sourceforge_dirname="$pkgname" +_F_sourceforge_broken_up2date=1 Finclude sourceforge -depends=('gtk+2' 'libungif' 'libpng') +depends=('libungif' 'freetype2' 'gtk+2' 'glibc' 'libxau' 'libxdmcp' 'libice' 'libxdamage' 'libxext' 'libxml2' 'libpng') groups=('xapps-extra') -archs=('i686') -_F_desktop_desc="A simple GTK+2 painting program" -_F_desktop_icon="mtpaint.xpm" -_F_desktop_categories="Graphics;GTK;" -Fconfopts="${Fconfopts[@]} --cpu=`uname -m`" -sha1sums=('74f0e5f1e9b42a5bfec4dd7579acebf010f558bd') +options=('scriptlet') +archs=('i686' 'x86_64') +sha1sums=('b10b8f857275c0c24780991a78aaf2278163e145') build() { - Fconf - Fmake - Fexerel src/$pkgname /usr/bin/$pkgname - Fmkdir /usr/share/pixmaps - Ficonrel src/icons1/icon.xpm - Fmv /usr/share/pixmaps/icon.xpm /usr/share/pixmaps/$pkgname.xpm - cd doc - cp _mtpaint.1 mtpaint.1 - Fmanrel mtpaint.1 - Fdesktop2 + Fmake cflags intl man --mandir=/usr/share/man/man1 + make MT_PREFIX=$Fdestdir/usr MT_LANG_DEST=$Fdestdir/usr/share/locale \ + MT_MAN_DEST=$Fdestdir/usr/share/man/man1 BIN_INSTALL=$Fdestdir/usr/bin install || Fdie } + +# optimization OK From crazy at frugalware.org Tue Jun 10 11:59:16 2008 From: crazy at frugalware.org (crazy) Date: Tue Jun 10 11:59:18 2008 Subject: [Frugalware-git] frugalware-current: asterisk-addons-1.4.7-1-x86_64 Message-ID: <20080610095916.B31AF1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e6a5fef6f6205d6757f0e8d8e2d5308b23e7763e commit e6a5fef6f6205d6757f0e8d8e2d5308b23e7763e Author: crazy Date: Tue Jun 10 11:58:24 2008 +0200 asterisk-addons-1.4.7-1-x86_64 * Version bump * closes FS#3136 in -current diff --git a/source/apps-extra/asterisk-addons/FrugalBuild b/source/apps-extra/asterisk-addons/FrugalBuild index 03415cd..9638db3 100644 --- a/source/apps-extra/asterisk-addons/FrugalBuild +++ b/source/apps-extra/asterisk-addons/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Balint Kovacs pkgname=asterisk-addons -pkgver=1.4.6 +pkgver=1.4.7 pkgrel=1 pkgdesc="Open Source Private Branch Exchange (PBX) - Addons" url="http://www.asterisk.org/" @@ -13,17 +13,13 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/downloads | grep -m1 Addons | sed 's/.*s \(.*\).*/\1/'" source=(http://ftp.digium.com/pub/asterisk/$pkgname-$pkgver.tar.gz) -sha1sums=('0d8176b1aab5dba70e97e706e0a6d35037689a39') +sha1sums=('69dc187d4e1a13b96890dec38c719b6dacec10ef') build() { Fcd Fmkdir usr/lib/asterisk/modules Fbuild - cd asterisk-ooh323c - Fmessage "Configuring asterisk-ooh323c..." - Fmake - Fmakeinstall Fdoc $pkgname-$pkgver/configs/cdr_mysql.conf.sample Fdoc $pkgname-$pkgver/configs/res_mysql.conf.sample } From crazy at frugalware.org Tue Jun 10 12:02:06 2008 From: crazy at frugalware.org (crazy) Date: Tue Jun 10 12:02:07 2008 Subject: [Frugalware-git] frugalware-current: python-eyed3-0.6.16-1-x86_64 Message-ID: <20080610100206.69B151770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3d194f2ee7398ae247be2d66e07f0650e1cde118 commit 3d194f2ee7398ae247be2d66e07f0650e1cde118 Author: crazy Date: Tue Jun 10 12:01:22 2008 +0200 python-eyed3-0.6.16-1-x86_64 * Version bump diff --git a/source/devel-extra/python-eyed3/FrugalBuild b/source/devel-extra/python-eyed3/FrugalBuild index 46f23ce..d2b6cd4 100644 --- a/source/devel-extra/python-eyed3/FrugalBuild +++ b/source/devel-extra/python-eyed3/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Mcklaren pkgname=python-eyed3 -pkgver=0.6.15 +pkgver=0.6.16 pkgrel=1 pkgdesc="A Python module and program for processing information about mp3 files." url="http://eyed3.nicfit.net/" @@ -13,5 +13,5 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://eyed3.nicfit.net/ | grep 'stable' | sed -e 's/.*is \(.*\)/\1/' -e 's|. .*||g'" source=("http://eyed3.nicfit.net/releases/eyeD3-$pkgver.tar.gz") _F_cd_path="eyeD3-$pkgver" -sha1sums=('c79b3f8c39b500e0046775cf08306787a581c34b') +sha1sums=('d6644a6c2054359209cf3159bb7d79e82758a9e1') From vmiklos at frugalware.org Tue Jun 10 13:08:36 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 10 13:08:38 2008 Subject: [Frugalware-git] homepage-ng: FSA465-net-snmp Message-ID: <20080610110836.8F2FF1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=8b6c01cbdc0a47ea6668e53f0f0e3724ae269a1d commit 8b6c01cbdc0a47ea6668e53f0f0e3724ae269a1d Author: Miklos Vajna Date: Tue Jun 10 13:07:58 2008 +0200 FSA465-net-snmp diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index f0622f6..c238862 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,17 @@ + 465 + 2008-06-10 + net-snmp + 5.4.1-3 + 5.4.1-4kalgan1 + http://bugs.frugalware.org/task/3092 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2292 + A vulnerability has been reported in Net-snmp, which potentially can be exploited by malicious people to compromise a vulnerable system. + The vulnerability is caused due to a boundary error within the "__snprint_value()" function in perl/SNMP/SNMP.xs. This can be exploited to cause a buffer overflow in an application using the Net-snmp Perl module by tricking the user into connecting to a malicious SNMP agent. + + 464 2008-06-06 horde-webmail From vmiklos at frugalware.org Tue Jun 10 13:11:48 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 10 13:11:49 2008 Subject: [Frugalware-git] frugalware-current: net-snmp-5.4.1-5-i686 Message-ID: <20080610111148.C88521770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=25fab576310e3b8bee75cb925fc473dbefae51c8 commit 25fab576310e3b8bee75cb925fc473dbefae51c8 Author: Miklos Vajna Date: Tue Jun 10 13:10:53 2008 +0200 net-snmp-5.4.1-5-i686 - add CVE-2008-0960.patch - closes #3142 diff --git a/source/network-extra/net-snmp/CVE-2008-0960.patch b/source/network-extra/net-snmp/CVE-2008-0960.patch new file mode 100644 index 0000000..a3534f5 --- /dev/null +++ b/source/network-extra/net-snmp/CVE-2008-0960.patch @@ -0,0 +1,17 @@ +CVE-2008-0960 net-snmp SNMPv3 authentication bypass (VU#877044) + +Source: upstream, https://sourceforge.net/tracker/index.php?func=detail&aid=1989089&group_id=12694&atid=456380 + +diff -up net-snmp-5.0.9/snmplib/scapi.c.orig net-snmp-5.0.9/snmplib/scapi.c +--- net-snmp-5.0.9/snmplib/scapi.c.orig 2008-06-04 10:19:26.000000000 +0200 ++++ net-snmp-5.0.9/snmplib/scapi.c 2008-06-04 10:20:45.000000000 +0200 +@@ -460,6 +460,9 @@ sc_check_keyed_hash(const oid * authtype + QUITFUN(SNMPERR_GENERR, sc_check_keyed_hash_quit); + } + ++ if (maclen != USM_MD5_AND_SHA_AUTH_LEN) { ++ QUITFUN(SNMPERR_GENERR, sc_check_keyed_hash_quit); ++ } + + /* + * Generate a full hash of the message, then compare diff --git a/source/network-extra/net-snmp/FrugalBuild b/source/network-extra/net-snmp/FrugalBuild index c54bbf7..6be264a 100644 --- a/source/network-extra/net-snmp/FrugalBuild +++ b/source/network-extra/net-snmp/FrugalBuild @@ -4,7 +4,7 @@ pkgname=net-snmp pkgver=5.4.1 -pkgrel=4 +pkgrel=5 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" depends=('openssl' 'perl>=5.10.0') groups=('network-extra') @@ -12,9 +12,10 @@ archs=('i686' 'x86_64') Finclude sourceforge url="http://www.net-snmp.org/" up2date="lynx -dump http://www.net-snmp.org/download.html |grep Supported -A 2 |sed -ne 's/.*\([0-9].[0-9].[0-9]\).*/\1/;$ p'" -source=(${source[@]} CVE-2008-2292.patch rc.snmpd) +source=(${source[@]} CVE-2008-2292.patch CVE-2008-0960.patch rc.snmpd) sha1sums=('ac5ba033c10d53d3057415121f8c4936c643c208' \ '7f7f770fcebdeb8bb19515937895c9c545cc0609' \ + 'bfb79ccb4db8b524655a78739bbf0e5255c1f14a' \ 'df7a817499d12c53e9d2809f68c24fea9d3307b0') build() { From vmiklos at frugalware.org Tue Jun 10 13:11:48 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 10 13:11:50 2008 Subject: [Frugalware-git] frugalware-current: net-snmp-5.4.1-5-i686 Message-ID: <20080610111148.DEEDB1778001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b47aebc6baa4d5f07c961edb3ef50238291a6b27 commit b47aebc6baa4d5f07c961edb3ef50238291a6b27 Author: Miklos Vajna Date: Tue Jun 10 13:11:29 2008 +0200 net-snmp-5.4.1-5-i686 - up2date fix diff --git a/source/network-extra/net-snmp/FrugalBuild b/source/network-extra/net-snmp/FrugalBuild index 6be264a..7cab0f8 100644 --- a/source/network-extra/net-snmp/FrugalBuild +++ b/source/network-extra/net-snmp/FrugalBuild @@ -11,7 +11,7 @@ groups=('network-extra') archs=('i686' 'x86_64') Finclude sourceforge url="http://www.net-snmp.org/" -up2date="lynx -dump http://www.net-snmp.org/download.html |grep Supported -A 2 |sed -ne 's/.*\([0-9].[0-9].[0-9]\).*/\1/;$ p'" +up2date="lynx -dump http://www.net-snmp.org/download.html |grep Supported -A 2 |sed -ne 's/.* \([0-9.]\+\) .*/\1/;$ p'" source=(${source[@]} CVE-2008-2292.patch CVE-2008-0960.patch rc.snmpd) sha1sums=('ac5ba033c10d53d3057415121f8c4936c643c208' \ '7f7f770fcebdeb8bb19515937895c9c545cc0609' \ From vmiklos at frugalware.org Tue Jun 10 13:29:15 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 10 13:29:17 2008 Subject: [Frugalware-git] frugalware-current: squid-3.0.STABLE6-1-i686 Message-ID: <20080610112915.65E861770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3953c7973d3c6758b2c68542d08c2ca7174a88d5 commit 3953c7973d3c6758b2c68542d08c2ca7174a88d5 Author: Miklos Vajna Date: Tue Jun 10 13:28:57 2008 +0200 squid-3.0.STABLE6-1-i686 - version bump - drop patches which were for 2.6.x diff --git a/source/network-extra/squid/FrugalBuild b/source/network-extra/squid/FrugalBuild index dc394e7..271b95e 100644 --- a/source/network-extra/squid/FrugalBuild +++ b/source/network-extra/squid/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=squid -pkgver=2.6.STABLE20 +pkgver=3.0.STABLE6 pkgrel=1 pkgdesc="Squid Web Proxy Cache" url="http://www.squid-cache.org/" @@ -11,21 +11,16 @@ rodepends=('dcron') groups=('network-extra') archs=('i686' 'x86_64') backup=(etc/squid/{mime,msntauth,squid}.conf) -up2date="lynx -dump $url/Versions/v2/2.6/|grep -1 Current|sed -n 's/.*-\([^ ]*\) .*/\1/;$ p'" -source=(http://www.squid-cache.org/Versions/v2/2.6/$pkgname-$pkgver.tar.bz2 \ - $pkgname-2.6.STABLE3-dirs.diff $pkgname-2.6.STABLE3-samba.diff \ - $pkgname-2.6.STABLE3-username.diff rc.squid squid) -sha1sums=('a58fd838ff14345f10f2f3f2d1839eb70bb6f394' \ - 'a1482482406661090951fa4c4304ca6604db2d14' \ - '8eacf8bd974c461162aaba72b5bc4109cc1104c7' \ - '7dbae27eeee7b62e685f6758a06d984b0b62668e' \ +up2date="lynx -dump http://www.squid-cache.org/Versions/|grep Stable -A 3|sed -n 's/.*\]\([0-9.]*\) .*STABLE\([0-9]*\) .*/\1.STABLE\2/;$ p'" +source=(http://www.squid-cache.org/Versions/v3/3.0/$pkgname-$pkgver.tar.bz2 \ + rc.squid squid) +sha1sums=('7cebed35c69ed233a5338586cd9a6f547a41d4d0' \ '3a8ce41ac3e6b48d0340a5577093a345cfae9242' \ '53042dd86e482d4a6eff9e34ecb01352439c5026') build() { Fpatchall - autoconf || return 1 Fmake --datadir=/usr/share/squid --sysconfdir=/etc/squid \ --libexecdir=/usr/lib/squid --localstatedir=/var \ --enable-auth="basic,digest,ntlm" \ diff --git a/source/network-extra/squid/squid-2.6.STABLE3-dirs.diff b/source/network-extra/squid/squid-2.6.STABLE3-dirs.diff deleted file mode 100644 index 4b12943..0000000 --- a/source/network-extra/squid/squid-2.6.STABLE3-dirs.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff -ru squid-2.5.STABLE9/src/Makefile.in squid-2.5.STABLE9.arch/src/Makefile.in ---- squid-2.5.STABLE9/src/Makefile.in 2004-09-25 17:37:59.000000000 -0400 -+++ squid-2.5.STABLE9.arch/src/Makefile.in 2005-04-15 06:08:13.000000000 -0400 -@@ -376,12 +376,12 @@ - DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf - DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf - DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` --DEFAULT_LOG_PREFIX = $(localstatedir)/logs -+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid - DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log - DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log - DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log --DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid --DEFAULT_SWAP_DIR = $(localstatedir)/cache -+DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/run/squid.pid -+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid - DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'` diff --git a/source/network-extra/squid/squid-2.6.STABLE3-samba.diff b/source/network-extra/squid/squid-2.6.STABLE3-samba.diff deleted file mode 100644 index c33e7cb..0000000 --- a/source/network-extra/squid/squid-2.6.STABLE3-samba.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru squid-2.5.STABLE9/helpers/basic_auth/SMB/Makefile.in squid-2.5.STABLE9.arch/helpers/basic_auth/SMB/Makefile.in ---- squid-2.5.STABLE9/helpers/basic_auth/SMB/Makefile.in 2004-07-10 08:11:41.000000000 -0400 -+++ squid-2.5.STABLE9.arch/helpers/basic_auth/SMB/Makefile.in 2005-04-15 06:08:13.000000000 -0400 -@@ -128,7 +128,7 @@ - makesnmplib = @makesnmplib@ - - SMB_AUTH_HELPER = smb_auth.sh --SAMBAPREFIX = /usr/local/samba -+SAMBAPREFIX = /usr - SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) - - libexec_SCRIPTS = $(SMB_AUTH_HELPER) diff --git a/source/network-extra/squid/squid-2.6.STABLE3-username.diff b/source/network-extra/squid/squid-2.6.STABLE3-username.diff deleted file mode 100644 index 0659e83..0000000 --- a/source/network-extra/squid/squid-2.6.STABLE3-username.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru squid-2.5.STABLE9/src/cf.data.pre squid-2.5.STABLE9.arch/src/cf.data.pre ---- squid-2.5.STABLE9/src/cf.data.pre 2005-02-22 19:06:34.000000000 -0500 -+++ squid-2.5.STABLE9.arch/src/cf.data.pre 2005-04-15 06:08:13.000000000 -0400 -@@ -2425,7 +2425,7 @@ - - NAME: cache_effective_user - TYPE: string --DEFAULT: nobody -+DEFAULT: proxy - LOC: Config.effectiveUser - DOC_START - If you start Squid as root, it will change its effective/real -@@ -2440,7 +2440,7 @@ - - NAME: cache_effective_group - TYPE: string --DEFAULT: none -+DEFAULT: proxy - LOC: Config.effectiveGroup - DOC_START - If you want Squid to run with a specific GID regardless of From vmiklos at frugalware.org Tue Jun 10 13:42:33 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 10 13:42:34 2008 Subject: [Frugalware-git] frugalware-current: bind-9.5.0-2-i686 Message-ID: <20080610114233.0817F1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=123b003f46196fc35ed9a633b1616b10423fe200 commit 123b003f46196fc35ed9a633b1616b10423fe200 Author: Miklos Vajna Date: Tue Jun 10 13:41:59 2008 +0200 bind-9.5.0-2-i686 - rebuilt with --disable-linux-caps - closes #3143 diff --git a/source/network/bind/FrugalBuild b/source/network/bind/FrugalBuild index a994ed0..1d57c35 100644 --- a/source/network/bind/FrugalBuild +++ b/source/network/bind/FrugalBuild @@ -4,7 +4,7 @@ pkgname=bind pkgver=9.5.0 pkgextraver= -pkgrel=1 +pkgrel=2 pkgdesc="DNS server and utilities" url="http://www.isc.org/index.pl?/sw/bind/" backup=(etc/named.conf etc/logrotate.d/named) @@ -19,7 +19,8 @@ build() { Fcd $pkgname-$pkgver$pkgextraver Fbuild --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --with-libtool --enable-shared --disable-threads + --with-libtool --enable-shared --disable-threads \ + --disable-linux-caps Frcd Ffile ../caching-example/named.conf /etc/named.conf From vmiklos at frugalware.org Tue Jun 10 13:49:41 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 10 13:49:42 2008 Subject: [Frugalware-git] frugalware-current: util-linux-ng-2.14-1-i686 Message-ID: <20080610114941.E67541770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5856c6f90ee5b4654db414af55afa4cf33461b8c commit 5856c6f90ee5b4654db414af55afa4cf33461b8c Author: Miklos Vajna Date: Tue Jun 10 13:44:40 2008 +0200 util-linux-ng-2.14-1-i686 - version bump - add release notes diff --git a/source/base/util-linux-ng/FrugalBuild b/source/base/util-linux-ng/FrugalBuild index c08219c..cc84ccd 100644 --- a/source/base/util-linux-ng/FrugalBuild +++ b/source/base/util-linux-ng/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=util-linux-ng -pkgver=2.13.1.1 +pkgver=2.14 pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux-ng" @@ -14,7 +14,7 @@ provides=('util-linux' 'linux32') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url/v\$(lynx -dump $url|grep v.*/|sed -n 's|.*v\(.*\)/|\1|;$ p')/|grep -v rc |Flasttarbz2" -source=($url/v2.13/util-linux-ng-$pkgver.tar.bz2 \ +source=($url/v2.14/util-linux-ng-$pkgver.tar.bz2 \ frugalwaregetty numlock rc.{bootclean,console,mount,rmount,swap,time} \ rc.bootclean-{de,hu}.po rc.mount-{de,hu}.po rc.rmount-{de,hu}.po \ rc.swap-{de,hu}.po rc.time-{de,hu}.po \ @@ -52,6 +52,7 @@ build() { # Documentation. Fdoc README.Frugalware + Fdocrel docs/v2.14* } # optimization OK From vmiklos at frugalware.org Tue Jun 10 17:29:43 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 10 17:29:46 2008 Subject: [Frugalware-git] frugalware-0.8: asterisk-addons-1.4.7-1kalgan1-i686 Message-ID: <20080610152943.5B1A71778001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=8f685d25e8088e97334ca64136f627e1108dc6ac commit 8f685d25e8088e97334ca64136f627e1108dc6ac Author: Miklos Vajna Date: Tue Jun 10 17:29:20 2008 +0200 asterisk-addons-1.4.7-1kalgan1-i686 - secfix bump - closes #3136 diff --git a/source/apps-extra/asterisk-addons/FrugalBuild b/source/apps-extra/asterisk-addons/FrugalBuild index 26393fd..8ef7302 100644 --- a/source/apps-extra/asterisk-addons/FrugalBuild +++ b/source/apps-extra/asterisk-addons/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Balint Kovacs pkgname=asterisk-addons -pkgver=1.4.4 -pkgrel=1 +pkgver=1.4.7 +pkgrel=1kalgan1 pkgdesc="Open Source Private Branch Exchange (PBX) - Addons" url="http://www.asterisk.org/" backup=(etc/asterisk/*) @@ -13,7 +13,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/downloads | grep -m1 Addons | sed 's/.*s \(.*\).*/\1/'" source=(http://ftp.digium.com/pub/asterisk/$pkgname-$pkgver.tar.gz) -sha1sums=('821cc383037c7ecbdcf808d96ed941b6781cc8f5') +sha1sums=('69dc187d4e1a13b96890dec38c719b6dacec10ef') build() { From vmiklos at frugalware.org Tue Jun 10 17:43:17 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 10 17:43:19 2008 Subject: [Frugalware-git] frugalware-0.8: graphicsmagick-1.1.14-1kalgan1-i686 Message-ID: <20080610154317.C5F7E1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=d1965270e00a0d129db61bde1b029d50775e2fc1 commit d1965270e00a0d129db61bde1b029d50775e2fc1 Author: Miklos Vajna Date: Tue Jun 10 17:42:58 2008 +0200 graphicsmagick-1.1.14-1kalgan1-i686 - secfix bump - closes #3137 diff --git a/source/xapps-extra/graphicsmagick/FrugalBuild b/source/xapps-extra/graphicsmagick/FrugalBuild index ba21485..58a646b 100644 --- a/source/xapps-extra/graphicsmagick/FrugalBuild +++ b/source/xapps-extra/graphicsmagick/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=graphicsmagick -pkgver=1.1.12 +pkgver=1.1.14 pkgrel=1kalgan1 pkgdesc="A collection of tools and libraries for many image formats" depends=('libxext' 'libsm' 'lcms' 'freetype2' 'libxml2' 'bzip2' 'jasper>=1.900.0' 'libpng' 'perl' 'urw-fonts' 'xghostscript') @@ -14,7 +14,7 @@ _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://www.graphicsmagick.org/" _F_cd_path="GraphicsMagick-$pkgver" -sha1sums=('bd551d6a06e0f5c4965d12448e3e584ffa22c266') +sha1sums=('e2cdbac9e10640886ddeb298b4a0c455f024db26') export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" export CFLAGS="$CFLAGS -fno-strict-aliasing" @@ -32,7 +32,7 @@ build() --enable-shared --with-threads --with-quantum-depth=32 Frm /usr/share/GraphicsMagick-$pkgver/*.txt Fmkdir usr/share/doc/$pkgname-$pkgver - Fmv /usr/share/GraphicsMagick-$pkgver/www /usr/share/doc/$pkgname-$pkgver/ + Fmv /usr/share/doc/GraphicsMagick/www /usr/share/doc/$pkgname-$pkgver/ Fsplit $pkgname-docs usr/share/doc/$pkgname-$pkgver/www } From vmiklos at frugalware.org Tue Jun 10 17:57:46 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 10 17:57:48 2008 Subject: [Frugalware-git] frugalware-0.8: xdvik-22.84.14-1kalgan1-i686 Message-ID: <20080610155746.EB3611770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=6d04dc45d8b892b3b21291e8b1ecc307de91a43e commit 6d04dc45d8b892b3b21291e8b1ecc307de91a43e Author: Miklos Vajna Date: Tue Jun 10 17:57:30 2008 +0200 xdvik-22.84.14-1kalgan1-i686 - secfix bump - closes #3127 diff --git a/source/xapps-extra/xdvik/FrugalBuild b/source/xapps-extra/xdvik/FrugalBuild index d62f9d2..807fcde 100644 --- a/source/xapps-extra/xdvik/FrugalBuild +++ b/source/xapps-extra/xdvik/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: crazy pkgname=xdvik -pkgver=22.84.12 -pkgrel=1 +pkgver=22.84.14 +pkgrel=1kalgan1 pkgdesc="Xdvik is a program for displaying DVI files." _F_sourceforge_dirname="xdvi" Finclude sourceforge @@ -14,19 +14,17 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://xdvi.sourceforge.net/releases.html|grep -m1 ^[0-9]|sed 's/://'" source=($source xdvik.png) -sha1sums=('15a0b23ec679707792f4f329d80002cbbe9e9ab6' \ +sha1sums=('1ca7f0c7930d24c3e10cc1d7115abed7dd39e95e' \ '820ccc3807167abb206719b7726e7a9f2ee031fd') build() { Fbuild --with-system-t1lib - Fmv usr/bin/*-linux-gnu/* usr/bin/ - Frm usr/bin/*-linux-gnu Fmv usr/share/texmf/release-tetex-src.txt \ usr/share/texmf/$pkgname-release-tetex-src.txt Ffilerel ../xdvik.png /usr/share/icons/hicolor/48x48/apps/xdvik.png - Fdesktop "xdvi" "$pkgname.png" "Qt;Gtk;Utility;Application;" + Fdesktop "xdvi" "$pkgname.png" "Qt;Gtk;Utility;Application;" } # optimization OK From bouleetbil at frogdev.info Tue Jun 10 21:26:10 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jun 10 21:26:12 2008 Subject: [Frugalware-git] frugalware-current: bcprov-139-1-i686 Message-ID: <20080610192610.AD9CF1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=223e44e8a5d11d6769e1be05ed850fdd3cbab9cf commit 223e44e8a5d11d6769e1be05ed850fdd3cbab9cf Author: bouleetbil Date: Tue Jun 10 20:09:13 2008 +0200 bcprov-139-1-i686 *new package diff --git a/source/devel-extra/bcprov/FrugalBuild b/source/devel-extra/bcprov/FrugalBuild new file mode 100644 index 0000000..a18f957 --- /dev/null +++ b/source/devel-extra/bcprov/FrugalBuild @@ -0,0 +1,34 @@ +# Compiling Time: 0.53 SBU +# Maintainer: bouleetbil + +pkgname=bcprov +_F_archive_name="$pkgname-jdk14" +pkgver=139 +pkgrel=1 +pkgdesc="Java cryptography APIs." +url="http://www.bouncycastle.org/java.html" +up2date="lynx -dump http://downloads.bouncycastle.org/java/ | Flasttar" +source=(http://downloads.bouncycastle.org/java/$_F_archive_name-$pkgver.tar.gz build.xml) +Finclude java +groups=('devel-extra') +archs=('i686') +sha1sums=('f8e7a080569690899d58e5b1b51ff7f3af7e1014' \ + '9db4bf71cf4214351b54ed77442296619cf71fd0') + +build() { + Fcd + mkdir -p classes || Fdie + mkdir -p src || Fdie + Fextract src.zip + #delete tests files + find . -path '*test/*.java' -print -delete || Fdie + find . -name '*Test*.java' -print -delete || Fdie + mv PKITS src/ || Fdie + mv org src/ || Fdie + #build + cp $Fsrcdir/build.xml build.xml || Fdie + antflags="-Dproject.name=${pkgname} jar" + Fant ${antflags} + #install + Fjar dist/${pkgname}.jar +} diff --git a/source/devel-extra/bcprov/build.xml b/source/devel-extra/bcprov/build.xml new file mode 100644 index 0000000..3ec1d26 --- /dev/null +++ b/source/devel-extra/bcprov/build.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From bouleetbil at frogdev.info Tue Jun 10 21:42:58 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jun 10 21:42:59 2008 Subject: [Frugalware-git] frugalware-current: bcmail-139-1-i686 Message-ID: <20080610194258.58FA61770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2117a89970411582ab8fabf5a6b39f801f72f32a commit 2117a89970411582ab8fabf5a6b39f801f72f32a Author: bouleetbil Date: Tue Jun 10 21:36:29 2008 +0200 bcmail-139-1-i686 *new package diff --git a/source/devel-extra/bcmail/FrugalBuild b/source/devel-extra/bcmail/FrugalBuild new file mode 100644 index 0000000..612771f --- /dev/null +++ b/source/devel-extra/bcmail/FrugalBuild @@ -0,0 +1,30 @@ +# Compiling Time: 0.05 SBU +# Maintainer: bouleetbil + +pkgname=bcmail +_F_archive_name="$pkgname-jdk14" +pkgver=139 +pkgrel=1 +pkgdesc="Java cryptography APIs." +url="http://www.bouncycastle.org/java.html" +up2date="lynx -dump http://downloads.bouncycastle.org/java/ | Flasttar" +source=(http://downloads.bouncycastle.org/java/$_F_archive_name-$pkgver.tar.gz build.xml) +Finclude java +depends=(${depends[@]} 'jaf' 'bcprov' 'junit' 'gnumail') +groups=('devel-extra') +archs=('i686') +sha1sums=('fa4e2635b1966c6059cf99c548cbfa5d290adcab' \ + '9db4bf71cf4214351b54ed77442296619cf71fd0') + +build() { + Fcd + mkdir -p src || Fdie + Fextract src.zip + mv org src/ || Fdie + #build + cp $Fsrcdir/build.xml build.xml || Fdie + antflags="-Dproject.name=${pkgname} jar" + Fant ${antflags} + #install + Fjar dist/${pkgname}.jar +} diff --git a/source/devel-extra/bcmail/build.xml b/source/devel-extra/bcmail/build.xml new file mode 100644 index 0000000..3ec1d26 --- /dev/null +++ b/source/devel-extra/bcmail/build.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From bouleetbil at frogdev.info Tue Jun 10 22:28:18 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jun 10 22:28:20 2008 Subject: [Frugalware-git] frugalware-current: itext-2.1.2u-1-i686 Message-ID: <20080610202818.E1FF81770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=276faddc28b8a8f4d9532dcee48cf3812b672cfb commit 276faddc28b8a8f4d9532dcee48cf3812b672cfb Author: bouleetbil Date: Tue Jun 10 22:20:55 2008 +0200 itext-2.1.2u-1-i686 *new package diff --git a/source/devel-extra/itext/FrugalBuild b/source/devel-extra/itext/FrugalBuild new file mode 100644 index 0000000..4ab8762 --- /dev/null +++ b/source/devel-extra/itext/FrugalBuild @@ -0,0 +1,28 @@ +# Compiling Time: 0.30 SBU +# Maintainer: bouleetbil + +pkgname=itext +pkgver=2.1.2u +pkgrel=1 +pkgdesc="A Java library that generate documents in the Portable Document Format (PDF) and/or HTML." +groups=('devel-extra') +archs=('i686') +_F_sourceforge_name="iText-src" +_F_sourceforge_broken_up2date=1 +Finclude sourceforge java +depends=(${depends[@]} 'bcprov' 'bcmail' 'dom4j') +source=($source UseJarFW.diff bcrprov-139.diff) +url="http://www.lowagie.com/iText/" +sha1sums=('3651f11e4ee1daa7b18f98e0bd431ca7195242e4' \ + 'd6ab58ad30b45bf5dd4b028d7343913675ad2587' \ + '82e7731c705ac8c8bd08c3e0028bb47887f82cb1') +_F_cd_path="src" + +build() { + Fcd + Fpatchall + Fant jar + cd ../lib || Fdie + Fjar iText.jar +} + diff --git a/source/devel-extra/itext/UseJarFW.diff b/source/devel-extra/itext/UseJarFW.diff new file mode 100644 index 0000000..4344864 --- /dev/null +++ b/source/devel-extra/itext/UseJarFW.diff @@ -0,0 +1,17 @@ +--- src/ant/compile.xml.old 2008-04-13 11:53:06.000000000 +0200 ++++ src/ant/compile.xml 2008-06-10 11:42:28.000000000 +0200 +@@ -13,11 +13,11 @@ + + + +- +- ++ ++ + + +- ++ + + + diff --git a/source/devel-extra/itext/bcrprov-139.diff b/source/devel-extra/itext/bcrprov-139.diff new file mode 100644 index 0000000..9ff7578 --- /dev/null +++ b/source/devel-extra/itext/bcrprov-139.diff @@ -0,0 +1,39 @@ +--- src/core/com/lowagie/text/pdf/PdfPKCS7.java 2008-05-14 15:10:19.000000000 +0200 ++++ src/core/com/lowagie/text/pdf/PdfPKCS7.java 2008-06-10 12:30:09.000000000 +0200 +@@ -172,7 +172,12 @@ + public PdfPKCS7(byte[] contentsKey, byte[] certsKey, String provider) throws SecurityException, InvalidKeyException, CertificateException, NoSuchProviderException, NoSuchAlgorithmException, IOException, StreamParsingException { + X509CertParser cr = new X509CertParser(); + cr.engineInit(new ByteArrayInputStream(certsKey)); +- certs = cr.engineReadAll(); ++ try { ++ certs = cr.engineReadAll(); ++ } ++ catch(Exception ecerts){ ++ throw new SecurityException("can't create certs object"); ++ } + signCert = (X509Certificate)certs.iterator().next(); + crls = new ArrayList(); + ASN1InputStream in = new ASN1InputStream(new ByteArrayInputStream(contentsKey)); +@@ -241,10 +246,20 @@ + // the certificates and crls + X509CertParser cr = new X509CertParser(); + cr.engineInit(new ByteArrayInputStream(contentsKey)); +- certs = cr.engineReadAll(); ++ try{ ++ certs = cr.engineReadAll(); ++ } ++ catch(Exception ecerts2){ ++ throw new SecurityException("can't create certs object"); ++ } + X509CRLParser cl = new X509CRLParser(); + cl.engineInit(new ByteArrayInputStream(contentsKey)); +- crls = cl.engineReadAll(); ++ try{ ++ crls = cl.engineReadAll(); ++ } ++ catch(Exception ectrls){ ++ throw new SecurityException("can't create crls object"); ++ } + + // the possible ID_PKCS7_DATA + ASN1Sequence rsaData = (ASN1Sequence)content.getObjectAt(2); From bouleetbil at frogdev.info Tue Jun 10 22:54:57 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jun 10 22:54:59 2008 Subject: [Frugalware-git] frugalware-current: commons-codec-1.3-1-i686 Message-ID: <20080610205457.50E5B1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a13ab814969225a7fc04cfdb4714315e5a54b4f7 commit a13ab814969225a7fc04cfdb4714315e5a54b4f7 Author: bouleetbil Date: Tue Jun 10 22:47:11 2008 +0200 commons-codec-1.3-1-i686 *new package diff --git a/source/devel-extra/commons-codec/FrugalBuild b/source/devel-extra/commons-codec/FrugalBuild new file mode 100644 index 0000000..fadd828 --- /dev/null +++ b/source/devel-extra/commons-codec/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: 0.03 SBU +# Maintainer: bouletbil + +pkgname=commons-codec +pkgver=1.3 +pkgrel=1 +pkgdesc="Commons Codec provides implementations of common encoders and decoders such as Base64, Hex, Phonetic and URLs." +url="http://jakarta.apache.org/commons/codec" +Finclude java +groups=('devel-extra') +archs=('i686') +up2date="Flastarchive http://www.apache.org/dist/commons/codec/source/ -src.tar.gz" +source=(http://www.apache.org/dist/commons/codec/source/commons-codec-$pkgver-src.tar.gz LICENSE) +sha1sums=('d490a9bb30ea9e8b95c250f4d96842e0ce0c60d7' \ + '47b573e3824cd5e02a1a3ae99e2735b49e0256e4') + +build() +{ + Fcd + #forget in archive + cp $Fsrcdir/LICENSE LICENSE || Fdie + Fjavacleanup + Fant -f build.xml jar + mv dist/commons-codec{-$pkgver,}.jar || Fdie + Fjar dist/commons-codec.jar +} diff --git a/source/devel-extra/commons-codec/LICENSE b/source/devel-extra/commons-codec/LICENSE new file mode 100644 index 0000000..75b5248 --- /dev/null +++ b/source/devel-extra/commons-codec/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From bouleetbil at frogdev.info Tue Jun 10 23:07:42 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jun 10 23:07:44 2008 Subject: [Frugalware-git] frugalware-current: commons-codec-1.3-1-i686 Message-ID: <20080610210742.81C501770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a30f89720516709fdfd2f0cef01c8b9e356dc6d4 commit a30f89720516709fdfd2f0cef01c8b9e356dc6d4 Author: bouleetbil Date: Tue Jun 10 23:00:38 2008 +0200 commons-codec-1.3-1-i686 *change source for LICENCE *m8r correction diff --git a/source/devel-extra/commons-codec/FrugalBuild b/source/devel-extra/commons-codec/FrugalBuild index fadd828..e81648a 100644 --- a/source/devel-extra/commons-codec/FrugalBuild +++ b/source/devel-extra/commons-codec/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0.03 SBU -# Maintainer: bouletbil +# Maintainer: bouleetbil pkgname=commons-codec pkgver=1.3 @@ -10,15 +10,16 @@ Finclude java groups=('devel-extra') archs=('i686') up2date="Flastarchive http://www.apache.org/dist/commons/codec/source/ -src.tar.gz" -source=(http://www.apache.org/dist/commons/codec/source/commons-codec-$pkgver-src.tar.gz LICENSE) +source=(http://www.apache.org/dist/commons/codec/source/commons-codec-$pkgver-src.tar.gz \ + http://www.apache.org/licenses/LICENSE-2.0.txt) sha1sums=('d490a9bb30ea9e8b95c250f4d96842e0ce0c60d7' \ - '47b573e3824cd5e02a1a3ae99e2735b49e0256e4') + '2b8b815229aa8a61e483fb4ba0588b8b6c491890') build() { Fcd #forget in archive - cp $Fsrcdir/LICENSE LICENSE || Fdie + cp $Fsrcdir/LICENSE-2.0.txt LICENSE || Fdie Fjavacleanup Fant -f build.xml jar mv dist/commons-codec{-$pkgver,}.jar || Fdie diff --git a/source/devel-extra/commons-codec/LICENSE b/source/devel-extra/commons-codec/LICENSE deleted file mode 100644 index 75b5248..0000000 --- a/source/devel-extra/commons-codec/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. From bouleetbil at frogdev.info Tue Jun 10 23:15:35 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jun 10 23:15:37 2008 Subject: [Frugalware-git] frugalware-current: commons-collections-3.2.1-1-i686 Message-ID: <20080610211535.5B28D1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2d62abbbda8baee5f0be7fe42c2c749d3855e99b commit 2d62abbbda8baee5f0be7fe42c2c749d3855e99b Author: bouleetbil Date: Tue Jun 10 23:07:22 2008 +0200 commons-collections-3.2.1-1-i686 *new package diff --git a/source/devel-extra/commons-collections/FrugalBuild b/source/devel-extra/commons-collections/FrugalBuild new file mode 100644 index 0000000..e32ba99 --- /dev/null +++ b/source/devel-extra/commons-collections/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 0.07 SBU +# Maintainer: bouleetbil + +pkgname=commons-collections +pkgver=3.2.1 +pkgrel=1 +pkgdesc="Added many powerful data structures that accelerate development of most significant Java applications." +url="http://jakarta.apache.org/commons/collections" +Finclude java +groups=('devel-extra') +archs=('i686') +up2date="Flastarchive http://www.apache.org/dist/commons/collections/source/ -src.tar.gz" +source=(http://www.apache.org/dist/commons/collections/source/$pkgname-$pkgver-src.tar.gz) +_F_cd_path=$pkgname-$pkgver-src +sha1sums=('6925f4a487d58538a4d3ef11d63aefdd66ee2405') + +build() +{ + Fcd + Fjavacleanup + Fant -f build.xml jar + mv build/commons-collections{-$pkgver,}.jar || Fdie + Fjar build/commons-collections.jar +} From bouleetbil at frogdev.info Tue Jun 10 23:44:32 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jun 10 23:44:33 2008 Subject: [Frugalware-git] frugalware-current: tuxguitar-1.0_rc4-2-i686 Message-ID: <20080610214432.2FE7D1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cf135fa58d8fb01ecd3d7b709f70153400037bc3 commit cf135fa58d8fb01ecd3d7b709f70153400037bc3 Author: bouleetbil Date: Tue Jun 10 23:31:14 2008 +0200 tuxguitar-1.0_rc4-2-i686 *add tuxguitar-plugin-pdf diff --git a/source/xapps-extra/tuxguitar/FrugalBuild b/source/xapps-extra/tuxguitar/FrugalBuild index 70929ef..82151d9 100644 --- a/source/xapps-extra/tuxguitar/FrugalBuild +++ b/source/xapps-extra/tuxguitar/FrugalBuild @@ -3,7 +3,7 @@ pkgname=tuxguitar pkgver=1.0_rc4 -pkgrel=1 +pkgrel=2 pkgdesc="TuxGuitar is a multitrack guitar tablature editor and player written in Java-SWT." options=('scriptlet') groups=('xapps-extra') @@ -17,7 +17,7 @@ _F_sourceforge_broken_up2date=1 _F_sourceforge_pkgver=${pkgver/_/-} Finclude sourceforge java gnome-scriptlet depends=(${depends[@]} 'swt') -makedepends=(${makedepends[@]} 'j2sdk' 'imagemagick') +makedepends=(${makedepends[@]} 'j2sdk' 'imagemagick' 'itext') _F_cd_path="$pkgname-src-$_F_sourceforge_pkgver" sha1sums=('e3e44c8a139c8ea9a526e28139998337dcdef3e1') NameDir=TuxGuitar @@ -25,22 +25,22 @@ subpkgs=('tuxguitar-plugin-alsa' 'tuxguitar-plugin-ascii' 'tuxguitar-plugin-brow 'tuxguitar-plugin-compat' 'tuxguitar-plugin-converter' \ 'tuxguitar-plugin-gtp' 'tuxguitar-plugin-jsa' \ 'tuxguitar-plugin-lilypond' 'tuxguitar-plugin-midi' 'tuxguitar-plugin-musicxml' \ - 'tuxguitar-plugin-oss' 'tuxguitar-plugin-ptb' 'tuxguitar-plugin-tef' \ + 'tuxguitar-plugin-oss' 'tuxguitar-plugin-pdf' 'tuxguitar-plugin-ptb' 'tuxguitar-plugin-tef' \ 'tuxguitar-plugin-tray') subdescs=('Plugin TuxGuitar-alsa' 'Plugin TuxGuitar-ascii' 'Plugin TuxGuitar-browser-ftp' \ 'Plugin TuxGuitar-compat' 'Plugin TuxGuitar-converter' \ 'Plugin TuxGuitar-gtp' 'Plugin TuxGuitar-jsa' \ 'Plugin TuxGuitar-lilypond' 'Plugin TuxGuitar-midi' 'Plugin TuxGuitar-musicxml' \ - 'Plugin TuxGuitar-oss' 'Plugin TuxGuitar-ptb' 'Plugin TuxGuitar-tef' \ + 'Plugin TuxGuitar-oss' 'Plugin TuxGuitar-pdf' 'Plugin TuxGuitar-ptb' 'Plugin TuxGuitar-tef' \ 'Plugin TuxGuitar-tray') subdepends=("tuxguitar=$pkgver" "tuxguitar=$pkgver" "tuxguitar=$pkgver" "tuxguitar=$pkgver" \ "tuxguitar=$pkgver" "tuxguitar=$pkgver" "tuxguitar=$pkgver" "tuxguitar=$pkgver" \ - "tuxguitar=$pkgver" "tuxguitar=$pkgver" "tuxguitar=$pkgver" "tuxguitar=$pkgver" \ - "tuxguitar=$pkgver" "tuxguitar=$pkgver") -subgroups=('xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra' \ + "tuxguitar=$pkgver" "tuxguitar=$pkgver" "tuxguitar=$pkgver" "tuxguitar=$pkgver itext" \ + "tuxguitar=$pkgver" "tuxguitar=$pkgver" "tuxguitar=$pkgver") +subgroups=('xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra' \ 'xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra') subarchs=('i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686' 'i686'\ - 'i686') + 'i686' 'i686') build() { Fcd @@ -65,8 +65,6 @@ build() { cd .. || Fdie #delete broken plugin #Todo see the broken plugins - #TuxGuitar-pdf requiert java-itext - rm TuxGuitar-pdf -R || Fdie #TuxGuitar-CoreAudio plugin for macOS rm TuxGuitar-CoreAudio -R || Fide rm TuxGuitar-fluidsynth -R || Fdie From ryuo at frugalware.org Wed Jun 11 10:16:56 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 11 10:16:57 2008 Subject: [Frugalware-git] frugalware-current: fxsudoku-0.5.1-1-i686 Message-ID: <20080611081656.58EF71770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2688366e8cf9a03f519aa271c3ed1ec5b53ef91e commit 2688366e8cf9a03f519aa271c3ed1ec5b53ef91e Author: James Buren Date: Wed Jun 11 03:14:06 2008 -0500 fxsudoku-0.5.1-1-i686 * new package diff --git a/source/games-extra/fxsudoku/FrugalBuild b/source/games-extra/fxsudoku/FrugalBuild new file mode 100644 index 0000000..b676369 --- /dev/null +++ b/source/games-extra/fxsudoku/FrugalBuild @@ -0,0 +1,27 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=fxsudoku +pkgver=0.5.1 +pkgrel=1 +pkgdesc="A game of sudoku written with FOX." +url="http://www.fifthplanet.net" +depends=('fox' 'libxext' 'libxrender' 'fontconfig' 'zlib' 'libgl' 'libstdc++' 'libxfixes') +groups=('games-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url" +source=($url/files/$pkgname-$pkgver.tar.bz2) +sha1sums=('2c612e55030e82cd1b70ab1f523075d90cfaccf4') + +build() +{ + Fcd + ./gb || Fdie + Fexerel src/fxsudoku /usr/bin/fxsudoku + Ffilerel /usr/share/fxsudoku/example.sdk + # fix read permissions for auto-documentation + chmod 644 {INSTALL,COPYING,ChangeLog} || Fdie +} + + +# optimization OK From crazy at frugalware.org Wed Jun 11 10:38:35 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 11 10:38:37 2008 Subject: [Frugalware-git] frugalware-current: iasl-20080609-1-x86_64 Message-ID: <20080611083835.1855C1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a79515a6ee9873e55b039bcd5aec34bfb2e434a3 commit a79515a6ee9873e55b039bcd5aec34bfb2e434a3 Author: crazy Date: Wed Jun 11 10:37:40 2008 +0200 iasl-20080609-1-x86_64 * Version bump diff --git a/source/devel-extra/iasl/FrugalBuild b/source/devel-extra/iasl/FrugalBuild index 31dfa96..c82f80d 100644 --- a/source/devel-extra/iasl/FrugalBuild +++ b/source/devel-extra/iasl/FrugalBuild @@ -4,7 +4,7 @@ pkgname=iasl _F_archive_name=acpica-unix -pkgver=20080514 +pkgver=20080609 pkgrel=1 pkgdesc="Intel ACPI Source Language (ASL) compiler" url="http://www.acpica.org/" @@ -15,7 +15,7 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.acpica.org/downloads/unix_source_code.php | Flasttar" source=($url/download/$_F_archive_name-$pkgver.tar.gz) -sha1sums=('cb0ada08bc4acaaabbf23b7d1f2677bd9861073a') +sha1sums=('8eb0b443fb6144d2dc1c5e176913b1f95e4d3207') unset MAKEFLAGS build() { From crazy at frugalware.org Wed Jun 11 10:44:06 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 11 10:44:07 2008 Subject: [Frugalware-git] frugalware-current: loudmouth-1.4.0-1-x86_64 Message-ID: <20080611084406.7C0291770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5e4cc378653bdb21979f4491c7af6d93558e888a commit 5e4cc378653bdb21979f4491c7af6d93558e888a Author: crazy Date: Wed Jun 11 10:43:22 2008 +0200 loudmouth-1.4.0-1-x86_64 * Version bump diff --git a/source/apps-extra/loudmouth/FrugalBuild b/source/apps-extra/loudmouth/FrugalBuild index 377e076..06f520a 100644 --- a/source/apps-extra/loudmouth/FrugalBuild +++ b/source/apps-extra/loudmouth/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=loudmouth -pkgver=1.3.4 +pkgver=1.4.0 pkgrel=1 pkgdesc="A lightweight and easy-to-use C library for programming with the Jabber protocol." url="http://www.loudmouth-project.org/" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') up2date="Flasttar $url/download" source=(http://ftp.imendio.com/pub/imendio/$pkgname/src/$pkgname-$pkgver.tar.gz) Fconfopts="$Fconfopts --enable-debug=no" -sha1sums=('6395ad13f98d861209a6ea8e6dee60c9c440125a') +sha1sums=('50e42adfe69e64aa8449d017a3104aeece838f16') # optimization OK From crazy at frugalware.org Wed Jun 11 11:00:50 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 11 11:00:53 2008 Subject: [Frugalware-git] frugalware-current: kmess-1.5.1-1-x86_64 Message-ID: <20080611090050.74B2F1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ef1db1f3e990fb0ff68f6b4f9011818592d85576 commit ef1db1f3e990fb0ff68f6b4f9011818592d85576 Author: crazy Date: Wed Jun 11 10:59:13 2008 +0200 kmess-1.5.1-1-x86_64 * Version bump * added gcc43.patch diff --git a/source/kde-extra/kmess/FrugalBuild b/source/kde-extra/kmess/FrugalBuild index 8a2d5d2..6a0bf5d 100644 --- a/source/kde-extra/kmess/FrugalBuild +++ b/source/kde-extra/kmess/FrugalBuild @@ -2,14 +2,16 @@ # Maintainer: crazy pkgname=kmess -pkgver=1.5 +pkgver=1.5.1 pkgrel=1 pkgdesc="Chat client for the MSN Messenger protocol." -url="http://kmess.sourceforge.net/" -depends=('libxscrnsaver' 'libstdc++' 'kdelibs>=3.5.8') +depends=('libxscrnsaver' 'libstdc++' 'kdelibs>=3.5.9') groups=('kde-extra') archs=('i686' 'x86_64') _F_kde_defaults=0 Finclude kde sourceforge -sha1sums=('367ef94a0f91271ba856ebd151acebfce086abfe') +url="http://kmess.sourceforge.net/" +source=($source gcc43.patch) +sha1sums=('1380ec25eb04df2830e5dfe4eec0b18a2a462e14' \ + 'ab523a6a0958d34ceb0d1d10c2f170bc8817e966') # optimization OK diff --git a/source/kde-extra/kmess/gcc43.patch b/source/kde-extra/kmess/gcc43.patch new file mode 100644 index 0000000..f64c99d --- /dev/null +++ b/source/kde-extra/kmess/gcc43.patch @@ -0,0 +1,23 @@ +diff -Naur kmess-1.5.1/kmess/crypt/sha1.cpp kmess-1.5.1-p/kmess/crypt/sha1.cpp +--- kmess-1.5.1/kmess/crypt/sha1.cpp 2008-02-23 13:02:43.000000000 +0100 ++++ kmess-1.5.1-p/kmess/crypt/sha1.cpp 2008-06-11 10:55:14.000000000 +0200 +@@ -36,6 +36,7 @@ + #include "bithelp.h" + + #include ++#include + #include + + Sha1::Sha1() +diff -Naur kmess-1.5.1/kmess/notification/passivepopupview.h kmess-1.5.1-p/kmess/notification/passivepopupview.h +--- kmess-1.5.1/kmess/notification/passivepopupview.h 2008-03-12 22:26:46.000000000 +0100 ++++ kmess-1.5.1-p/kmess/notification/passivepopupview.h 2008-06-11 10:55:00.000000000 +0200 +@@ -43,7 +43,7 @@ + + public: // Public methods + // Class constructor +- PassivePopupView( QWidget *parent, QString icon, QString message, QString icon = QString::null ); ++ PassivePopupView( QWidget *parent, QString icon, QString message, QString icon2 = QString::null ); + // Changes the popup icon + void changeIcon( QString icon ); + // Changes the popup status icon From crazy at frugalware.org Wed Jun 11 11:06:56 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 11 11:06:58 2008 Subject: [Frugalware-git] frugalware-current: pearpc-0.4.0-2-x86_64 Message-ID: <20080611090656.E2C601770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eec3e36d2871bfee0a7cab8afdee225ea09d7c4d commit eec3e36d2871bfee0a7cab8afdee225ea09d7c4d Author: crazy Date: Wed Jun 11 11:06:16 2008 +0200 pearpc-0.4.0-2-x86_64 * use _F_sourceforge_broken_up2date=1 here diff --git a/source/xapps-extra/pearpc/FrugalBuild b/source/xapps-extra/pearpc/FrugalBuild index ca4ba5c..2364d87 100644 --- a/source/xapps-extra/pearpc/FrugalBuild +++ b/source/xapps-extra/pearpc/FrugalBuild @@ -6,13 +6,13 @@ pkgver=0.4.0 pkgrel=2 pkgdesc="PearPC is an Open Source PowerPC platform emulator" _F_sourceforge_ext=".tar.bz2" +_F_sourceforge_broken_up2date=1 Finclude sourceforge url="http://pearpc.sourceforge.net" depends=('libx11') makedepends=('nasm' 'flex' 'bison') groups=('xapps-extra') archs=('i686' '!x86_64') -up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=108675 | grep Latest |sed 's/ //g' | sed 's/Latest....//g' | sed 's/Re.*//g' | sed 's/hd.*//g' | sed 's/.....N.*//g' | sed -e '/^$/d' | grep '[0-9]' | sed 's/\]//' | sed 's/\[//'" source=(${source/0.4.0/0.4}) # FIXME sha1sums=('1cfa4f19f9a1de73c209a38d8fda174c0ebe6ad5') #[ "$CARCH" == "x86_64" ] && source=(${source[@]} pearpc-x86_64_int_precision_fix.diff) && sha1sums=(${sha1sums[@]} 'a21efa9c4ec1944ac3d060f57b8957a223968c2d') From crazy at frugalware.org Wed Jun 11 11:44:00 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 11 11:44:04 2008 Subject: [Frugalware-git] frugalware-current: hydrogen-0.9.3-4-x86_64 Message-ID: <20080611094400.DA74C1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dde30196a2f3726bf5c55dae25cb156a3bb7de49 commit dde30196a2f3726bf5c55dae25cb156a3bb7de49 Author: crazy Date: Wed Jun 11 11:42:08 2008 +0200 hydrogen-0.9.3-4-x86_64 * rebuilt * added gcc43.patch * should close FS#3147 diff --git a/source/xmultimedia-extra/hydrogen/FrugalBuild b/source/xmultimedia-extra/hydrogen/FrugalBuild index b19d70e..9a5bdb8 100644 --- a/source/xmultimedia-extra/hydrogen/FrugalBuild +++ b/source/xmultimedia-extra/hydrogen/FrugalBuild @@ -3,20 +3,17 @@ pkgname=hydrogen pkgver=0.9.3 -pkgrel=3 +pkgrel=4 pkgdesc="Hydrogen is an advanced drum machine." depends=('liblrdf>=0.4.0-3' 'openssl' 'libstdc++' 'libsndfile' 'jack' 'qt' 'libxml2') _F_kde_defaults=0 Finclude sourceforge kde url="http://www.hydrogen-music.org/" up2date="lynx -dump http://www.hydrogen-music.org/?p=download|grep 'Stable release'|sed 's/.*- //'" -source=(${source[@]} gcc411.patch hydrogen-flac113.patch) +source=(${source[@]} gcc411.patch hydrogen-flac113.patch gcc43.patch) groups=('xmultimedia-extra') archs=('i686' 'x86_64') - - - -# optimization OK -sha1sums=('4c07d3d250922421182f0dd527965628588bcb4a'\ - '4da7dfeda63dff10a6c9d1ba39ff955a8c4e4b07'\ - 'a4a034bab94b71f9d9dc9a546b05d9509a2411a0') +sha1sums=('4c07d3d250922421182f0dd527965628588bcb4a' \ + '4da7dfeda63dff10a6c9d1ba39ff955a8c4e4b07' \ + 'a4a034bab94b71f9d9dc9a546b05d9509a2411a0' \ + '9d333eb4d4fe5e8b73b1cfbbc07db80b623bf479') diff --git a/source/xmultimedia-extra/hydrogen/gcc43.patch b/source/xmultimedia-extra/hydrogen/gcc43.patch new file mode 100644 index 0000000..6cfb408 --- /dev/null +++ b/source/xmultimedia-extra/hydrogen/gcc43.patch @@ -0,0 +1,75 @@ +diff -NrU5 hydrogen-0.9.3.orig/src/gui/DrumkitManager.h hydrogen-0.9.3/src/gui/DrumkitManager.h +--- hydrogen-0.9.3.orig/src/gui/DrumkitManager.h 2008-04-19 16:48:03.000000000 +0200 ++++ hydrogen-0.9.3/src/gui/DrumkitManager.h 2008-04-19 16:48:46.000000000 +0200 +@@ -41,10 +41,11 @@ + #include + #include + #include + + #include ++#include + + #include "UI/DrumkitManager_UI.h" + #include "lib/Object.h" + #include "lib/Song.h" + +diff -NrU5 hydrogen-0.9.3.orig/src/gui/main.cpp hydrogen-0.9.3/src/gui/main.cpp +--- hydrogen-0.9.3.orig/src/gui/main.cpp 2008-04-19 16:48:03.000000000 +0200 ++++ hydrogen-0.9.3/src/gui/main.cpp 2008-04-19 16:48:46.000000000 +0200 +@@ -41,10 +41,11 @@ + #include "lib/Preferences.h" + #include "lib/DataPath.h" + #include "lib/Exception.h" + + #include ++#include + using namespace std; + + void showInfo(); + void showUsage(); + +diff -NrU5 hydrogen-0.9.3.orig/src/lib/drivers/OssDriver.cpp hydrogen-0.9.3/src/lib/drivers/OssDriver.cpp +--- hydrogen-0.9.3.orig/src/lib/drivers/OssDriver.cpp 2008-04-19 16:48:04.000000000 +0200 ++++ hydrogen-0.9.3/src/lib/drivers/OssDriver.cpp 2008-04-19 16:50:09.000000000 +0200 +@@ -28,10 +28,11 @@ + #ifdef OSS_SUPPORT + + #include "../Preferences.h" + + #include ++#include + + audioProcessCallback ossDriver_audioProcessCallback; + bool ossDriver_running; + pthread_t ossDriverThread; + int oss_driver_bufferSize = -1; +diff -NrU5 hydrogen-0.9.3.orig/src/lib/FLACFile.cpp hydrogen-0.9.3/src/lib/FLACFile.cpp +--- hydrogen-0.9.3.orig/src/lib/FLACFile.cpp 2008-04-19 16:48:04.000000000 +0200 ++++ hydrogen-0.9.3/src/lib/FLACFile.cpp 2008-04-19 16:48:46.000000000 +0200 +@@ -25,10 +25,11 @@ + #include "FLACFile.h" + #include "Sample.h" + + #include + #include ++#include + + #ifdef FLAC_SUPPORT + + //#include "FLAC/file_decoder.h" + #include +diff -NrU5 hydrogen-0.9.3.orig/src/tools/HydrogenPlayer.cpp hydrogen-0.9.3/src/tools/HydrogenPlayer.cpp +--- hydrogen-0.9.3.orig/src/tools/HydrogenPlayer.cpp 2008-04-19 16:48:04.000000000 +0200 ++++ hydrogen-0.9.3/src/tools/HydrogenPlayer.cpp 2008-04-19 16:48:46.000000000 +0200 +@@ -26,10 +26,11 @@ + #include + + #include + #include + #include ++#include + + #include "lib/Hydrogen.h" + #include "lib/LocalFileMng.h" + #include "lib/Preferences.h" + #include "lib/fx/LadspaFX.h" From ryuo at frugalware.org Wed Jun 11 11:47:09 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 11 11:47:12 2008 Subject: [Frugalware-git] frugalware-current: firebox-0.5.0-1-i686 Message-ID: <20080611094709.E05EE1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bb5dcfb54d4deba513f61371161faea3f9826726 commit bb5dcfb54d4deba513f61371161faea3f9826726 Author: James Buren Date: Wed Jun 11 04:45:05 2008 -0500 firebox-0.5.0-1-i686 * new package diff --git a/source/x11-extra/firebox/FrugalBuild b/source/x11-extra/firebox/FrugalBuild new file mode 100644 index 0000000..5e7150d --- /dev/null +++ b/source/x11-extra/firebox/FrugalBuild @@ -0,0 +1,23 @@ +# Compiling Time: 0.07 SBU +# Maintainer: James Buren + +pkgname=firebox +pkgver=0.5.0 +pkgrel=1 +pkgdesc="A window manager written in C, inspired by various other WMs." +url="http://firebox.intuxication.org" +depends=('libxft' 'libxcomposite' 'libpng' 'libjpeg') +groups=('x11-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url/?page=4" +source=(http://download.gna.org/firebox/tarballs/$pkgname-$pkgver.tar.gz) +sha1sums=('9286e6adc32e8fbe78ff24ce403003884825e705') + +build() +{ + Fconf + make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || Fdie + Fmakeinstall +} + +# optimization OK From ryuo at frugalware.org Wed Jun 11 11:52:41 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 11 11:52:43 2008 Subject: [Frugalware-git] frugalware-current: firebox-tools-0.5.0-1-i686 Message-ID: <20080611095241.74C131770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7b94cc3894b4daee79dc39a9c8759e9d96b118b5 commit 7b94cc3894b4daee79dc39a9c8759e9d96b118b5 Author: James Buren Date: Wed Jun 11 04:51:08 2008 -0500 firebox-tools-0.5.0-1-i686 * new package diff --git a/source/xapps-extra/firebox-tools/FrugalBuild b/source/xapps-extra/firebox-tools/FrugalBuild new file mode 100644 index 0000000..a6f9cb1 --- /dev/null +++ b/source/xapps-extra/firebox-tools/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.04 SBU +# Maintainer: James Buren + +pkgname=firebox-tools +pkgver=0.5.0 +pkgrel=1 +pkgdesc="GUI tools for configuring firebox." +url="http://firebox.intuxication.org" +rodepends=('firebox') +depends=('gtk+2' 'glibc' 'freetype2' 'libxau' 'libxdmcp' 'libxml2' 'libxdamage' 'libxext') +groups=('xapps-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url/?page=4" +options=('scriptlet') +source=(http://download.gna.org/firebox/tarballs/$pkgname-$pkgver.tar.gz) +sha1sums=('43a19ca0874bc7bdda268889c971350066ec2571') + +# optimization OK From ryuo at frugalware.org Wed Jun 11 12:04:17 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 11 12:04:18 2008 Subject: [Frugalware-git] frugalware-current: firebox-themes-0.5.0-1-i686 Message-ID: <20080611100417.70DA21770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4ff44363f54e2443e541e3c400ca13ef600f05ae commit 4ff44363f54e2443e541e3c400ca13ef600f05ae Author: James Buren Date: Wed Jun 11 04:58:13 2008 -0500 firebox-themes-0.5.0-1-i686 * new package diff --git a/source/xlib-extra/firebox-themes/FrugalBuild b/source/xlib-extra/firebox-themes/FrugalBuild new file mode 100644 index 0000000..bf66393 --- /dev/null +++ b/source/xlib-extra/firebox-themes/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0 SBU +# Maintainer: James Buren + +pkgname=firebox-themes +pkgver=0.5.0 +pkgrel=1 +pkgdesc="Some themes for use with firebox." +url="http://firebox.intuxication.org" +rodepends=('firebox') +depends=() +groups=('xlib-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url/?page=4" +source=(http://download.gna.org/firebox/tarballs/$pkgname-$pkgver.tar.gz) +sha1sums=('059e8436f2945fc85145c72e71bdfc96e4927137') + +# optimization OK From crazy at frugalware.org Wed Jun 11 12:10:02 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 11 12:10:04 2008 Subject: [Frugalware-git] frugalware-current: exiv2-0.16-2-x86_64 Message-ID: <20080611101002.A24AB1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b2031ca586de5111fee554c17406fa96d523419e commit b2031ca586de5111fee554c17406fa96d523419e Author: crazy Date: Wed Jun 11 12:08:42 2008 +0200 exiv2-0.16-2-x86_64 * release bump * added gcc43.patch * added SA30519.patch * closes FS#3135 in -current diff --git a/source/lib-extra/exiv2/FrugalBuild b/source/lib-extra/exiv2/FrugalBuild index 91d60b1..c4fe4fa 100644 --- a/source/lib-extra/exiv2/FrugalBuild +++ b/source/lib-extra/exiv2/FrugalBuild @@ -3,15 +3,17 @@ pkgname=exiv2 pkgver=0.16 -pkgrel=1 +pkgrel=2 pkgdesc="Exiv2 is a C++ library and a command line utility to access image metadata." url="http://www.exiv2.org/" depends=('libstdc++' 'zlib') groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.exiv2.org/download.html|grep -m1 '.tar.gz'|sed 's/.*v2-\(.*\).t.*/\1/'" -source=($url/$pkgname-$pkgver.tar.gz) +source=($url/$pkgname-$pkgver.tar.gz gcc43.patch SA30519.patch) Fconfopts="$Fconfopts --with-zlib=/usr" -sha1sums=('fd5cdec6b60fd52a15c73c30760e099bbfa3cf50') +sha1sums=('fd5cdec6b60fd52a15c73c30760e099bbfa3cf50' \ + 'db3a90e930390ae92c2907e63f8118a609304537' \ + '586dd4c2fb273407cab4eab0182876014dd17e05') # optimization OK diff --git a/source/lib-extra/exiv2/SA30519.patch b/source/lib-extra/exiv2/SA30519.patch new file mode 100644 index 0000000..a104f5d --- /dev/null +++ b/source/lib-extra/exiv2/SA30519.patch @@ -0,0 +1,54 @@ +--- src/nikonmn.cpp 2008/01/29 13:33:51 1385 ++++ src/nikonmn.cpp 2008/03/29 06:14:56 1399 +@@ -931,29 +931,31 @@ + std::ostream& Nikon3MakerNote::print0x0084(std::ostream& os, + const Value& value) + { +- if (value.count() == 4) { +- long len1 = value.toLong(0); +- long len2 = value.toLong(1); +- Rational fno1 = value.toRational(2); +- Rational fno2 = value.toRational(3); +- os << len1; +- if (len2 != len1) { +- os << "-" << len2; +- } +- os << "mm "; +- std::ostringstream oss; +- oss.copyfmt(os); +- os << "F" << std::setprecision(2) +- << static_cast(fno1.first) / fno1.second; +- if (fno2 != fno1) { +- os << "-" << std::setprecision(2) +- << static_cast(fno2.first) / fno2.second; +- } +- os.copyfmt(oss); +- } +- else { ++ if ( value.count() != 4 ++ || value.toRational(0).second == 0 ++ || value.toRational(1).second == 0) { + os << "(" << value << ")"; ++ return os; ++ } ++ long len1 = value.toLong(0); ++ long len2 = value.toLong(1); ++ ++ Rational fno1 = value.toRational(2); ++ Rational fno2 = value.toRational(3); ++ os << len1; ++ if (len2 != len1) { ++ os << "-" << len2; ++ } ++ os << "mm "; ++ std::ostringstream oss; ++ oss.copyfmt(os); ++ os << "F" << std::setprecision(2) ++ << static_cast(fno1.first) / fno1.second; ++ if (fno2 != fno1) { ++ os << "-" << std::setprecision(2) ++ << static_cast(fno2.first) / fno2.second; + } ++ os.copyfmt(oss); + return os; + } diff --git a/source/lib-extra/exiv2/gcc43.patch b/source/lib-extra/exiv2/gcc43.patch new file mode 100644 index 0000000..c98d217 --- /dev/null +++ b/source/lib-extra/exiv2/gcc43.patch @@ -0,0 +1,200 @@ +Index: config/config.mk.in +=================================================================== +--- config/config.mk.in (revision 1401) ++++ config/config.mk.in (revision 1402) +@@ -58,7 +58,7 @@ + # Common compiler flags (warnings, symbols [-ggdb], optimization [-O2], etc) + CXXFLAGS = @CXXFLAGS@ + ifeq ($(GXX),yes) +- CXXFLAGS += -Wall -Wcast-align -Wconversion -Wpointer-arith -Wformat-security -Wmissing-format-attribute -W ++ CXXFLAGS += -Wall -Wcast-align -Wpointer-arith -Wformat-security -Wmissing-format-attribute -W + endif + + # Command to run only the preprocessor +Index: xmpsdk/src/XMPCore_Impl.hpp +=================================================================== +--- xmpsdk/src/XMPCore_Impl.hpp (revision 1401) ++++ xmpsdk/src/XMPCore_Impl.hpp (revision 1402) +@@ -24,6 +24,7 @@ + #include + + #include ++#include + + #if XMP_MacBuild + #include +Index: src/tiffparser.cpp +=================================================================== +--- src/tiffparser.cpp (revision 1401) ++++ src/tiffparser.cpp (revision 1402) +@@ -148,9 +148,9 @@ + { "*", 0x8649, Group::ifd0, &TiffMetadataDecoder::decodeIptc } + }; + +- const DecoderFct TiffDecoder::findDecoder(const std::string& make, +- uint32_t extendedTag, +- uint16_t group) ++ DecoderFct TiffDecoder::findDecoder(const std::string& make, ++ uint32_t extendedTag, ++ uint16_t group) + { + DecoderFct decoderFct = &TiffMetadataDecoder::decodeStdTiffEntry; + const TiffDecoderInfo* td = find(tiffDecoderInfo_, +Index: src/exif.cpp +=================================================================== +--- src/exif.cpp (revision 1401) ++++ src/exif.cpp (revision 1402) +@@ -959,7 +959,7 @@ + + pGpsIfd_->dataSize()); + } + if ( maxOffset > pIfd1_->offset() +- || maxOffset > pIfd1_->dataOffset() && pIfd1_->dataOffset() > 0) ++ || (maxOffset > pIfd1_->dataOffset() && pIfd1_->dataOffset() > 0)) + rc = false; + /* + Todo: Removed condition from the above if(). Should be re-added... +Index: src/cr2image.hpp +=================================================================== +--- src/cr2image.hpp (revision 1401) ++++ src/cr2image.hpp (revision 1402) +@@ -137,9 +137,9 @@ + + @return Pointer to the decoder function + */ +- static const DecoderFct findDecoder(const std::string& make, +- uint32_t extendedTag, +- uint16_t group); ++ static DecoderFct findDecoder(const std::string& make, ++ uint32_t extendedTag, ++ uint16_t group); + + private: + static const TiffDecoderInfo cr2DecoderInfo_[]; //(header_.pData_), 8) ++ || ( std::string(reinterpret_cast(header_.pData_), 8) + != std::string("SIGMA\0\0\0", 8) +- && std::string(reinterpret_cast(header_.pData_), 8) +- != std::string("FOVEON\0\0", 8)) { ++ && std::string(reinterpret_cast(header_.pData_), 8) ++ != std::string("FOVEON\0\0", 8))) { + rc = 2; + } + return rc; From ryuo at frugalware.org Wed Jun 11 12:42:51 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 11 12:42:53 2008 Subject: [Frugalware-git] frugalware-current: echinus-0.2.8-1-i686 Message-ID: <20080611104251.F13171770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=96d6a584d139badaf8048ed58cf1c77705c997b2 commit 96d6a584d139badaf8048ed58cf1c77705c997b2 Author: James Buren Date: Wed Jun 11 05:40:58 2008 -0500 echinus-0.2.8-1-i686 * new package diff --git a/source/x11-extra/echinus/FrugalBuild b/source/x11-extra/echinus/FrugalBuild new file mode 100644 index 0000000..999d617 --- /dev/null +++ b/source/x11-extra/echinus/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=echinus +pkgver=0.2.8 +pkgrel=1 +pkgdesc="A minimal WM supporting floating, tiled, and maximized layouts." +url="http://www.rootshell.be/~polachok/code" +depends=('libxft' 'zlib') +groups=('x11-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url" +source=($url/$pkgname-$pkgver.tar.gz) +sha1sums=('019e0508173ac5ca6b8d51bcc08c803f6a55ea6c') + +build() +{ + Fsed "-Os" "${CFLAGS}" config.mk + Fmake + Fexerel /usr/bin/$pkgname + Fmanrel $pkgname.1 + Ffilerel *.xbm /usr/share/$pkgname + Ffilerel /usr/share/$pkgname/${pkgname}rc +} + +# optimization OK diff --git a/source/x11-extra/echinus/README.Frugalware b/source/x11-extra/echinus/README.Frugalware new file mode 100644 index 0000000..9942f0b --- /dev/null +++ b/source/x11-extra/echinus/README.Frugalware @@ -0,0 +1,9 @@ +Be sure to copy the contents of /usr/share/echinus to $HOME/.echinus or +~/.echinus in order to setup the defaults for this window manager properly. If +you need more specific instructions, please use these commands below to +accomplish this task. + +(Run these as the user your wanting to run echinus as.) + +mkdir -p ~/.echinus +cp -r /usr/share/echinus/* ~/.echinus From ryuo at frugalware.org Wed Jun 11 12:51:16 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 11 12:51:18 2008 Subject: [Frugalware-git] frugalware-current: lilo-22.8-1-i686 Message-ID: <20080611105116.9FBBD1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=78abb016e49d0fc8a4498c2c23f85ee2d79774e6 commit 78abb016e49d0fc8a4498c2c23f85ee2d79774e6 Author: James Buren Date: Wed Jun 11 05:49:54 2008 -0500 lilo-22.8-1-i686 * removed the presence of README.Frugalware from the FrugalBuild, * seeing as hows its not necessary diff --git a/source/base-extra/lilo/FrugalBuild b/source/base-extra/lilo/FrugalBuild index d3010c7..89fc6ab 100644 --- a/source/base-extra/lilo/FrugalBuild +++ b/source/base-extra/lilo/FrugalBuild @@ -13,16 +13,14 @@ archs=('i686') backup=('etc/lilo.conf') options=('nobuild') up2date="Flastarchive $url .src.tar.gz" -source=($url/$pkgname-$pkgver.src.tar.gz README.Frugalware lilo.conf) +source=($url/$pkgname-$pkgver.src.tar.gz lilo.conf) sha1sums=('59852eab59b93dcea63b39eef1db7963b7268b0d' \ - 'f0dc15f59ff37a21abb555d35702a878217cb2ce' \ '4c2d018ae8a2e928cca4af077d114b80443e4854') build() { Fcd make CC="gcc $CFLAGS" all || Fdie make ROOT=$Fdestdir install || Fdie - Fdoc README.Frugalware Ffile /etc/lilo.conf } From crazy at frugalware.org Wed Jun 11 13:10:07 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 11 13:10:08 2008 Subject: [Frugalware-git] frugalware-current: sonata-1.5.2-1-x86_64 Message-ID: <20080611111007.594971770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c18615b26eacfde06edfc0978760168a370e382a commit c18615b26eacfde06edfc0978760168a370e382a Author: crazy Date: Wed Jun 11 13:09:16 2008 +0200 sonata-1.5.2-1-x86_64 * Version bump diff --git a/source/xapps-extra/sonata/FrugalBuild b/source/xapps-extra/sonata/FrugalBuild index 7e459a1..d4c6c8e 100644 --- a/source/xapps-extra/sonata/FrugalBuild +++ b/source/xapps-extra/sonata/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: detto pkgname=sonata -pkgver=1.5.1 -pkgrel=3 +pkgver=1.5.2 +pkgrel=1 pkgdesc="Sonata is a lightweight GTK+ music client for the Music Player Daemon (MPD)." _F_berlios_ext=".tar.bz2" Finclude berlios @@ -12,6 +12,6 @@ depends=('mpd' 'pygtk' 'python-mpd' 'dbus-python') options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('5217600d20c71a0bafd0899e5b38e437bcc20bd7') +sha1sums=('0d6e514a7f5ae025fa96532613d1f70e3d3e2d10') # optimization OK From ryuo at frugalware.org Wed Jun 11 13:16:23 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 11 13:16:24 2008 Subject: [Frugalware-git] frugalware-current: ourico-0.1.5-1-i686 Message-ID: <20080611111623.797A31778001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c143477be6047853179ead0b68631a9a38190991 commit c143477be6047853179ead0b68631a9a38190991 Author: James Buren Date: Wed Jun 11 06:15:34 2008 -0500 ourico-0.1.5-1-i686 * (why is it asking me again?) diff --git a/source/x11-extra/ourico/FrugalBuild b/source/x11-extra/ourico/FrugalBuild index 8181e6a..b1ec134 100644 --- a/source/x11-extra/ourico/FrugalBuild +++ b/source/x11-extra/ourico/FrugalBuild @@ -22,3 +22,5 @@ build() Fsed "snap" "fixed" ${pkgname}rc Ffilerel /usr/share/$pkgname/${pkgname}rc } + +# optimization OK From ryuo at frugalware.org Wed Jun 11 13:16:23 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 11 13:16:25 2008 Subject: [Frugalware-git] frugalware-current: ourico-0.1.5-1-i686 Message-ID: <20080611111623.5CA421770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f35d94a2a4cc6850fb210c1bec4ed73468fcc1f commit 1f35d94a2a4cc6850fb210c1bec4ed73468fcc1f Author: James Buren Date: Wed Jun 11 06:12:31 2008 -0500 ourico-0.1.5-1-i686 * new package diff --git a/source/x11-extra/ourico/FrugalBuild b/source/x11-extra/ourico/FrugalBuild new file mode 100644 index 0000000..8181e6a --- /dev/null +++ b/source/x11-extra/ourico/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=ourico +pkgver=0.1.5 +pkgrel=1 +pkgdesc="A simple EWMH taskbar, with only a workspace switcher & window list." +url="http://www.rootshell.be/~polachok/code" +depends=('libxft' 'zlib') +groups=('x11-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url" +source=($url/$pkgname-$pkgver.tar.gz) +sha1sums=('6f635a05ebf1a8f9240da2c42dfb25ccfec64510') + +build() +{ + Fsed "-Os" "${CFLAGS}" config.mk + Fmake + Fexerel /usr/bin/$pkgname + # change font to avoid segfault on default config + Fsed "snap" "fixed" ${pkgname}rc + Ffilerel /usr/share/$pkgname/${pkgname}rc +} From janny at frugalware.org Wed Jun 11 13:54:47 2008 From: janny at frugalware.org (Janos Kovacs) Date: Wed Jun 11 13:54:50 2008 Subject: [Frugalware-git] frugalware-current: gadmin-rsync-0.1.0-1-i686 Message-ID: <20080611115447.E75061770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c4735afb52e61f39dbf5ed26ada083d5c0013472 commit c4735afb52e61f39dbf5ed26ada083d5c0013472 Author: Janos Kovacs Date: Wed Jun 11 13:54:18 2008 +0200 gadmin-rsync-0.1.0-1-i686 * version bump diff --git a/source/xapps-extra/gadmin-rsync/FrugalBuild b/source/xapps-extra/gadmin-rsync/FrugalBuild index 733f23b..6d5af48 100644 --- a/source/xapps-extra/gadmin-rsync/FrugalBuild +++ b/source/xapps-extra/gadmin-rsync/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Janos Kovacs pkgname=gadmin-rsync -pkgver=0.0.9 +pkgver=0.1.0 pkgrel=1 pkgdesc="An easy to use GTK+ administration tool for SQUID" url="http://www.gadmintools.org/" @@ -12,7 +12,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://mange.dynalias.org/linux/${pkgname}/|Flasttar" source=(http://mange.dynalias.org/linux/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('9452dc5d4d92bce7cfcdc540e073826d6ffbe0c7') +sha1sums=('f18552842d492b08ca8bfc80a1e68617de274219') build() { From crazy at frugalware.org Wed Jun 11 14:02:22 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 11 14:02:23 2008 Subject: [Frugalware-git] frugalware-current: bochs-2.3.7-2-x86_64 Message-ID: <20080611120222.865BF1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=961c32a16ebcc4fc05a292358d1455f69a1d9b76 commit 961c32a16ebcc4fc05a292358d1455f69a1d9b76 Author: crazy Date: Wed Jun 11 14:01:11 2008 +0200 bochs-2.3.7-2-x86_64 * release bump * added patch to fix the build diff --git a/source/xapps-extra/bochs/FrugalBuild b/source/xapps-extra/bochs/FrugalBuild index e3d7d1a..0b753bd 100644 --- a/source/xapps-extra/bochs/FrugalBuild +++ b/source/xapps-extra/bochs/FrugalBuild @@ -3,7 +3,7 @@ pkgname=bochs pkgver=2.3.7 -pkgrel=1 +pkgrel=2 pkgdesc="A highly portable open source IA-32 (x86) PC emulator." depends=('sdl' 'wxgtk>=2.8.7' 'libx11' 'libxpm') makedepends=('xproto') @@ -11,10 +11,11 @@ groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') Finclude sourceforge -source=($source build-fix.patch) +source=($source build-fix.patch bochs-2.3.7-typos.patch) up2date="lynx -dump http://bochs.sourceforge.net/|grep -1 Current|sed -n 's/.*s \(.*\)/\1/;3 p'" sha1sums=('e687c697a8be8396ae75106d0cd6149bd52ca67d' \ - '3e37675ce43d953fd801b07b759c4bfd01916db3') + '3e37675ce43d953fd801b07b759c4bfd01916db3' \ + 'c55f317484117dfa59c71e95f95aed4d700d1bb4') [ "$CARCH" == "x86_64" ] && Fconfopts="$Fconfopts --enable-sse=2 --enable-3dnow --enable-x86-64" diff --git a/source/xapps-extra/bochs/bochs-2.3.7-typos.patch b/source/xapps-extra/bochs/bochs-2.3.7-typos.patch new file mode 100644 index 0000000..c9fb168 --- /dev/null +++ b/source/xapps-extra/bochs/bochs-2.3.7-typos.patch @@ -0,0 +1,24 @@ +diff -NaurwB bochs-2.3.7.orig/cpu/ia_opcodes.h bochs-2.3.7/cpu/ia_opcodes.h +--- bochs-2.3.7.orig/cpu/ia_opcodes.h 2008-05-30 22:35:08.000000000 +0200 ++++ bochs-2.3.7/cpu/ia_opcodes.h 2008-06-04 14:56:46.000000000 +0200 +@@ -891,7 +891,7 @@ + bx_define_opcode(BX_IA_PF2ID_PqQq, BX_CPU_C::PF2ID_PqQq) + bx_define_opcode(BX_IA_PF2IW_PqQq, BX_CPU_C::PF2IW_PqQq) + bx_define_opcode(BX_IA_PFACC_PqQq, BX_CPU_C::PFACC_PqQq) +-bx_define_opcode(BX_IA_PFADD_PqQq, BX_CPU_C::BX_PFADD_PqQq) ++bx_define_opcode(BX_IA_PFADD_PqQq, BX_CPU_C::PFADD_PqQq) + bx_define_opcode(BX_IA_PFCMPEQ_PqQq, BX_CPU_C::PFCMPEQ_PqQq) + bx_define_opcode(BX_IA_PFCMPGE_PqQq, BX_CPU_C::PFCMPGE_PqQq) + bx_define_opcode(BX_IA_PFCMPGT_PqQq, BX_CPU_C::PFCMPGT_PqQq) +diff -NaurwB bochs-2.3.7.orig/iodev/iodebug.h bochs-2.3.7/iodev/iodebug.h +--- bochs-2.3.7.orig/iodev/iodebug.h 2008-05-01 22:46:58.000000000 +0200 ++++ bochs-2.3.7/iodev/iodebug.h 2008-06-04 14:45:50.000000000 +0200 +@@ -18,7 +18,7 @@ + virtual void init(void); + virtual void reset (unsigned type) {} + static void mem_write(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, void *data); +- static void mem_read(BX_CPU_C *cpu, bx_phy_addressu addr, unsigned len, void *data); ++ static void mem_read(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, void *data); + + private: + static Bit32u read_handler(void *this_ptr, Bit32u address, unsigned io_len); From vmiklos at frugalware.org Wed Jun 11 14:29:18 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 11 14:29:19 2008 Subject: [Frugalware-git] frugalware-current: libotr-3.1.0-1-i686 Message-ID: <20080611122918.266E91770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8725ae54d9b5f9f24f6c5310a2c8a770a3c63026 commit 8725ae54d9b5f9f24f6c5310a2c8a770a3c63026 Author: Miklos Vajna Date: Wed Jun 11 14:29:07 2008 +0200 libotr-3.1.0-1-i686 - new package diff --git a/source/network-extra/libotr/FrugalBuild b/source/network-extra/libotr/FrugalBuild new file mode 100644 index 0000000..421376c --- /dev/null +++ b/source/network-extra/libotr/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.08 SBU +# Maintainer: VMiklos + +pkgname=libotr +pkgver=3.1.0 +pkgrel=1 +pkgdesc="Off-the-Record (OTR) Messaging Library." +url="http://www.cypherpunks.ca/otr/" +depends=('libgcrypt') +groups=('network-extra') +archs=('i686') +up2date="Flasttar $url" +source=(http://www.cypherpunks.ca/otr/libotr-$pkgver.tar.gz) +signatures=($source.asc) +# optimization OK From vmiklos at frugalware.org Wed Jun 11 14:57:26 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 11 14:57:28 2008 Subject: [Frugalware-git] pacman-g2: makepkg: properly espace '; ' in filename when checking for rsync cache Message-ID: <20080611125726.DF0C51770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=4b53458c32bcd912476af3a3113925392016f803 commit 4b53458c32bcd912476af3a3113925392016f803 Author: Miklos Vajna Date: Wed Jun 11 14:57:25 2008 +0200 makepkg: properly espace ';' in filename when checking for rsync cache diff --git a/scripts/makepkg b/scripts/makepkg index 475defb..9606320 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -1285,7 +1285,7 @@ for netfile in "${source[@]}" "${signatures[@]}"; do # try to download the file from the cache server if [ -n "$RSYNCAGENT" -a -n "$CACHEURL" ]; then # check if the file is there - eval $RSYNCAGENT $CACHEURL/$file &>/dev/null + eval $RSYNCAGENT $CACHEURL/${file/;/\;} &>/dev/null if [ "$?" = "0" ]; then eval $RSYNCAGENT $CACHEURL/$file ./ if [ ! -f "$file" ]; then From vmiklos at frugalware.org Wed Jun 11 15:08:30 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 11 15:08:32 2008 Subject: [Frugalware-git] pacman-g2: makepkg: there were an other unescaped place as well Message-ID: <20080611130830.CE1B81770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=d5378d8ad383106b7c3dbc4f5ceaa8578f02a907 commit d5378d8ad383106b7c3dbc4f5ceaa8578f02a907 Author: Miklos Vajna Date: Wed Jun 11 15:08:30 2008 +0200 makepkg: there were an other unescaped place as well diff --git a/scripts/makepkg b/scripts/makepkg index 9606320..e1cf193 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -1285,9 +1285,9 @@ for netfile in "${source[@]}" "${signatures[@]}"; do # try to download the file from the cache server if [ -n "$RSYNCAGENT" -a -n "$CACHEURL" ]; then # check if the file is there - eval $RSYNCAGENT $CACHEURL/${file/;/\;} &>/dev/null + eval $RSYNCAGENT $CACHEURL/${file//;/\\\;} &>/dev/null if [ "$?" = "0" ]; then - eval $RSYNCAGENT $CACHEURL/$file ./ + eval $RSYNCAGENT $CACHEURL/${file//;/\\\;} ./ if [ ! -f "$file" ]; then error "Failed to download $file from cache while it is there" msg "Aborting..." From vmiklos at frugalware.org Wed Jun 11 15:35:40 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 11 15:35:41 2008 Subject: [Frugalware-git] frugalware-current: irssi-0.8.12-4-i686 Message-ID: <20080611133540.7AED41770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7d1da62ed3d0c3bae654232a329a0848b1cb90d1 commit 7d1da62ed3d0c3bae654232a329a0848b1cb90d1 Author: Miklos Vajna Date: Wed Jun 11 15:35:24 2008 +0200 irssi-0.8.12-4-i686 - install missing headers diff --git a/source/network/irssi/FrugalBuild b/source/network/irssi/FrugalBuild index 3772732..1a9a5cb 100644 --- a/source/network/irssi/FrugalBuild +++ b/source/network/irssi/FrugalBuild @@ -4,7 +4,7 @@ pkgname=irssi pkgver=0.8.12 pkgexver= -pkgrel=3 +pkgrel=4 pkgdesc="Irssi is a modular IRC client for UNIX that currently has only text mode user interface" url="http://irssi.org" groups=('network') @@ -15,5 +15,11 @@ makedepends=('perl>=5.10.0') up2date="lynx -dump $url/download |grep Latest|sed 's/.*: //;s/$pkgexver//;q'" source=(http://irssi.org/files/irssi-$pkgver.tar.bz2) sha1sums=('00ecca04766c51feef057b2327f67166be473fa3') -Fconfopts="$Fconfopts --with-proxy --enable-ipv6 --with-bot" # optimization OK + +build() +{ + Fbuild --with-proxy --enable-ipv6 --with-bot + # see http://bugs.irssi.org/index.php?do=details&task_id=535 + Ffilerel src/fe-text/{mainwindows,term,statusbar}.h /usr/include/irssi/src/fe-text/ +} From ryuo at frugalware.org Wed Jun 11 15:49:17 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 11 15:49:18 2008 Subject: [Frugalware-git] frugalware-current: artwiz-fonts-1.3-1-i686 Message-ID: <20080611134917.486541770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bcdc9e5e7c1cc2805607034e76adc77b71b70f7d commit bcdc9e5e7c1cc2805607034e76adc77b71b70f7d Author: James Buren Date: Wed Jun 11 08:47:42 2008 -0500 artwiz-fonts-1.3-1-i686 * new package diff --git a/source/xlib-extra/artwiz-fonts/FrugalBuild b/source/xlib-extra/artwiz-fonts/FrugalBuild new file mode 100644 index 0000000..15eb8ae --- /dev/null +++ b/source/xlib-extra/artwiz-fonts/FrugalBuild @@ -0,0 +1,25 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=artwiz-fonts +pkgver=1.3 +pkgrel=1 +pkgdesc="A set of fonts known as artwiz." +_F_sourceforge_name=artwiz-aleczapka-en +_F_sourceforge_dirname=artwizaleczapka +_F_sourceforge_ext=.tar.bz2 +Finclude sourceforge +rodepends=('mkfontscale' 'mkfontdir' 'fontconfig') +depends=() +groups=('xlib-extra') +archs=('i686' 'x86_64') +sha1sums=('81e711b5f00816c57e205c9e60f69237c709679d') + +build() +{ + Fcd $_F_sourceforge_name-$_F_sourceforge_pkgver + # compress fonts + gzip -9f *.pcf || Fdie + Ffilerel *.pcf.gz /usr/lib/X11/fonts/$pkgname +} + diff --git a/source/xlib-extra/artwiz-fonts/artwiz-fonts.install b/source/xlib-extra/artwiz-fonts/artwiz-fonts.install new file mode 100644 index 0000000..d599632 --- /dev/null +++ b/source/xlib-extra/artwiz-fonts/artwiz-fonts.install @@ -0,0 +1,20 @@ +post_install() { + echo -n "Updating font cache... " + mkfontscale /usr/lib/X11/fonts/artwiz-fonts + mkfontdir /usr/lib/X11/fonts/artwiz-fonts + fc-cache -f /usr/lib/X11/fonts/artwiz-fonts + echo "done." +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +op=$1 +shift + +$op $* From ryuo at frugalware.org Wed Jun 11 16:41:57 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 11 16:41:59 2008 Subject: [Frugalware-git] frugalware-current: icewm-1.2.35-2-i686 Message-ID: <20080611144157.198E11770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c2f1bcec2238fa78ebb03a79bb08c12083f211b3 commit c2f1bcec2238fa78ebb03a79bb08c12083f211b3 Author: James Buren Date: Wed Jun 11 09:37:09 2008 -0500 icewm-1.2.35-2-i686 * finalized move * adjusted depends slightly * adjusted build options slightly diff --git a/source/x11-extra/icewm/FrugalBuild b/source/x11-extra/icewm/FrugalBuild index 8ec09df..709277a 100644 --- a/source/x11-extra/icewm/FrugalBuild +++ b/source/x11-extra/icewm/FrugalBuild @@ -3,10 +3,10 @@ pkgname=icewm pkgver=1.2.35 -pkgrel=1 +pkgrel=2 pkgdesc="A window manager, whose goal is speed and simplicity." pkgdesc_localized=('hu_HU Egy ablakkezel, melynek clja a sebessg s az egyszersg.') -depends=('libsm' 'libxinerama' 'libstdc++' 'imlib' 'libxft' 'libpng' 'libxrandr') +depends=('libxinerama' 'libsm' 'libxrandr' 'libxft' 'zlib' 'imlib' 'libstdc++') groups=('x11-extra') archs=('i686' 'x86_64') Finclude sourceforge @@ -17,8 +17,10 @@ sha1sums=('a0174901ca89aa091a58efedfec1536c5e477210' \ build() { - Fmake --enable-shaped-decorations --enable-gradients --with-imlib + Fmake --enable-shaped-decorations --enable-gradients --with-imlib \ + --enable-guievents --enable-corefonts Fmakeinstall install-docs Ffile /etc/X11/sessions/icewm.desktop Fexe /etc/X11/xinit/xinitrc.icewm } + From vmiklos at frugalware.org Wed Jun 11 16:42:21 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 11 16:42:25 2008 Subject: [Frugalware-git] frugalware-current: irssi-0.8.12-5-i686 Message-ID: <20080611144221.D33841770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d7ffea8a51ca1acc4b1f6daf17881b4cfd202814 commit d7ffea8a51ca1acc4b1f6daf17881b4cfd202814 Author: Miklos Vajna Date: Wed Jun 11 16:42:00 2008 +0200 irssi-0.8.12-5-i686 - fix up broken mainwindows header diff --git a/source/network/irssi/FrugalBuild b/source/network/irssi/FrugalBuild index 1a9a5cb..08dce3a 100644 --- a/source/network/irssi/FrugalBuild +++ b/source/network/irssi/FrugalBuild @@ -4,7 +4,7 @@ pkgname=irssi pkgver=0.8.12 pkgexver= -pkgrel=4 +pkgrel=5 pkgdesc="Irssi is a modular IRC client for UNIX that currently has only text mode user interface" url="http://irssi.org" groups=('network') @@ -21,5 +21,7 @@ build() { Fbuild --with-proxy --enable-ipv6 --with-bot # see http://bugs.irssi.org/index.php?do=details&task_id=535 + Fsed '"fe-windows.h"' '' src/fe-text/mainwindows.h + Fsed '"term.h"' '' src/fe-text/mainwindows.h Ffilerel src/fe-text/{mainwindows,term,statusbar}.h /usr/include/irssi/src/fe-text/ } From vmiklos at frugalware.org Wed Jun 11 16:56:04 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 11 16:56:06 2008 Subject: [Frugalware-git] frugalware-current: imlib2-1.4.1-1-i686 Message-ID: <20080611145604.E0FD81770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7f52d0eccc03fc802e77f1baf78f48e4c7592bda commit 7f52d0eccc03fc802e77f1baf78f48e4c7592bda Author: Miklos Vajna Date: Wed Jun 11 16:49:21 2008 +0200 imlib2-1.4.1-1-i686 - version bump diff --git a/source/xlib/imlib2/CVE-2008-2426.patch b/source/xlib/imlib2/CVE-2008-2426.patch deleted file mode 100644 index 87269fd..0000000 --- a/source/xlib/imlib2/CVE-2008-2426.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff -Nur imlib2-1.2.1/src/modules/loaders/loader_argb.c imlib2-1.2.1.new/src/modules/loaders/loader_argb.c ---- imlib2-1.2.1/src/modules/loaders/loader_argb.c 2006-11-06 01:27:59.000000000 -0800 -+++ imlib2-1.2.1.new/src/modules/loaders/loader_argb.c 2006-11-06 01:30:41.000000000 -0800 -@@ -23,7 +23,7 @@ - load(ImlibImage * im, ImlibProgressFunction progress, - char progress_granularity, char immediate_load) - { -- int w, h, alpha; -+ int w=0, h=0, alpha=0; - FILE *f; - - if (im->data) -@@ -36,6 +36,8 @@ - { - char buf[256], buf2[256]; - -+ memset(buf, 0, sizeof(buf)); -+ memset(buf2, 0, sizeof(buf)); - if (!fgets(buf, 255, f)) - { - fclose(f); -diff -Nur imlib2-1.2.1/src/modules/loaders/loader_jpeg.c imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c ---- imlib2-1.2.1/src/modules/loaders/loader_jpeg.c 2006-11-06 01:27:59.000000000 -0800 -+++ imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c 2006-11-06 01:33:01.000000000 -0800 -@@ -104,8 +104,9 @@ - im->w = w = cinfo.output_width; - im->h = h = cinfo.output_height; - -- if (cinfo.rec_outbuf_height > 16) -+ if (cinfo.rec_outbuf_height > 16 || w < 1 || h < 1 || w > 16383 || h > 16383) - { -+ im->w = im->h = 0; - jpeg_destroy_decompress(&cinfo); - fclose(f); - return 0; -diff -Nur imlib2-1.2.1/src/modules/loaders/loader_lbm.c imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c ---- imlib2-1.2.1/src/modules/loaders/loader_lbm.c 2006-11-06 01:27:59.000000000 -0800 -+++ imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c 2006-11-06 01:30:41.000000000 -0800 -@@ -453,6 +453,7 @@ - } - } - if (!full || !ok) { -+ im->w = im->h = 0; - freeilbm(&ilbm); - return ok; - } -@@ -467,12 +468,13 @@ - cancel = 0; - plane[0] = NULL; - -+ n = ilbm.depth; -+ if (ilbm.mask == 1) n++; -+ - im->data = malloc(im->w * im->h * sizeof(DATA32)); -- if (im->data) { -- n = ilbm.depth; -- if (ilbm.mask == 1) n++; -+ plane[0] = malloc(((im->w + 15) / 16) * 2 * n); -+ if (im->data && plane[0]) { - -- plane[0] = malloc(((im->w + 15) / 16) * 2 * n); - for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2; - - z = ((im->w + 15) / 16) * 2 * n; -@@ -511,6 +513,7 @@ - * the memory for im->data. - *----------*/ - if (!ok) { -+ im->w = im->h = 0; - if (im->data) free(im->data); - im->data = NULL; - } -diff -Nur imlib2-1.2.1/src/modules/loaders/loader_pnm.c imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c ---- imlib2-1.2.1/src/modules/loaders/loader_pnm.c 2006-11-06 01:27:59.000000000 -0800 -+++ imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c 2006-11-06 01:30:41.000000000 -0800 -@@ -80,7 +80,7 @@ - int i = 0; - - /* read numbers */ -- while (c != EOF && !isspace(c)) -+ while (c != EOF && i+1 < sizeof(buf) && !isspace(c)) - { - buf[i++] = c; - c = fgetc(f); -diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tga.c imlib2-1.2.1.new/src/modules/loaders/loader_tga.c ---- imlib2-1.2.1/src/modules/loaders/loader_tga.c 2006-11-06 01:27:59.000000000 -0800 -+++ imlib2-1.2.1.new/src/modules/loaders/loader_tga.c 2006-11-06 01:30:41.000000000 -0800 -@@ -365,7 +369,9 @@ - else - dataptr = im->data + (y * im->w); - -- for (x = 0; x < im->w; x++) /* for each pixel in the row */ -+ for (x = 0; -+ x < im->w && bufptr+bpp/8 < bufend; -+ x++) /* for each pixel in the row */ - { - switch (bpp) - { diff --git a/source/xlib/imlib2/FrugalBuild b/source/xlib/imlib2/FrugalBuild index b1ecb0d..a9bb854 100644 --- a/source/xlib/imlib2/FrugalBuild +++ b/source/xlib/imlib2/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=imlib2 -pkgver=1.4.0 -pkgrel=2 +pkgver=1.4.1 +pkgrel=1 pkgdesc="Imlib 2 is the successor to Imlib, it is NOT a newer version" _F_sourceforge_dirname="enlightenment" Finclude sourceforge @@ -13,9 +13,7 @@ depends=('libtiff' 'freetype2' 'libxext' 'libjpeg' \ groups=('xlib') archs=('i686' 'x86_64') up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=2 |grep imlib2-src |sed 's/.*]\([0-9\.]*\) [A-Z].*/\1/;q'" -source=($source CVE-2008-2426.patch) -sha1sums=('2bbd65b82a690d21dab2bfeb33cc370f6bb49393' \ - 'ce2a8c515e9f16bffcb996a6e9171e3832a94323') +sha1sums=('d1894311e9e84015a0a9451748f6f37387fe693d') if [ "$CARCH" != "x86_64" ]; then Fconfopts="$Fconfopts --enable-mmx" From vmiklos at frugalware.org Wed Jun 11 16:56:05 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 11 16:56:07 2008 Subject: [Frugalware-git] frugalware-current: cdparanoia-10.0-1-i686 Message-ID: <20080611145605.0C90F1778001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6704df65016dde14dfed00d8d30664f44e80a464 commit 6704df65016dde14dfed00d8d30664f44e80a464 Author: Miklos Vajna Date: Wed Jun 11 16:55:56 2008 +0200 cdparanoia-10.0-1-i686 - version bump diff --git a/source/multimedia/cdparanoia/FrugalBuild b/source/multimedia/cdparanoia/FrugalBuild index 978925b..59d0426 100644 --- a/source/multimedia/cdparanoia/FrugalBuild +++ b/source/multimedia/cdparanoia/FrugalBuild @@ -2,24 +2,19 @@ # Maintainer: VMiklos pkgname=cdparanoia -pkgver=9.8 -pkgrel=4 +pkgver=10.0 +pkgrel=1 pkgdesc="A CD ripping application" url="http://www.xiph.org/paranoia" depends=('glibc') groups=('multimedia') archs=('i686' 'x86_64') -_F_cd_path="cdparanoia-III-alpha$pkgver" -up2date="lynx -dump http://www.xiph.org/paranoia/|grep stable|tr -s ' '|cut -d ' ' -f 8" -source=(http://www.xiph.org/paranoia/download/cdparanoia-III-alpha$pkgver.src.tgz \ - $pkgname-$pkgver-gcc34.diff as-needed.patch) -sha1sums=('04cc33a7d22d6255f6239e3e74195506b3bdde06'\ - 'e10701e9fb505e604b802e94d8964c6288aa2ad8'\ - '003522d086c9076b30170f231cf82706c5da5088') +_F_archive_name="cdparanoia-III" +up2date="Flastarchive http://downloads.xiph.org/releases/cdparanoia/ .src.tgz" +source=(http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz) +sha1sums=('302efff74cfe5c73710b713dcfd93306b5c0ffc2') build() { - Fcd - Fpatchall Fconf ## Do _NOT_ remove this OPT=.. has default -O20 .. make OPT="${CFLAGS}" || Fdie diff --git a/source/multimedia/cdparanoia/as-needed.patch b/source/multimedia/cdparanoia/as-needed.patch deleted file mode 100644 index 6a98def..0000000 --- a/source/multimedia/cdparanoia/as-needed.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur cdparanoia-III-alpha9.8/paranoia/Makefile.in cdparanoia-III-alpha9.8-p/paranoia/Makefile.in ---- cdparanoia-III-alpha9.8/paranoia/Makefile.in 1999-12-14 05:28:04.000000000 +0100 -+++ cdparanoia-III-alpha9.8-p/paranoia/Makefile.in 2007-01-26 00:21:18.000000000 +0100 -@@ -44,7 +44,7 @@ - $(RANLIB) libcdda_paranoia.a - - libcdda_paranoia.so: $(OFILES) -- $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -+ $(CC) $(OFILES) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LDFLAGS) $(LIBFLAGS) $(LIBS) - [ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0 - [ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so - diff --git a/source/multimedia/cdparanoia/cdparanoia-9.8-gcc34.diff b/source/multimedia/cdparanoia/cdparanoia-9.8-gcc34.diff deleted file mode 100644 index cb4fe35..0000000 --- a/source/multimedia/cdparanoia/cdparanoia-9.8-gcc34.diff +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur cdparanoia-III-alpha9.8.orig/interface/utils.h cdparanoia-III-alpha9.8/interface/utils.h ---- cdparanoia-III-alpha9.8.orig/interface/utils.h 2000-04-20 00:41:04.000000000 +0200 -+++ cdparanoia-III-alpha9.8/interface/utils.h 2004-06-29 02:55:43.000000000 +0200 -@@ -112,6 +112,7 @@ - break; - case CDDA_MESSAGE_FORGETIT: - default: -+ ; - } - } - } -@@ -127,6 +128,7 @@ - break; - case CDDA_MESSAGE_FORGETIT: - default: -+ ; - } - } - } -@@ -169,6 +171,7 @@ - break; - case CDDA_MESSAGE_FORGETIT: - default: -+ ; - } - } - if(malloced)free(buffer); -@@ -205,6 +208,7 @@ - break; - case CDDA_MESSAGE_FORGETIT: - default: -+ ; - } - } - if(malloced)free(buffer); From vmiklos at frugalware.org Wed Jun 11 17:18:29 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 11 17:18:31 2008 Subject: [Frugalware-git] bmf: irssiotr-0.1_rc3-1-i686 Message-ID: <20080611151829.742EA1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=e07a09948674aa9a50b58a9c3ec63c300b5b9a48 commit e07a09948674aa9a50b58a9c3ec63c300b5b9a48 Author: Miklos Vajna Date: Wed Jun 11 17:18:11 2008 +0200 irssiotr-0.1_rc3-1-i686 - new package diff --git a/source/network-extra/irssiotr/FrugalBuild b/source/network-extra/irssiotr/FrugalBuild new file mode 100644 index 0000000..c397993 --- /dev/null +++ b/source/network-extra/irssiotr/FrugalBuild @@ -0,0 +1,35 @@ +# Compiling Time: 0.01 SBU +# Maintainer: VMiklos + +pkgname=irssiotr +pkgver=0.1_rc3 +pkgrel=1 +pkgdesc="Off-The-Record messaging (OTR) for Irssi." +url="http://projects.tuxfamily.org/group.pl?name=irssiotr" +depends=('irssi' 'libotr') +Finclude cmake +groups=('network-extra') +archs=('i686') +up2date="lynx -source -dump http://git.tuxfamily.org/irssiotr/irssiotr.git|grep tags|sed 's/.*tags\/v\([^>]*\).>.*/\1/;s/-/_/g;q'" +source=("http://git.tuxfamily.org/irssiotr/irssiotr.git?p=gitroot%2Firssiotr%2Firssiotr.git;a=snapshot;h=v${pkgver/_/-};sf=tgz") +sha1sums=('ca25868fcccec12395417b2b0c9539b31869c6f4') + +build() +{ + mv "`strip_url $source`" $pkgname-$pkgver.tar.gz + Fextract $pkgname-$pkgver.tar.gz + Fcd $pkgname + _F_cmake_confopts="-DIRSSIOTR_VERSION=$pkgver" + # prevent downlading these from SVN + cp -v /usr/include/irssi/src/fe-text/* . + # can be removed in the next version + Fsed 'IF (NOT EXISTS "mainwindows.h")' \ + 'IF (NOT EXISTS "mainwindows.h" AND NOT EXISTS "${PROJECT_SOURCE_DIR}/mainwindows.h")' CMakeLists.txt + CMake_build + make || return 1 + make DESTDIR=$Fdestdir install + # remove duplicated doc + Frm /usr/lib/irssi/share +} + +# optimization OK From ryuo at frugalware.org Wed Jun 11 17:27:46 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 11 17:27:48 2008 Subject: [Frugalware-git] frugalware-current: fvwm-2.4.20-1-i686 Message-ID: <20080611152746.CB3881778001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2a8f9cc37e4f1c98906a34b500b493004534feb0 commit 2a8f9cc37e4f1c98906a34b500b493004534feb0 Author: James Buren Date: Wed Jun 11 10:16:30 2008 -0500 fvwm-2.4.20-1-i686 * clean up diff --git a/source/xlib/fvwm/FrugalBuild b/source/xlib/fvwm/FrugalBuild deleted file mode 100644 index 40dd510..0000000 --- a/source/xlib/fvwm/FrugalBuild +++ /dev/null @@ -1,26 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: VMiklos - -pkgname=fvwm -pkgver=2.4.20 -pkgrel=1 -pkgdesc="An ICCCM-compliant multiple virtual desktop window manager." -pkgdesc_localized=('hu_HU Egy ICCCM-kompatibilis, tbb virtulis asztalt tmogat ablakkezel.') -url="http://www.fvwm.org" -depends=('libx11' 'libsm' 'libxinerama' 'libxpm' 'gtk+' 'imlib' 'termcap' 'readline') -groups=('xlib') -archs=('i686' 'x86_64') -up2date="lynx -dump $url|grep Stable|sed 's/.*]\(.*\)/\1/'|tr -d ' '" -source=(ftp://ftp.fvwm.org/pub/$pkgname/version-2/$pkgname-$pkgver.tar.gz xinitrc.$pkgname $pkgname.desktop) - -build() { - Fbuild --libexecdir=/usr/lib - Ffile /etc/X11/sessions/$pkgname.desktop - Fexe /etc/X11/xinit/xinitrc.$pkgname -} - -# optimization OK - -sha1sums=('2130a16590462cbbf15f255a46abe8b8a6cb4401' \ - '6ee65c9cb2ba144f47f8c619c8177607a248c5ab' \ - 'aac25fcdbbe3ef8c13d4eb92208b2e0d64fc4485') diff --git a/source/xlib/fvwm/fvwm.desktop b/source/xlib/fvwm/fvwm.desktop deleted file mode 100644 index 5ed6276..0000000 --- a/source/xlib/fvwm/fvwm.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=FVWM -Comment=An ICCCM-compliant multiple virtual desktop window manager. -Exec=fvwm -Icon= -Type=Application - diff --git a/source/xlib/fvwm/xinitrc.fvwm b/source/xlib/fvwm/xinitrc.fvwm deleted file mode 100644 index 1cc0454..0000000 --- a/source/xlib/fvwm/xinitrc.fvwm +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=/usr/X11R6/lib/X11/xinit/.Xresources -sysmodmap=/usr/X11R6/lib/X11/xinit/.Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f $userresources ]; then - xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - xmodmap $usermodmap -fi - -# start some nice programs - -fvwm From ryuo at frugalware.org Wed Jun 11 17:27:46 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 11 17:27:49 2008 Subject: [Frugalware-git] frugalware-current: fvwm-2.4.20-1-i686 Message-ID: <20080611152746.B58801770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d35096a0fefd66175558e2bef86bf7e35c86b9f7 commit d35096a0fefd66175558e2bef86bf7e35c86b9f7 Author: James Buren Date: Wed Jun 11 10:15:25 2008 -0500 fvwm-2.4.20-1-i686 * moved to x11-extra * taking over from vmiklos * updated SBU * adjusted depends * moved sha1sums * adjusted source array diff --git a/source/x11-extra/fvwm/FrugalBuild b/source/x11-extra/fvwm/FrugalBuild new file mode 100644 index 0000000..9ee74fc --- /dev/null +++ b/source/x11-extra/fvwm/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: 0.34 SBU +# Maintainer: James Buren + +pkgname=fvwm +pkgver=2.4.20 +pkgrel=1 +pkgdesc="An ICCCM-compliant multiple virtual desktop window manager." +pkgdesc_localized=('hu_HU Egy ICCCM-kompatibilis, tbb virtulis asztalt tmogat ablakkezel.') +url="http://www.fvwm.org" +depends=('libx11' 'libsm' 'libxinerama' 'libxpm' 'gtk+' 'imlib' 'termcap' 'readline' 'libstroke') +groups=('x11-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump $url|grep Stable|sed 's/.*]\(.*\)/\1/'|tr -d ' '" +source=(ftp://ftp.fvwm.org/pub/$pkgname/version-2/$pkgname-$pkgver.tar.gz \ + xinitrc.$pkgname $pkgname.desktop) +sha1sums=('2130a16590462cbbf15f255a46abe8b8a6cb4401' \ + '6ee65c9cb2ba144f47f8c619c8177607a248c5ab' \ + 'aac25fcdbbe3ef8c13d4eb92208b2e0d64fc4485') + +build() { + Fbuild --libexecdir=/usr/lib --enable-multibyte + Ffile /etc/X11/sessions/$pkgname.desktop + Fexe /etc/X11/xinit/xinitrc.$pkgname +} + +# optimization OK diff --git a/source/x11-extra/fvwm/fvwm.desktop b/source/x11-extra/fvwm/fvwm.desktop new file mode 100644 index 0000000..5ed6276 --- /dev/null +++ b/source/x11-extra/fvwm/fvwm.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=FVWM +Comment=An ICCCM-compliant multiple virtual desktop window manager. +Exec=fvwm +Icon= +Type=Application + diff --git a/source/x11-extra/fvwm/xinitrc.fvwm b/source/x11-extra/fvwm/xinitrc.fvwm new file mode 100644 index 0000000..1cc0454 --- /dev/null +++ b/source/x11-extra/fvwm/xinitrc.fvwm @@ -0,0 +1,29 @@ +#!/bin/sh +# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/usr/X11R6/lib/X11/xinit/.Xresources +sysmodmap=/usr/X11R6/lib/X11/xinit/.Xmodmap + +# merge in defaults and keymaps + +if [ -f $sysresources ]; then + xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f $userresources ]; then + xrdb -merge $userresources +fi + +if [ -f $usermodmap ]; then + xmodmap $usermodmap +fi + +# start some nice programs + +fvwm From ryuo at frugalware.org Wed Jun 11 17:27:46 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 11 17:27:50 2008 Subject: [Frugalware-git] frugalware-current: fvwm-2.4.20-2-i686 Message-ID: <20080611152746.D9F7617780AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9efcba4cd8ee115affa9bb7ae08cdaad2a182b1d commit 9efcba4cd8ee115affa9bb7ae08cdaad2a182b1d Author: James Buren Date: Wed Jun 11 10:17:59 2008 -0500 fvwm-2.4.20-2-i686 * pkgrel bump diff --git a/source/x11-extra/fvwm/FrugalBuild b/source/x11-extra/fvwm/FrugalBuild index 9ee74fc..2329fa8 100644 --- a/source/x11-extra/fvwm/FrugalBuild +++ b/source/x11-extra/fvwm/FrugalBuild @@ -3,7 +3,7 @@ pkgname=fvwm pkgver=2.4.20 -pkgrel=1 +pkgrel=2 pkgdesc="An ICCCM-compliant multiple virtual desktop window manager." pkgdesc_localized=('hu_HU Egy ICCCM-kompatibilis, tbb virtulis asztalt tmogat ablakkezel.') url="http://www.fvwm.org" From ryuo at frugalware.org Wed Jun 11 17:27:46 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 11 17:27:51 2008 Subject: [Frugalware-git] frugalware-current: fvwm-2.4.20-2-i686 Message-ID: <20080611152746.E596417A8006@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d3d2feb0cd16ce52ff127466953dd48e0e37abc6 commit d3d2feb0cd16ce52ff127466953dd48e0e37abc6 Author: James Buren Date: Wed Jun 11 10:24:40 2008 -0500 fvwm-2.4.20-2-i686 * adjusted depends again, sorry my bad. diff --git a/source/x11-extra/fvwm/FrugalBuild b/source/x11-extra/fvwm/FrugalBuild index 2329fa8..2bb24f7 100644 --- a/source/x11-extra/fvwm/FrugalBuild +++ b/source/x11-extra/fvwm/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=2 pkgdesc="An ICCCM-compliant multiple virtual desktop window manager." pkgdesc_localized=('hu_HU Egy ICCCM-kompatibilis, tbb virtulis asztalt tmogat ablakkezel.') url="http://www.fvwm.org" -depends=('libx11' 'libsm' 'libxinerama' 'libxpm' 'gtk+' 'imlib' 'termcap' 'readline' 'libstroke') +depends=('libxpm' 'libsm' 'libxcb' 'libstroke' 'libxinerama' 'readline' 'termcap' 'imlib') groups=('x11-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url|grep Stable|sed 's/.*]\(.*\)/\1/'|tr -d ' '" From vmiklos at frugalware.org Wed Jun 11 18:08:45 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 11 18:08:47 2008 Subject: [Frugalware-git] frugalware-current: cdparanoia-10.0-1-x86_64 Message-ID: <20080611160845.6B1F01770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b9863e903040b0f65585cfcb43de3ffea7075c25 commit b9863e903040b0f65585cfcb43de3ffea7075c25 Author: Miklos Vajna Date: Wed Jun 11 18:08:25 2008 +0200 cdparanoia-10.0-1-x86_64 - fix up x86_64 build diff --git a/source/multimedia/cdparanoia/FrugalBuild b/source/multimedia/cdparanoia/FrugalBuild index 59d0426..c7886ea 100644 --- a/source/multimedia/cdparanoia/FrugalBuild +++ b/source/multimedia/cdparanoia/FrugalBuild @@ -16,6 +16,7 @@ sha1sums=('302efff74cfe5c73710b713dcfd93306b5c0ffc2') build() { Fconf + [ "$CARCH" == "x86_64" ] && CFLAGS="$CFLAGS -fPIC" ## Do _NOT_ remove this OPT=.. has default -O20 .. make OPT="${CFLAGS}" || Fdie Fmakeinstall From ryuo at frugalware.org Wed Jun 11 18:40:09 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 11 18:40:11 2008 Subject: [Frugalware-git] frugalware-current: fxsudoku-0.5.1-2-i686 Message-ID: <20080611164009.41FAA1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4d493fb57002a83e257cb84b59da86ce29ce1a71 commit 4d493fb57002a83e257cb84b59da86ce29ce1a71 Author: James Buren Date: Wed Jun 11 11:38:20 2008 -0500 fxsudoku-0.5.1-2-i686 * add desktop file diff --git a/source/games-extra/fxsudoku/FrugalBuild b/source/games-extra/fxsudoku/FrugalBuild index b676369..8eaa4a6 100644 --- a/source/games-extra/fxsudoku/FrugalBuild +++ b/source/games-extra/fxsudoku/FrugalBuild @@ -3,12 +3,14 @@ pkgname=fxsudoku pkgver=0.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="A game of sudoku written with FOX." url="http://www.fifthplanet.net" depends=('fox' 'libxext' 'libxrender' 'fontconfig' 'zlib' 'libgl' 'libstdc++' 'libxfixes') groups=('games-extra') archs=('i686' 'x86_64') +_F_desktop_icon="$pkgname" +_F_desktop_categories="Games;" up2date="Flasttar $url" source=($url/files/$pkgname-$pkgver.tar.bz2) sha1sums=('2c612e55030e82cd1b70ab1f523075d90cfaccf4') @@ -21,6 +23,7 @@ build() Ffilerel /usr/share/fxsudoku/example.sdk # fix read permissions for auto-documentation chmod 644 {INSTALL,COPYING,ChangeLog} || Fdie + Fdesktop2 } From devil505linux at gmail.com Wed Jun 11 19:40:26 2008 From: devil505linux at gmail.com (Devil505) Date: Wed Jun 11 19:40:28 2008 Subject: [Frugalware-git] frugalware-current: playonlinux-3.0.2-1-i686 Message-ID: <20080611174026.B706E1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ff80e49f6dbe445d63fc9216b204f891b1be3657 commit ff80e49f6dbe445d63fc9216b204f891b1be3657 Author: Devil505 Date: Wed Jun 11 19:35:34 2008 +0200 playonlinux-3.0.2-1-i686 * version bump diff --git a/source/xapps-extra/playonlinux/FrugalBuild b/source/xapps-extra/playonlinux/FrugalBuild index 8fba3fc..666c75d 100644 --- a/source/xapps-extra/playonlinux/FrugalBuild +++ b/source/xapps-extra/playonlinux/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Devil505 pkgname=playonlinux -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="GUI for managing Windows and DOS programs under linux" url="http://www.playonlinux.com" rodepends=('xterm') @@ -15,7 +15,7 @@ Fpkgversep="_" _F_cd_path="$pkgname" up2date="lynx -dump $url/en/download-generic.html | Flasttar" source=(http://www.playonlinux.com/script_files/$_F_archive_name/$pkgver/PlayOnLinux_$pkgver.tar.gz) -sha1sums=('5dd516fa3e42907df5e7135396029a568c3ca417') +sha1sums=('98b304436ad3bbb56a04f6c815c5c8f790859318') build() { From bouleetbil at frogdev.info Wed Jun 11 19:43:08 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jun 11 19:43:09 2008 Subject: [Frugalware-git] frugalware-current: banshee-1.0.0-1-i686 Message-ID: <20080611174308.9D8CA1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b8c704e566bd63706401b56e0b5480213b194d55 commit b8c704e566bd63706401b56e0b5480213b194d55 Author: bouleetbil Date: Wed Jun 11 19:22:18 2008 +0200 banshee-1.0.0-1-i686 *fixe up2date diff --git a/source/gnome-extra/banshee/FrugalBuild b/source/gnome-extra/banshee/FrugalBuild index cafa8a5..3df0b2e 100644 --- a/source/gnome-extra/banshee/FrugalBuild +++ b/source/gnome-extra/banshee/FrugalBuild @@ -23,7 +23,7 @@ _F_gnome_iconcache=y options=('scriptlet') _F_mono_aot=0 Finclude mono gnome-scriptlet -up2date="lynx -dump $url | grep 'The latest version'|sed 's/The latest version of Banshee is //g' |sed 's/,.*$//g' | sed 's/ //g'" +up2date="lynx -dump $url/download/ | Flasttarbz2" source=(http://banshee-project.org/files/$pkgname/$_F_archive_name-$pkgver.tar.bz2) Fconfopts="$Fconfopts --disable-docs --enable-avahi --enable-ipod \ --enable-karma --enable-mtp --enable-external-ndesk-dbus \ From crazy at frugalware.org Wed Jun 11 23:40:12 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 11 23:40:15 2008 Subject: [Frugalware-git] frugalware-current: cheese-2.22.2-1-x86_64 Message-ID: <20080611214012.D887C1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=84ee891e2bb0ef3ae5e3cc33b5dd94dbbf5e51b8 commit 84ee891e2bb0ef3ae5e3cc33b5dd94dbbf5e51b8 Author: crazy Date: Wed Jun 11 23:37:50 2008 +0200 cheese-2.22.2-1-x86_64 * Version bump * added heimdal>=1.2 to depends * closes FS#3148 diff --git a/source/gnome-extra/cheese/FrugalBuild b/source/gnome-extra/cheese/FrugalBuild index bd30c07..ac0fa59 100644 --- a/source/gnome-extra/cheese/FrugalBuild +++ b/source/gnome-extra/cheese/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Christian Hamar alias krix pkgname=cheese -pkgver=2.22.1 +pkgver=2.22.2 pkgrel=1 pkgdesc="Cheese is a Photobooth-inspired GNOME application for taking pictures and videos from a webcam." url="http://www.gnome.org/projects/cheese" depends=('librsvg>=2.22.0' 'gst-plugins-good' 'gst-plugins-base' 'gst-plugins-base-pango' \ 'gnome-vfs' 'libgnomeui' 'xf86vidmodeproto' 'evolution-data-server>=2.22.0' 'dbus' 'hal' \ - 'gst-plugins-good-video4linux2') + 'gst-plugins-good-video4linux2' 'heimdal>=1.2') makedepends=('intltool' 'gnome-doc-utils' 'samba' 'fuse' 'libsoup' 'gconf') groups=('gnome-extra') archs=('i686' 'x86_64') @@ -17,6 +17,6 @@ _F_gnome_desktop="y" _F_gnome_schemas=('/etc/gconf/schemas/cheese.schemas') Finclude gnome gnome-scriptlet -sha1sums=('9dbdc1c25b28c20666b9c355ffa933e9a408d4c6') +sha1sums=('af430576d73ea70e2339ea8767409a5c922b8692') # optimization OK From bouleetbil at frogdev.info Thu Jun 12 00:50:20 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jun 12 00:50:22 2008 Subject: [Frugalware-git] frugalware-current: totem-2.22.2-2-i686 Message-ID: <20080611225020.0E2CE1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a4d2cab9251466958122c16a78f8f34e9e7108d7 commit a4d2cab9251466958122c16a78f8f34e9e7108d7 Author: bouleetbil Date: Thu Jun 12 00:44:27 2008 +0200 totem-2.22.2-2-i686 * rebuilt with heimdal-1.2 * added heimdal>=1.2 to depends diff --git a/source/gnome/totem/FrugalBuild b/source/gnome/totem/FrugalBuild index 5ed5d9d..c4b8e7d 100644 --- a/source/gnome/totem/FrugalBuild +++ b/source/gnome/totem/FrugalBuild @@ -4,12 +4,12 @@ pkgname=totem pkgver=2.22.2 -pkgrel=1 +pkgrel=2 pkgdesc="Movie player for GNOME based on Xine" depends=('libxi' 'libxtst' 'fontconfig' 'libstdc++' 'libxxf86vm' 'dbus-glib>=0.71' \ 'libxrandr' 'atk>=1.20.0' 'libsm' 'libxinerama' 'libmusicbrainz' 'nss' 'avahi-glib>=0.6.19' \ 'cairo>=1.4.0' 'libxcursor' 'gnome-desktop>=2.22.0' 'iso-codes' 'xine-lib' 'gnome-vfs>=2.22.0' \ - 'shared-mime-info>=0.22' 'totem-pl-parser') + 'shared-mime-info>=0.22' 'totem-pl-parser' 'heimdal>=1.2') makedepends=('intltool' "firefox>=2.0.0.8" 'pango' 'nautilus>=2.22.0' \ 'gnome-doc-utils') groups=('gnome') From vmiklos at frugalware.org Thu Jun 12 01:13:28 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jun 12 01:13:29 2008 Subject: [Frugalware-git] frugalware-current: openoffice.org-2.4.1-1-i686 Message-ID: <20080611231328.7D4911770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1985e991043a75698f8bcdcb5e39fc82d2fbe707 commit 1985e991043a75698f8bcdcb5e39fc82d2fbe707 Author: Miklos Vajna Date: Thu Jun 12 01:12:03 2008 +0200 openoffice.org-2.4.1-1-i686 - version bump - no-oc.diff is now in upstream diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild index d4ad7c3..097b413 100644 --- a/source/xapps/openoffice.org/FrugalBuild +++ b/source/xapps/openoffice.org/FrugalBuild @@ -5,29 +5,34 @@ pkgname=openoffice.org USE_DEVEL=${USE_DEVEL:-"n"} if ! Fuse $USE_DEVEL; then - upstream=2.4 - branch= + upstream=2.4.1 + branch=-2-4-1 tree=ooh680 - milestone=12 + dir=`echo $tree|tr [a-z] [A-Z]` + milestone=17 pkgver=$upstream pkgrel=1 - snapshot=r12054 + snapshot=r12728 else - upstream=2.4 - branch= + upstream=2.4.1 + branch=-2-4-1 tree=ooh680 - milestone=6 + dir=`echo $tree|tr [a-z] [A-Z]` + milestone=17 pkgver=$upstream${tree}_m$milestone pkgrel=1 - snapshot=r11544 + snapshot=r12728 fi pkgdesc="OpenOffice.org, a full office productivity suite." url="http://www.openoffice.org/" +_F_gnome_desktop="y" +Finclude gnome-scriptlet mono java +unset install depends=('libxml2' 'libart_lgpl' 'libsndfile' 'libgcj-awt>=4.1.1-6' 'nas' 'fontconfig' 'libpng' 'imagemagick' \ 'flex' 'neon>=0.26.1' 'bison' 'zip' 'unzip' 'expat' 'cups' 'desktop-file-utils' 'perl-archive-zip' \ 'unixodbc' 'libxaw' 'libxslt' 'startup-notification' 'libwpd>=0.8.13') # this is here as gstreamer is only a makedepend -rodepends=('flac') +rodepends=('flac' 'dejavu-ttf') makedepends=('curl' 'intltool' 'tcsh' 'pam-headers' 'firefox' 'apache-ant' 'gcc-gcj' 'kdelibs>=3.5.5' \ 'evolution-data-server-ldap' 'boost' 'icu' 'hunspell' 'imake' 'gccmakedep' 'xalan-j' \ 'patch>=2.5.9' 'openclipart' 'xorg-server' 'gstreamer' 'gst-plugins-base' 'gnome-vfs' \ @@ -41,13 +46,12 @@ else up2date="lynx -dump http://svn.gnome.org/viewcvs/ooo-build/trunk/configure.in?view=markup |grep ^DEFAULT_TAG|sed 's/DEFAULT_TAG=\(.*\)-\(.*\)/$upstream\1_\2/'" fi source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build$branch-$snapshot.tar.bz2 \ - http://hu.openoffice.org/source/browse/*checkout*/hu/src/2.3.0/SDF/hu.sdf \ - no-oc.diff) -signatures=($source.asc '' '') + http://download.go-oo.org/$dir/$tree-m$milestone-core.tar.bz2 \ + http://download.go-oo.org/$dir/$tree-m$milestone-lang.tar.bz2 \ + http://download.go-oo.org/$dir/$tree-m$milestone-system.tar.bz2) +signatures=($source.asc '' '' '') +NOEXTRACT=1 options=(${options[@]} 'scriptlet') -_F_gnome_desktop="y" -Finclude gnome-scriptlet mono -unset install subpkgs=("$pkgname-kde" "$pkgname-gnome") subdescs=("$pkgname kde integration" "$pkgname gnome integration") @@ -98,25 +102,27 @@ done build() { Fmonoexport + Fextract ooo-build$branch-$snapshot.tar.bz2 if [ -n "$branch" ]; then Fcd ooo-build-$(echo $branch|sed 's/^-//;s/-/./g') else Fcd ooo-build fi - # Extra localizations - cp $Fsrcdir/hu.sdf src/GSI_hu.sdf || return 1 + # Predownloaded tarballs + for i in $Fsrcdir/$tree-m$milestone-* + do + ln -sf $i src/ + done # Remove our patches so that incremental build will be possible. - rm -f patches/src680/no-oc.diff + #rm -f patches/src680/no-oc.diff Fpatchall - # this would fail to apply - sed -i '/xulrunner-1.9.diff/d' patches/src680/apply # SMP build if [ ! -z "$MAKEFLAGS" ]; then - # Uncomment this if you really want an smp build. It may or may not work. - #Fconfopts="$Fconfopts --with-num-cpus=${MAKEFLAGS/-j}" + # Comment this out if you think the build failed because of being SMP. + Fconfopts="$Fconfopts --with-num-cpus=${MAKEFLAGS/-j}" unset MAKEFLAGS fi @@ -130,19 +136,14 @@ build() { --enable-hunspell \ --with-binsuffix=no \ --disable-dependency-tracking \ - --with-fonts \ --with-installed-ooo-dirname=openoffice.org \ - --with-mono-gac-root=/usr/lib \ - --with-system-mozilla=firefox" + --with-mono-gac-root=/usr/lib" # Set our version. Fsed "AC_PACKAGE_VERSION" "$pkgver-$pkgrel" configure.in autoconf || return 1 # Optimize build. - ## HACK! don't remove or it eats your box got killed here while - ## eating 3G mem ... - export CFLAGS="$(echo $CFLAGS|sed 's/-O2/-O0/')" export ARCH_FLAGS="$CFLAGS" if ! Fuse $USE_DEVEL; then diff --git a/source/xapps/openoffice.org/no-oc.diff b/source/xapps/openoffice.org/no-oc.diff deleted file mode 100644 index 51b5401..0000000 --- a/source/xapps/openoffice.org/no-oc.diff +++ /dev/null @@ -1,46 +0,0 @@ - ... languages oc ... - ... creating language pack: oc ! - ... analyzing files ... - WARNING: Using autotextshare_en-US.zip instead of autotextshare_oc.zip - WARNING: Using palettes_en-US.zip instead of palettes_oc.zip - WARNING: Using tpllayoutimpr_en-US.zip instead of tpllayoutimpr_oc.zip - WARNING: Using tplpresntimpr_en-US.zip instead of tplpresntimpr_oc.zip - WARNING: Using tplwizagenda_en-US.zip instead of tplwizagenda_oc.zip - WARNING: Using tplwizdesktop_en-US.zip instead of tplwizdesktop_oc.zip - WARNING: Using tplwizfax_en-US.zip instead of tplwizfax_oc.zip - WARNING: Using tplwizletter_en-US.zip instead of tplwizletter_oc.zip - WARNING: Using tplwizreport_en-US.zip instead of tplwizreport_oc.zip - WARNING: Using tplwizstyles_en-US.zip instead of tplwizstyles_oc.zip - WARNING: Using wordbook_en-US.zip instead of wordbook_oc.zip - ... analyzing files with flag ARCHIVE ... - - ************************************************** - ERROR: ERROR: No packages defined! -diff --git a/patches/src680/apply b/patches/src680/apply -index 66b489d..ec5f68e 100644 ---- a/patches/src680/apply -+++ b/patches/src680/apply -@@ -968,6 +968,7 @@ SectionOwner => davidf - - [ FrugalwareOnly ] - gcc401-stlport45-include.diff, gghibo -+no-oc.diff, vmiklos - - - # ( mmp@oo.o deals with defaults apparently ) -diff --git a/patches/src680/no-oc.diff b/patches/src680/no-oc.diff -new file mode 100644 -index 0000000..337310a ---- /dev/null -+++ b/patches/src680/no-oc.diff -@@ -0,0 +1,10 @@ -+--- solenv/inc/postset.mk.orig 2008-02-13 13:40:48.000000000 +0100 -++++ solenv/inc/postset.mk 2008-02-13 13:41:03.000000000 +0100 -+@@ -39,6 +39,6 @@ -+ defaultlangiso=en-US -+ -+ # Complete list of all supported ISO codes -+-completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu -++completelangiso=af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne nb nl nn nr ns or-IN pa-IN pl pt pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu -+ -+ alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG))))) From ryuo at frugalware.org Thu Jun 12 08:01:05 2008 From: ryuo at frugalware.org (James Buren) Date: Thu Jun 12 08:01:06 2008 Subject: [Frugalware-git] frugalware-current: vwm-1.3.5-1-i686 Message-ID: <20080612060105.076B31770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3aede3eb45ef290253133ff27283a032b436ba3e commit 3aede3eb45ef290253133ff27283a032b436ba3e Author: James Buren Date: Thu Jun 12 00:59:46 2008 -0500 vwm-1.3.5-1-i686 * new package diff --git a/source/apps-extra/vwm/FrugalBuild b/source/apps-extra/vwm/FrugalBuild new file mode 100644 index 0000000..8506214 --- /dev/null +++ b/source/apps-extra/vwm/FrugalBuild @@ -0,0 +1,46 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=vwm +pkgver=1.3.5 +pkgrel=1 +pkgdesc="A 'window manager' for your console sessions." +_F_sourceforge_broken_up2date=1 +Finclude sourceforge +depends=('libgtop' 'libviper' 'libpseudo') +groups=('apps-extra') +archs=('i686' 'x86_64') +# I'll handle the documentation this time, thank you. ;) +options=('nodocs') +sha1sums=('895b4d1f16c1eb1da79eed4adef73dba0ab269de') + +build() +{ + Fcd $pkgname + # lemme fix your optimizations ;D + Fsed '-O2' "${CFLAGS}" {Makefile,modules/{ptyterm,sysmon}/Makefile} + Fsed '-Wall' "-Wall ${CFLAGS}" keycodes/Makefile + # fix include pathing + Fsed '-fpic' '-fpic -I../..' modules/sysmon/Makefile + # lets compile the sucker + make || Fdie + make -C modules/sysmon || Fdie + # install vwm and headers + Fexerel /usr/bin/vwm + Ffilerel /usr/include/vwm.h + # install ptyterm module + Fexerel modules/ptyterm/ptyterm.so /usr/lib/vwm/modules/ptyterm.so + Fmkdir /usr/share/terminfo + tic -o $Fdestdir/usr/share/terminfo modules/ptyterm/vwmterm-tic.txt || Fdie + # install sysmon module + Fexerel modules/sysmon/sysmon.so /usr/lib/vwm/modules/sysmon.so + # install auxiliary programs/resources + Fexerel keycodes/keycodes /usr/bin/keycodes + Ffilerel samples/vwmrc /usr/share/vwm/vwmrc + # install each pieces individual documentation + Fdocrel {INSTALL,LICENSE,CHANGELOG} + Ffilerel modules/ptyterm/{LICENSE,INSTALL} /usr/share/doc/$pkgname-$pkgver/ptyterm + Ffilerel modules/sysmon/{LICENSE,INSTALL} /usr/share/doc/$pkgname-$pkgver/sysmon +} + +# optimization OK From ryuo at frugalware.org Thu Jun 12 08:11:03 2008 From: ryuo at frugalware.org (James Buren) Date: Thu Jun 12 08:11:04 2008 Subject: [Frugalware-git] frugalware-current: libviper-1.3.2-1-i686 Message-ID: <20080612061103.062181770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=798c204480b0286a2df684d30863b797f867eeab commit 798c204480b0286a2df684d30863b797f867eeab Author: James Buren Date: Thu Jun 12 01:10:33 2008 -0500 libviper-1.3.2-1-i686 * added x86_64 to archs diff --git a/source/lib-extra/libviper/FrugalBuild b/source/lib-extra/libviper/FrugalBuild index 7080274..9284f77 100644 --- a/source/lib-extra/libviper/FrugalBuild +++ b/source/lib-extra/libviper/FrugalBuild @@ -9,7 +9,7 @@ _F_sourceforge_broken_up2date=1 Finclude sourceforge depends=('glibc') groups=('lib-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('caa1512e5a6b695f15cf40ab5ce6f0c5d4c62e31') build() From ryuo at frugalware.org Thu Jun 12 08:12:14 2008 From: ryuo at frugalware.org (James Buren) Date: Thu Jun 12 08:12:15 2008 Subject: [Frugalware-git] frugalware-current: libpseudo-1.0.1-1-i686 Message-ID: <20080612061214.1D8101770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=55ffcfac982495fd3d97169fcad70c3060a0f9ca commit 55ffcfac982495fd3d97169fcad70c3060a0f9ca Author: James Buren Date: Thu Jun 12 01:12:08 2008 -0500 libpseudo-1.0.1-1-i686 * added x86_64 to archs diff --git a/source/lib-extra/libpseudo/FrugalBuild b/source/lib-extra/libpseudo/FrugalBuild index 3cf9154..45a19e9 100644 --- a/source/lib-extra/libpseudo/FrugalBuild +++ b/source/lib-extra/libpseudo/FrugalBuild @@ -9,7 +9,7 @@ _F_sourceforge_broken_up2date=1 Finclude sourceforge depends=('glibc') groups=('lib-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('d5f88aebe780d1418f6b66a7378cd103aa601c45') build() From ryuo at frugalware.org Thu Jun 12 08:25:58 2008 From: ryuo at frugalware.org (James Buren) Date: Thu Jun 12 08:26:00 2008 Subject: [Frugalware-git] frugalware-current: vwm-1.3.5-1-i686 Message-ID: <20080612062558.863181770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1586d91371591cfbf04673630bdfd5a2d34e304a commit 1586d91371591cfbf04673630bdfd5a2d34e304a Author: James Buren Date: Thu Jun 12 01:25:27 2008 -0500 vwm-1.3.5-1-i686 * disable parallel building, fixed SMP issue diff --git a/source/apps-extra/vwm/FrugalBuild b/source/apps-extra/vwm/FrugalBuild index 8506214..62735f2 100644 --- a/source/apps-extra/vwm/FrugalBuild +++ b/source/apps-extra/vwm/FrugalBuild @@ -13,6 +13,8 @@ archs=('i686' 'x86_64') # I'll handle the documentation this time, thank you. ;) options=('nodocs') sha1sums=('895b4d1f16c1eb1da79eed4adef73dba0ab269de') +# fix for SMP +unset MAKEFLAGS build() { From ryuo at frugalware.org Thu Jun 12 08:38:43 2008 From: ryuo at frugalware.org (James Buren) Date: Thu Jun 12 08:38:45 2008 Subject: [Frugalware-git] frugalware-current: termit-1.3.2-1-i686 Message-ID: <20080612063843.EA4181770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3db73682f4f35ba04f299120a85bac42b629a60b commit 3db73682f4f35ba04f299120a85bac42b629a60b Author: James Buren Date: Thu Jun 12 01:35:34 2008 -0500 termit-1.3.2-1-i686 * version bump diff --git a/source/xapps-extra/termit/FrugalBuild b/source/xapps-extra/termit/FrugalBuild index e7c81d8..29896a2 100644 --- a/source/xapps-extra/termit/FrugalBuild +++ b/source/xapps-extra/termit/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: James Buren pkgname=termit -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 pkgdesc="A terminal emulator based on the vte library." url="http://code.google.com/p/termit/wiki/TermIt" @@ -12,6 +12,6 @@ archs=('i686' 'x86_64') up2date="Flasttar $url" source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2) Finclude cmake -sha1sums=('ec6dd7c71ec642ae90fdf107c191599734ec5e86') +sha1sums=('9488e58717a245e3ffd894f56d2b88e3988582ce') # optimization OK From ryuo at frugalware.org Thu Jun 12 08:58:58 2008 From: ryuo at frugalware.org (James Buren) Date: Thu Jun 12 08:59:02 2008 Subject: [Frugalware-git] frugalware-current: bmpanel-0.9.21-1-i686 Message-ID: <20080612065858.D75EE1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6a423e2e625d60e7313a26b4d49690b731b91e84 commit 6a423e2e625d60e7313a26b4d49690b731b91e84 Author: James Buren Date: Thu Jun 12 01:57:19 2008 -0500 bmpanel-0.9.21-1-i686 * version bump * removed scons and converted to normal build diff --git a/source/x11-extra/bmpanel/FrugalBuild b/source/x11-extra/bmpanel/FrugalBuild index a3a255f..14df1ca 100644 --- a/source/x11-extra/bmpanel/FrugalBuild +++ b/source/x11-extra/bmpanel/FrugalBuild @@ -1,27 +1,25 @@ -# Compiling Time: 0.02 SBU +# Compiling Time: 0.01 SBU # Maintainer: James Buren pkgname=bmpanel -pkgver=0.9.20 +pkgver=0.9.21 pkgrel=1 pkgdesc="A themeable reincarnation of fspanel" url="http://nsf.110mb.com/bmpanel/" depends=('libev' 'imlib2' 'fontconfig' 'zlib' 'libxrender' 'libxcomposite') -makedepends=('scons') groups=('x11-extra') archs=('i686') up2date="Flasttar $url" source=($url/$pkgname-$pkgver.tar.gz) -sha1sums=('6f51a4b0b5c2c3909823d228631c23c90243868f') +sha1sums=('84d1d2ba9ef303562018ff54bdcaf359cbc753df') build() { # adjusting pathes for libev - Fsed 'ev.h' 'libev/ev.h' {SConstruct,src/bmpanel.c} - Fsed '-O2 -march=native' "$CFLAGS" SConstruct + Fsed 'ev.h' 'libev/ev.h' src/bmpanel.c + Fsed '-O2' "$CFLAGS" configure # end of corrections - scons prefix=/usr build || Fdie - scons prefix=$Fdestdir/usr install || Fdie + Fbuild } # optimization OK From ryuo at frugalware.org Thu Jun 12 10:13:15 2008 From: ryuo at frugalware.org (James Buren) Date: Thu Jun 12 10:13:17 2008 Subject: [Frugalware-git] frugalware-current: larswm-7.5.3-1-i686 Message-ID: <20080612081315.2A3581770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=80506b41f8fb764533063829eb19baa5f300df7d commit 80506b41f8fb764533063829eb19baa5f300df7d Author: James Buren Date: Thu Jun 12 03:12:25 2008 -0500 larswm-7.5.3-1-i686 * new package diff --git a/source/x11-extra/larswm/FrugalBuild b/source/x11-extra/larswm/FrugalBuild new file mode 100644 index 0000000..30ba5e8 --- /dev/null +++ b/source/x11-extra/larswm/FrugalBuild @@ -0,0 +1,27 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=larswm +pkgver=7.5.3 +pkgrel=1 +pkgdesc="A rewrite of 9wm, adding virtual desktops and tiling." +url="http://www.lab1702.net/fnurt/larswm" +depends=('glibc' 'libxmu' 'libsm') +makedepends=('imake' 'gccmakedep') +groups=('x11-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url" +source=($url/$pkgname-$pkgver.tar.gz) +sha1sums=('5a79861f5e052a785fbd498eafe532799390a756') + +build() +{ + Fcd + xmkmf -a || Fdie + make CDEBUGFLAGS="${CFLAGS}" || Fdie + Fmakeinstall + Fmanrel *.man + Ffilerel sample.* /usr/share/$pkgname +} + +# optimization OK From ryuo at frugalware.org Thu Jun 12 10:52:05 2008 From: ryuo at frugalware.org (James Buren) Date: Thu Jun 12 10:52:07 2008 Subject: [Frugalware-git] frugalware-current: fnlib-0.5-4-i686 Message-ID: <20080612085205.7FB571770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=095207d98b5af8dfd4077b01ac2d42107cb45952 commit 095207d98b5af8dfd4077b01ac2d42107cb45952 Author: James Buren Date: Thu Jun 12 03:51:06 2008 -0500 fnlib-0.5-4-i686 * moved to extra * updated SBU * taking over from vmiklos diff --git a/source/xlib-extra/fnlib/FrugalBuild b/source/xlib-extra/fnlib/FrugalBuild new file mode 100644 index 0000000..3ee6f34 --- /dev/null +++ b/source/xlib-extra/fnlib/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.02 SBU +# Maintainer: James Buren + +pkgname=fnlib +pkgver=0.5 +pkgrel=4 +pkgdesc="Font rendering library for X11" +depends=('libxext' 'imlib' 'libpng') +groups=('x11-extra') +archs=('i686' 'x86_64') +_F_sourceforge_dirname="enlightenment" +Finclude sourceforge +url="http://enlightenment.org" +up2date="lynx -dump http://ftp.heanet.ie/mirrors/download.sourceforge.net/pub/sourceforge/e/en/enlightenment/|Flasttar" +Fconfopts="$Fconfopts --sysconfdir=/etc/fnlib" +sha1sums=('0dd7053e443ea5d22e4864fe6997b77901118335') + +# optimization OK From ryuo at frugalware.org Thu Jun 12 10:53:49 2008 From: ryuo at frugalware.org (James Buren) Date: Thu Jun 12 10:53:49 2008 Subject: [Frugalware-git] frugalware-current: fnlib-0.5-4-i686 Message-ID: <20080612085349.9D5561770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=feee52e9cbc061a708dbddb2647c3bf54f80e158 commit feee52e9cbc061a708dbddb2647c3bf54f80e158 Author: James Buren Date: Thu Jun 12 03:53:27 2008 -0500 fnlib-0.5-4-i686 * wrong group, sorry diff --git a/source/xlib-extra/fnlib/FrugalBuild b/source/xlib-extra/fnlib/FrugalBuild index 3ee6f34..c94875b 100644 --- a/source/xlib-extra/fnlib/FrugalBuild +++ b/source/xlib-extra/fnlib/FrugalBuild @@ -6,7 +6,7 @@ pkgver=0.5 pkgrel=4 pkgdesc="Font rendering library for X11" depends=('libxext' 'imlib' 'libpng') -groups=('x11-extra') +groups=('xlib-extra') archs=('i686' 'x86_64') _F_sourceforge_dirname="enlightenment" Finclude sourceforge From krics at linuxforum.hu Thu Jun 12 12:57:35 2008 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Thu Jun 12 12:57:37 2008 Subject: [Frugalware-git] frugalware-current: libarchive-2.4.8-2-x86_64 Message-ID: <20080612105735.7F8B71770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=27486fc79663d78742865e6d5ba42a302a697565 commit 27486fc79663d78742865e6d5ba42a302a697565 Author: Christian Hamar alias krix Date: Thu Jun 12 12:57:14 2008 +0200 libarchive-2.4.8-2-x86_64 * Fixed up2date (pointing to STABLE: release) diff --git a/source/base/libarchive/FrugalBuild b/source/base/libarchive/FrugalBuild index ca156b7..30e5a9d 100644 --- a/source/base/libarchive/FrugalBuild +++ b/source/base/libarchive/FrugalBuild @@ -9,7 +9,7 @@ groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') url="http://people.freebsd.org/~kientzle/libarchive/" depends=('bzip2>=1.0.4-2' 'zlib>=1.2.3-5') -up2date="lynx -dump $url |Flasttar" +up2date="lynx -dump $url | grep STABLE: | Flasttar" source=($url/src/$pkgname-$pkgver.tar.gz) sha1sums=('129b07ee35e3eede8581904272efe6950a99eaaa') # Need to prevent mistakes like unclean chroot build and others and be sure that DONT link to ACL* From ryuo at frugalware.org Thu Jun 12 15:37:38 2008 From: ryuo at frugalware.org (James Buren) Date: Thu Jun 12 15:37:40 2008 Subject: [Frugalware-git] frugalware-current: fnlib-0.5-4-i686 Message-ID: <20080612133738.4A2431770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4992d838693a1abffefdb8e786bfb852a7cf2795 commit 4992d838693a1abffefdb8e786bfb852a7cf2795 Author: James Buren Date: Thu Jun 12 08:35:22 2008 -0500 fnlib-0.5-4-i686 * clean up diff --git a/source/xlib/fnlib/FrugalBuild b/source/xlib/fnlib/FrugalBuild deleted file mode 100644 index 7a467dc..0000000 --- a/source/xlib/fnlib/FrugalBuild +++ /dev/null @@ -1,18 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: VMiklos - -pkgname=fnlib -pkgver=0.5 -pkgrel=3 -pkgdesc="Font rendering library for X11" -depends=('libxext' 'imlib' 'libpng') -groups=('xlib') -archs=('i686' 'x86_64') -_F_sourceforge_dirname="enlightenment" -Finclude sourceforge -url="http://enlightenment.org" -up2date="lynx -dump http://ftp.heanet.ie/mirrors/download.sourceforge.net/pub/sourceforge/e/en/enlightenment/|Flasttar" -Fconfopts="$Fconfopts --sysconfdir=/etc/fnlib" -sha1sums=('0dd7053e443ea5d22e4864fe6997b77901118335') - -# optimization OK From vmiklos at frugalware.org Thu Jun 12 19:46:54 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jun 12 19:46:57 2008 Subject: [Frugalware-git] frugalware-current: erlang-12B_3-1-i686 Message-ID: <20080612174655.02B941770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d7fa8b87deb130f8ae3984b505a697ceb112a3c7 commit d7fa8b87deb130f8ae3984b505a697ceb112a3c7 Author: Miklos Vajna Date: Thu Jun 12 19:39:33 2008 +0200 erlang-12B_3-1-i686 - version bump diff --git a/source/devel-extra/erlang/FrugalBuild b/source/devel-extra/erlang/FrugalBuild index 166fb7b..360ba5a 100644 --- a/source/devel-extra/erlang/FrugalBuild +++ b/source/devel-extra/erlang/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: VMiklos pkgname=erlang -pkgver=12B_2 -ertsver=5.6.2 -interfacever=3.5.6 +pkgver=12B_3 +ertsver=5.6.3 +interfacever=3.5.7 pkgrel=1 pkgdesc="A programming language designed at the Ericsson Computer Science Laboratory." url="http://www.erlang.org/" @@ -16,9 +16,9 @@ up2date="lynx -dump http://www.erlang.org/download.html|grep readme$|sed 's/.*_R source=(http://www.erlang.org/download/otp_src_R${pkgver/_/-}.tar.gz \ http://www.erlang.org/download/otp_doc_html_R${pkgver/_/-}.tar.gz \ http://www.erlang.org/download/otp_doc_man_R${pkgver/_/-}.tar.gz) -sha1sums=('a38adf0498a6d0f5038899d9f4a8accc935e7ffd' \ - '9fbb1f8e514ab340fff437e794243b4d530ed682' \ - 'c32be18cc121412af97d948e1262a185206cadcb') +sha1sums=('ea5f202cc35ed6ef2796727b95d62c9bbe6ad5e5' \ + '194003607113c84aef5b5daad7ca8b8901d1d80a' \ + '8ea4c9fa7d941c339c73bb417f88ee939d6989eb') build() { From vmiklos at frugalware.org Thu Jun 12 19:46:55 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jun 12 19:46:59 2008 Subject: [Frugalware-git] frugalware-current: nasm-2.03-1-i686 Message-ID: <20080612174655.1D11F1778001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=710c1f47234039a4cf7058a17bb43a2e886b081f commit 710c1f47234039a4cf7058a17bb43a2e886b081f Author: Miklos Vajna Date: Thu Jun 12 19:40:14 2008 +0200 nasm-2.03-1-i686 - version bump diff --git a/source/devel-extra/nasm/FrugalBuild b/source/devel-extra/nasm/FrugalBuild index 8ebc481..12983e1 100644 --- a/source/devel-extra/nasm/FrugalBuild +++ b/source/devel-extra/nasm/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=nasm -pkgver=2.02 +pkgver=2.03 pkgrel=1 pkgdesc="NASM is the Netwide Assembler" Finclude sourceforge @@ -10,6 +10,6 @@ depends=('glibc') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=6208 |grep 'nasm sources' |sed -ne 's/.*\]\(.*\) [A-Z].*\[.*/\1/;1p'" -sha1sums=('2b24076eebebf85f8048da78dae1ee801c4fa693') +sha1sums=('01573ea0847e2e27cc9c84265d719f46081cbf34') # optimization OK From vmiklos at frugalware.org Thu Jun 12 19:46:55 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jun 12 19:47:01 2008 Subject: [Frugalware-git] frugalware-current: xmlgraphics-commons-1.3.1-1-i686 Message-ID: <20080612174655.31FAA17780AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=765b462371de3fb4d6a00e7abee51eb02f431656 commit 765b462371de3fb4d6a00e7abee51eb02f431656 Author: Miklos Vajna Date: Thu Jun 12 19:41:59 2008 +0200 xmlgraphics-commons-1.3.1-1-i686 - version bump diff --git a/source/devel-extra/xmlgraphics-commons/FrugalBuild b/source/devel-extra/xmlgraphics-commons/FrugalBuild index cd02322..164e9f2 100644 --- a/source/devel-extra/xmlgraphics-commons/FrugalBuild +++ b/source/devel-extra/xmlgraphics-commons/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=xmlgraphics-commons -pkgver=1.3 +pkgver=1.3.1 pkgrel=1 pkgdesc="A library of several reusable components used by Apache Batik and Apache FOP." url="http://xmlgraphics.apache.org/commons/index.html" From vmiklos at frugalware.org Thu Jun 12 19:46:55 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jun 12 19:47:02 2008 Subject: [Frugalware-git] frugalware-current: udev-124-1-i686 Message-ID: <20080612174655.38DBC17780AC@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=52c6033a845ffc30f672807950e2db94fd97cb95 commit 52c6033a845ffc30f672807950e2db94fd97cb95 Author: Miklos Vajna Date: Thu Jun 12 19:43:13 2008 +0200 udev-124-1-i686 - version bump diff --git a/source/base/udev/FrugalBuild b/source/base/udev/FrugalBuild index cf8fee8..78083df 100644 --- a/source/base/udev/FrugalBuild +++ b/source/base/udev/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=udev -pkgver=122 -pkgrel=2 +pkgver=124 +pkgrel=1 pkgdesc="A userspace implementation of devfs" url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/" backup=(etc/udev/{udev.conf,rules.d/50-udev-default.rules} \ From vmiklos at frugalware.org Thu Jun 12 19:46:55 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jun 12 19:47:03 2008 Subject: [Frugalware-git] frugalware-current: hdparm-8.8-1-i686 Message-ID: <20080612174655.4308417780AD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d5a66c3cc690b7af87b8763e0aa0680032cb7d87 commit d5a66c3cc690b7af87b8763e0aa0680032cb7d87 Author: Miklos Vajna Date: Thu Jun 12 19:44:04 2008 +0200 hdparm-8.8-1-i686 - version bump diff --git a/source/apps/hdparm/FrugalBuild b/source/apps/hdparm/FrugalBuild index 41c98cb..0455532 100644 --- a/source/apps/hdparm/FrugalBuild +++ b/source/apps/hdparm/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: VMiklos pkgname=hdparm -pkgver=8.7 +pkgver=8.8 pkgrel=1 pkgdesc="Read/set hard drive parameters" depends=('glibc') groups=('apps') archs=('i686' 'x86_64' 'ppc') Finclude sourceforge -sha1sums=('d8dea10b55c4c7032b7f0866f516be26874bfcdc') +sha1sums=('647f018e3a475ef2274fd297a4f77579e6959ceb') # optimization OK From vmiklos at frugalware.org Thu Jun 12 19:46:55 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jun 12 19:47:05 2008 Subject: [Frugalware-git] frugalware-current: lvm2-2.02.38-1-i686 Message-ID: <20080612174655.4C9FE17780AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1604daa86d92fc385d4b854f5f62632dd09b1407 commit 1604daa86d92fc385d4b854f5f62632dd09b1407 Author: Miklos Vajna Date: Thu Jun 12 19:46:35 2008 +0200 lvm2-2.02.38-1-i686 - version bump diff --git a/source/apps/lvm2/FrugalBuild b/source/apps/lvm2/FrugalBuild index e8797fe..f4aa72e 100644 --- a/source/apps/lvm2/FrugalBuild +++ b/source/apps/lvm2/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=lvm2 -pkgver=2.02.37 +pkgver=2.02.38 pkgrel=1 pkgdesc="Logical Volume Manager 2 utilities" url="http://sources.redhat.com/lvm2/" From vmiklos at frugalware.org Thu Jun 12 20:52:52 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jun 12 20:52:56 2008 Subject: [Frugalware-git] pacman-tools: fblint: remove copyright info from --version output, it was only needed by help2man Message-ID: <20080612185252.7E80A1778001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=dea246e3f58171f765221bf37e777a60dce15d0a commit dea246e3f58171f765221bf37e777a60dce15d0a Author: Miklos Vajna Date: Thu Jun 12 20:35:09 2008 +0200 fblint: remove copyright info from --version output, it was only needed by help2man diff --git a/fblint b/fblint index 56c0708..f4a7454 100755 --- a/fblint +++ b/fblint @@ -67,10 +67,6 @@ get_root() if [ "$1" = "--version" ]; then echo "fblint (pacman-tools) $myver" - echo - echo "Copyright (c) 2006 by Miklos Vajna " - echo "This is free software; see the source for copying conditions. There is NO" - echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." exit 0 fi From vmiklos at frugalware.org Thu Jun 12 20:52:52 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jun 12 20:52:58 2008 Subject: [Frugalware-git] pacman-tools: dg send: implement --to option Message-ID: <20080612185252.706881770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=a17f484b312c390924879635647ed949fec5b4e5 commit a17f484b312c390924879635647ed949fec5b4e5 Author: Miklos Vajna Date: Tue Jun 10 01:06:08 2008 +0200 dg send: implement --to option diff --git a/darcs-git.py b/darcs-git.py index 435332b..d3051e4 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -726,18 +726,20 @@ Use "darcs-git help send-email" for more information. Options: -d --dry-run don't actually take the action - -h --help shows brief description of command and its arguments""" + -h --help shows brief description of command and its arguments + -t --to specify destination email""" sys.exit(ret) class Options: def __init__(self): self.dryrun = "" self.help = False + self.to = "" self.gitopts = "" options = Options() try: - opts, args = getopt.getopt(argv, "d", ["dry-run"]) + opts, args = getopt.getopt(argv, "dt:", ["dry-run", "to="]) except getopt.GetoptError: usage(1) optind = 0 @@ -746,6 +748,8 @@ Options: options.dryrun = "--dry-run" elif opt in ("-h", "--help"): options.help = True + elif opt in ("-t", "--to"): + options.to = '--to="%s"' % arg optind += 1 if optind < len(argv): options.gitopts = " ".join(argv[optind:]) @@ -757,7 +761,7 @@ Options: sock = os.popen("git config user.email") author += " <%s>" % sock.readline().strip() sock.close() - return os.system("""git send-email --envelope-sender "%s" --from "%s" --suppress-from %s %s""" % (author, author, options.dryrun, options.gitopts)) + return os.system("""git send-email --envelope-sender "%s" --from "%s" --suppress-from %s %s %s""" % (author, author, options.dryrun, options.to, options.gitopts)) def get(argv): def usage(ret): From vmiklos at frugalware.org Thu Jun 12 20:52:52 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jun 12 20:52:59 2008 Subject: [Frugalware-git] pacman-tools: fblint: check if parent dir == the first group Message-ID: <20080612185252.A3CDB17780AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=409ac53055a94e90bce3aba804edce0020d6283f commit 409ac53055a94e90bce3aba804edce0020d6283f Author: Miklos Vajna Date: Thu Jun 12 20:38:08 2008 +0200 fblint: check if parent dir == the first group diff --git a/fblint b/fblint index f4a7454..9605481 100755 --- a/fblint +++ b/fblint @@ -111,7 +111,8 @@ check "maintainer" "grep -q '^# Maintainer: ' $_fblint_fb" check "syntax errors" "source $_fblint_fb" check "pkgname" "[ ! -z \"$pkgname\" ]" # fst is a special exception for chroot builds -check "dirname is the same as pkgname" "[ $pkgname == `pwd|sed 's|.*/||'` -o fst == `pwd|sed 's|.*/||'` ]" +check "parent dir is the same as the first group" "[ $pkgname == `pwd|sed 's|.*/||'` -o fst == `pwd|sed 's|.*/||'` ]" +check "dirname is the same as pkgname" "[ $groups == `pwd|sed 's|.*/\(.*\)/.*|\1|'` -o tmp == `pwd|sed 's|.*/\(.*\)/.*|\1|'` ]" check "uppercase letters in pkgname" "! echo $pkgname | grep -q '[A-Z]'" check "pkgver" "[ ! -z \"$pkgver\" ]" check "hyphen-less pkgver" "[ ! `echo $pkgver | grep '-'` ]" From vmiklos at frugalware.org Thu Jun 12 21:33:08 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jun 12 21:33:10 2008 Subject: [Frugalware-git] pacman-tools: repoman del: allow removing empty dirs as well Message-ID: <20080612193308.A152F1778001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=dff917bb9aaaecc2645ca5407042341be58187ec commit dff917bb9aaaecc2645ca5407042341be58187ec Author: Miklos Vajna Date: Thu Jun 12 21:30:28 2008 +0200 repoman del: allow removing empty dirs as well diff --git a/repoman b/repoman index fb1e4ec..d023411 100755 --- a/repoman +++ b/repoman @@ -114,7 +114,12 @@ server() for i in "$@" do # strip leading / and any .. - rm $rmopts "`echo $i|sed 's|^/||;s|\.\./||g'`" + target=`echo $i|sed 's|^/||;s|\.\./||g'` + if [ -f $target ]; then + rm $rmopts $target + elif [ -d $target ]; then + rmdir $rmopts $target + fi done ;; From vmiklos at frugalware.org Thu Jun 12 21:33:08 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jun 12 21:33:12 2008 Subject: [Frugalware-git] pacman-tools: repoman del: filter out any option other than -v Message-ID: <20080612193308.B3D6C17780AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=f2e10d6c4c08210a6034d4b976629e00ebbb6e94 commit f2e10d6c4c08210a6034d4b976629e00ebbb6e94 Author: Miklos Vajna Date: Thu Jun 12 21:33:03 2008 +0200 repoman del: filter out any option other than -v diff --git a/repoman b/repoman index d023411..7176d5c 100755 --- a/repoman +++ b/repoman @@ -103,7 +103,7 @@ server() echo "usage: repoman server delete opts path file1 [file2..]" return fi - local rmopts="$1" path="$2" + local verbose="$1" path="$2" shift 2 check_absolute_path cd $path @@ -111,6 +111,11 @@ server() echo "Couldn't get lock." return fi + if [ -n "$verbose" ]; then + rmopts="-v" + else + rmotps="" + fi for i in "$@" do # strip leading / and any .. @@ -293,10 +298,12 @@ delete() check_servers check_sudo if [ "$verbose" != 0 ]; then - rmopts="-v" + verbose="y" + else + verbose="" fi msg "Deleting file(s): $*" - ssh $host "$sudo_cmd repoman server delete '$rmopts' '$path' $*" + ssh $host "$sudo_cmd repoman server delete '$verbose' '$path' $*" } upload() From vmiklos at frugalware.org Thu Jun 12 21:33:08 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jun 12 21:33:14 2008 Subject: [Frugalware-git] pacman-tools: repoman server: fix 4 lock leaks (on error) Message-ID: <20080612193308.868301770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=82cc33d6ed5536ebdac2d81bce65abd5bdf3bb68 commit 82cc33d6ed5536ebdac2d81bce65abd5bdf3bb68 Author: Miklos Vajna Date: Thu Jun 12 21:26:03 2008 +0200 repoman server: fix 4 lock leaks (on error) diff --git a/repoman b/repoman index 6900e1a..fb1e4ec 100755 --- a/repoman +++ b/repoman @@ -190,10 +190,12 @@ server() fi if ! cd source/$group/$pkg; then echo "There is no package with this group!" + rm -f .git/lock return fi if ! source FrugalBuild; then echo "Failed to parse the FrugalBuid!" + rm -f .git/lock return fi cd - >/dev/null @@ -240,10 +242,12 @@ server() if ! _check_nobuild; then if [ ! -e $fdb ]; then echo "No package database to clean from!" + rm -f .git/lock return else if ! arch=$arch updatesync del $fdb $pkg; then echo "updatesync failed!" + rm -f .git/lock return fi fi From bouleetbil at frogdev.info Thu Jun 12 21:47:27 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jun 12 21:47:29 2008 Subject: [Frugalware-git] frugalware-current: gnome-phone-manager-0.60-1-i686 Message-ID: <20080612194727.B9BAA1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e6a5f401af452aa54cdd8c3c96a8b59c6e7d17e1 commit e6a5f401af452aa54cdd8c3c96a8b59c6e7d17e1 Author: bouleetbil Date: Thu Jun 12 21:22:19 2008 +0200 gnome-phone-manager-0.60-1-i686 *version bump *added gtkspell to depends diff --git a/source/gnome-extra/gnome-phone-manager/FrugalBuild b/source/gnome-extra/gnome-phone-manager/FrugalBuild index 260a900..cfa85b0 100644 --- a/source/gnome-extra/gnome-phone-manager/FrugalBuild +++ b/source/gnome-extra/gnome-phone-manager/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=gnome-phone-manager -pkgver=0.50 +pkgver=0.60 pkgrel=1 pkgdesc="Control aspects of your mobile phone in GNOME desktop" url="http://www.gnome.org" @@ -11,13 +11,13 @@ depends=('gtk+' 'gstreamer' 'gnome-bluetooth' 'libbtctl' 'libusb' \ 'atk' 'pango' 'freetype2' 'libxau' 'libxdmcp' \ 'evolution-data-server' 'e2fsprogs' 'popt' 'nspr' \ 'gnome-vfs' 'openssl' 'esd' 'libbonobo' 'gnokii' \ - 'libxinerama' 'libxi' 'libxrandr' 'libxcursor') + 'libxinerama' 'libxi' 'libxrandr' 'libxcursor' 'gtkspell') makedepends=('perl-xml-parser' 'intltool') options=('scriptlet') groups=('gnome-extra') archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/gnome-phone-manager.schemas') Finclude gnome -sha1sums=('6f9018ac2850ca249a07c7955591a8f7992a563e') +sha1sums=('b10105b085ac636e53ac30dee2f64efa9b30af4a') # optimization OK From bouleetbil at frogdev.info Thu Jun 12 22:15:11 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jun 12 22:15:13 2008 Subject: [Frugalware-git] frugalware-current: balsa-2.3.24-1-i686 Message-ID: <20080612201511.AA2291770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=35cd37621aa53faf479d834dc3a173d0cdb80ce5 commit 35cd37621aa53faf479d834dc3a173d0cdb80ce5 Author: bouleetbil Date: Thu Jun 12 22:08:00 2008 +0200 balsa-2.3.24-1-i686 *version bump diff --git a/source/gnome-extra/balsa/FrugalBuild b/source/gnome-extra/balsa/FrugalBuild index 1da9434..263bf8f 100644 --- a/source/gnome-extra/balsa/FrugalBuild +++ b/source/gnome-extra/balsa/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=balsa -pkgver=2.3.23 +pkgver=2.3.24 pkgrel=1 pkgdesc="Balsa is an e-mail client for GNOME" url="http://balsa.gnome.org" @@ -20,7 +20,7 @@ _F_gnome_desktop="y" Finclude gnome-scriptlet groups=('gnome-extra') archs=('i686' 'x86_64') -sha1sums=('83b59c8964744f8d3d0a36fdfcdb9e5e4f2f0b96') +sha1sums=('772147f2359b39304a0487389d212783bf057752') Fconfopts="${Fconfopts[@]} --with-ssl --with-gtkprint --with-gpgme=gpgme-config \ --with-sqlite=sqlite3 --with-gtkspell --with-gtksourceview=yes" From bouleetbil at frogdev.info Thu Jun 12 22:29:59 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jun 12 22:30:00 2008 Subject: [Frugalware-git] frugalware-current: music-applet-2.4.0-1-i686 Message-ID: <20080612202959.14D2B1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c79de9d7c7aabc3506091ef858a523c3d61ab6e8 commit c79de9d7c7aabc3506091ef858a523c3d61ab6e8 Author: bouleetbil Date: Thu Jun 12 22:24:15 2008 +0200 music-applet-2.4.0-1-i686 *version bump diff --git a/source/gnome-extra/music-applet/FrugalBuild b/source/gnome-extra/music-applet/FrugalBuild index bfe6d86..baed809 100644 --- a/source/gnome-extra/music-applet/FrugalBuild +++ b/source/gnome-extra/music-applet/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=music-applet -pkgver=2.3.1 +pkgver=2.4.0 pkgrel=1 pkgdesc="Music Applet is a GNOME panel applet that lets you control different music players" url="http://www.kuliniewicz.org/music-applet/" @@ -17,6 +17,6 @@ groups=('gnome-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.kuliniewicz.org/music-applet/downloads/ | grep -m1 'Music Applet [0-9]\.[0-9]' | sed 's/.*Applet //' | sed 's/ -.*//'" source=(http://www.kuliniewicz.org/$pkgname/downloads/$pkgname-$pkgver.tar.gz) -sha1sums=('265cbaaa46483df0c9f8345d4dab71ed9ca806d7') +sha1sums=('111b7d4fb0eaff3ec521b77e972ef005f974f3fa') # optimization OK From bouleetbil at frogdev.info Thu Jun 12 22:42:50 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jun 12 22:42:52 2008 Subject: [Frugalware-git] frugalware-current: commons-collections-3.2.1-1-i686 Message-ID: <20080612204250.A2F3E1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=deb09ff6f8c2da8a5c6bfe7d37ccf4171603eaf2 commit deb09ff6f8c2da8a5c6bfe7d37ccf4171603eaf2 Author: bouleetbil Date: Thu Jun 12 22:36:17 2008 +0200 commons-collections-3.2.1-1-i686 *delete useless -f build.xml diff --git a/source/devel-extra/commons-collections/FrugalBuild b/source/devel-extra/commons-collections/FrugalBuild index e32ba99..48b4bc3 100644 --- a/source/devel-extra/commons-collections/FrugalBuild +++ b/source/devel-extra/commons-collections/FrugalBuild @@ -18,7 +18,7 @@ build() { Fcd Fjavacleanup - Fant -f build.xml jar + Fant jar mv build/commons-collections{-$pkgver,}.jar || Fdie Fjar build/commons-collections.jar } From bouleetbil at frogdev.info Thu Jun 12 23:20:54 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jun 12 23:20:56 2008 Subject: [Frugalware-git] frugalware-current: jcommon-1.0.13-1-i686 Message-ID: <20080612212054.608F01770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=61a7a1d5682cbbf7d5d98f7233f8d6e72c22c2f9 commit 61a7a1d5682cbbf7d5d98f7233f8d6e72c22c2f9 Author: bouleetbil Date: Thu Jun 12 23:12:29 2008 +0200 jcommon-1.0.13-1-i686 *new package diff --git a/source/devel-extra/jcommon/FrugalBuild b/source/devel-extra/jcommon/FrugalBuild new file mode 100644 index 0000000..dc4f0fa --- /dev/null +++ b/source/devel-extra/jcommon/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: 0.08 SBU +# Maintainer: bouleetbil + +pkgname=jcommon +pkgver=1.0.13 +pkgrel=1 +pkgdesc="JCommon is a collection of useful classes used by JFreeChart, JFreeReport and other projects." +_F_sourceforge_dirname="jfreechart" +Finclude sourceforge java +depends=(${depends[@]} 'junit') +groups=('devel-extra') +archs=('i686') +url="http://www.jfree.org/jcommon/index.php" +source=($source build.xml) +sha1sums=('20d4c3ec45b268e48285ff0216fca3e6edfd3e52' \ + 'a78c1bda83c9fd11215a15b3089cb7550d208ae9') + +build() { + Fcd + Fjavacleanup + cp $Fsrcdir/build.xml build.xml || Fdie + antflags="-Dproject.name=${pkgname} jar" + Fant ${antflags} + #install + Fjar dist/${pkgname}.jar +} diff --git a/source/devel-extra/jcommon/build.xml b/source/devel-extra/jcommon/build.xml new file mode 100644 index 0000000..779aebf --- /dev/null +++ b/source/devel-extra/jcommon/build.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From bouleetbil at frogdev.info Thu Jun 12 23:48:14 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jun 12 23:48:15 2008 Subject: [Frugalware-git] frugalware-current: jfreechart-1.0.10-1-i686 Message-ID: <20080612214814.5E9A11770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e77ee1e6b6628808a96c807ecb4530254a79ce50 commit e77ee1e6b6628808a96c807ecb4530254a79ce50 Author: bouleetbil Date: Thu Jun 12 23:41:22 2008 +0200 jfreechart-1.0.10-1-i686 *new package diff --git a/source/devel-extra/jfreechart/FrugalBuild b/source/devel-extra/jfreechart/FrugalBuild new file mode 100644 index 0000000..769d454 --- /dev/null +++ b/source/devel-extra/jfreechart/FrugalBuild @@ -0,0 +1,23 @@ +# Compiling Time: 0.37 SBU +# Maintainer: bouleetbil + +pkgname=jfreechart +pkgver=1.0.10 +pkgrel=1 +pkgdesc="JFreeChart is a free (LGPL) chart library for the Java(tm) platform." +Finclude sourceforge java +depends=(${depends[@]} 'jaxp' 'itext' 'jcommon' 'servletapi') +groups=('devel-extra') +archs=('i686') +url="http://www.jfree.org/jfreechart/" +sha1sums=('0b0ae9e24b3940d042a92a40d4f11229ba9294db') + +build() { + Fcd + Fjavacleanup + Fant -f ant/build.xml compile-experimental + mv ${pkgname}-${pkgver}.jar ${pkgname}.jar || Fdie + Fjar ${pkgname}.jar + mv ${pkgname}-${pkgver}-experimental.jar ${pkgname}-experimental.jar || Fdie + Fjar ${pkgname}-experimental.jar +} From ryuo at frugalware.org Thu Jun 12 23:49:25 2008 From: ryuo at frugalware.org (James Buren) Date: Thu Jun 12 23:49:26 2008 Subject: [Frugalware-git] frugalware-current: perl-audio-mixer-0.7-1-i686 Message-ID: <20080612214925.734AA1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=866a4a2cb40e1fcc0bfcfb071227da591934f1d5 commit 866a4a2cb40e1fcc0bfcfb071227da591934f1d5 Author: James Buren Date: Thu Jun 12 16:48:03 2008 -0500 perl-audio-mixer-0.7-1-i686 * new package diff --git a/source/devel-extra/perl-audio-mixer/FrugalBuild b/source/devel-extra/perl-audio-mixer/FrugalBuild new file mode 100644 index 0000000..24902f5 --- /dev/null +++ b/source/devel-extra/perl-audio-mixer/FrugalBuild @@ -0,0 +1,11 @@ +# Compiling Time: 0.1 SBU +# Maintainer: James Buren + +_F_perl_name=Audio-Mixer +_F_perl_author=S/SE/SERGEY +pkgver=0.7 +pkgdesc="Perl extension for Sound Mixer control" +Finclude perl +sha1sums=('dcdc83b78726d760cf59e17bf262b1fad8cda09c') + +# optimization OK From ryuo at frugalware.org Fri Jun 13 00:16:38 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Jun 13 00:16:41 2008 Subject: [Frugalware-git] frugalware-current: perl-x11-freedesktop-desktopentry-0.04-1-i686 Message-ID: <20080612221638.9A8CA1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c1ecd02f3a5ba9cf5d399dc3087f28abcf6b13c1 commit c1ecd02f3a5ba9cf5d399dc3087f28abcf6b13c1 Author: James Buren Date: Thu Jun 12 17:15:50 2008 -0500 perl-x11-freedesktop-desktopentry-0.04-1-i686 * new package diff --git a/source/devel-extra/perl-x11-freedesktop-desktopentry/FrugalBuild b/source/devel-extra/perl-x11-freedesktop-desktopentry/FrugalBuild new file mode 100644 index 0000000..2aeaf83 --- /dev/null +++ b/source/devel-extra/perl-x11-freedesktop-desktopentry/FrugalBuild @@ -0,0 +1,9 @@ +# Compiling Time: 0.1 SBU +# Maintainer: James Buren + +_F_perl_name=X11-FreeDesktop-DesktopEntry +_F_perl_author=G/GB/GBROWN +pkgver=0.04 +pkgdesc="an interface to Freedesktop.org .desktop files." +Finclude perl +sha1sums=('599ac376784d3187c0ed11e284ed9a81a0b0a1e8') From janny at frugalware.org Fri Jun 13 00:22:12 2008 From: janny at frugalware.org (Janos Kovacs) Date: Fri Jun 13 00:22:14 2008 Subject: [Frugalware-git] frugalware-current: pgadmin3-1.8.4-1-i686 Message-ID: <20080612222212.588111770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=68ab0e91388e09a66c47800ef02311b5e2be4e43 commit 68ab0e91388e09a66c47800ef02311b5e2be4e43 Author: Janos Kovacs Date: Fri Jun 13 00:21:19 2008 +0200 pgadmin3-1.8.4-1-i686 * new package diff --git a/source/xapps-extra/pgadmin3/FrugalBuild b/source/xapps-extra/pgadmin3/FrugalBuild new file mode 100644 index 0000000..368425a --- /dev/null +++ b/source/xapps-extra/pgadmin3/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 1.60 SBU +# Maintainer: Janos Kovacs + +pkgname=pgadmin3 +pkgver=1.8.4 +pkgrel=1 +pkgdesc="Graphical client for PostgreSQL" +url="http://www.pgadmin.org" +archs=('i686') +groups=('xapps-extra') +depends=('wxgtk-u8' 'wxgtk-locale' 'postgresql' 'libxslt') +up2date="lynx -dump ${url}|Flasttargz" +source=(http://ftp.be.postgresql.org/pub/postgresql/${pkgname}/release/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz) +sha1sums=('c3103792c678183c5a9081daac56ebf467d674ff') + +build() { + Fmake --disable-debug --with-wx-version=2.8 --with-wx=/usr + Fmakeinstall DESTDIR=${Fdestdir} + Ffilerel pgadmin/include/images/elephant48.xpm /usr/share/pixmaps/${pkgname}.xpm + Ffilerel pkg/${pkgname}.desktop ${Fmenudir}/${pkgname}.desktop + Fln "/usr/share/pixmaps/${pkgname}.xpm" "/usr/share/${pkgname}/${pkgname}.xpm" +} From ryuo at frugalware.org Fri Jun 13 00:55:51 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Jun 13 00:55:55 2008 Subject: [Frugalware-git] frugalware-current: perlpanel-0.9.1-1-i686 Message-ID: <20080612225551.E772A1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a97844673b7dc3655585ab1b3deee09e3415b723 commit a97844673b7dc3655585ab1b3deee09e3415b723 Author: James Buren Date: Thu Jun 12 17:54:25 2008 -0500 perlpanel-0.9.1-1-i686 * new package diff --git a/source/x11-extra/perlpanel/FrugalBuild b/source/x11-extra/perlpanel/FrugalBuild new file mode 100644 index 0000000..3fe630a --- /dev/null +++ b/source/x11-extra/perlpanel/FrugalBuild @@ -0,0 +1,28 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=perlpanel +pkgver=0.9.1 +pkgrel=1 +pkgdesc="A feature-packed panel written in perl." +url="http://savannah.nongnu.org/projects/perlpanel" +depends=('perl-gtk2-gladexml' 'perl-xml-simple' 'perl-gnome2-wnck' 'perl-gettext') +rodepends=('perl-date-manip' 'perl-audio-mixer' 'perl-x11-freedesktop-desktopentry') +groups=('x11-extra') +archs=('i686') +# no known newer version, and main website is gone. +# disable up2date for now, gotten from debian +up2date="echo $pkgver" +options=('scriptlet') +source=(http://ftp.de.debian.org/debian/pool/main/p/perlpanel/perlpanel_0.9.1.orig.tar.gz) +sha1sums=('79577c45ee020baa16f8284bad464fcb997912c4') +_F_gnome_iconcache=y +Finclude gnome-scriptlet + +build() +{ + Fcd PerlPanel-$pkgver + Fsed '/usr/local' '/usr' Makefile + Fbuild + Fbuild_gnome_scriptlet +} diff --git a/source/x11-extra/perlpanel/README.Frugalware b/source/x11-extra/perlpanel/README.Frugalware new file mode 100644 index 0000000..7add3c5 --- /dev/null +++ b/source/x11-extra/perlpanel/README.Frugalware @@ -0,0 +1,9 @@ +I have purposely left out a few perl modules from the dependencies array, +because they are not needed to run perlpanel and drag in a lot of GNOME or +other stuff you may not want. Below, you will find a list of these modules and +what they do. If you find errors in this documentation, then please report it +and I will look into it. + +perl-xmms - perlpanel plugin interface to xmms +perl-gnome2-vfs - various gnome plugin interfaces for perlpanel +libgnomeui - for full libglade support in perlpanel From devil505linux at gmail.com Fri Jun 13 08:29:44 2008 From: devil505linux at gmail.com (Devil505) Date: Fri Jun 13 08:29:46 2008 Subject: [Frugalware-git] frugalware-current: xcfa-3.3.33-1-i686 Message-ID: <20080613062944.4C6C21770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=39e8fab3352dabd50413b0edea7949d37a5a04c2 commit 39e8fab3352dabd50413b0edea7949d37a5a04c2 Author: Devil505 Date: Fri Jun 13 08:29:36 2008 +0200 xcfa-3.3.33-1-i686 * version bump diff --git a/source/xapps-extra/xcfa/FrugalBuild b/source/xapps-extra/xcfa/FrugalBuild index aecc4e3..bb3fdfd 100644 --- a/source/xapps-extra/xcfa/FrugalBuild +++ b/source/xapps-extra/xcfa/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: jedifox pkgname=xcfa -pkgver=3.3.29 +pkgver=3.3.33 pkgrel=1 pkgdesc="Frontend which use miscellaneous external programs to extract and convert music files" url="http://www.xcfa.tuxfamily.org/" @@ -15,4 +15,4 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://download.tuxfamily.org/xcfaudio/download/Src/ | Flasttar" Fconfopts="${Fconfopts[@]} --disable-ansi" source=(http://download.tuxfamily.org/xcfaudio/download/Src/$pkgname-$pkgver.tar.gz) -sha1sums=('d7292238ad29655420073253979824d977d773ac') +sha1sums=('336daa13d431a519970e8d740d424f3cb1f0cc0f') From devil505linux at gmail.com Fri Jun 13 08:48:35 2008 From: devil505linux at gmail.com (Devil505) Date: Fri Jun 13 08:48:37 2008 Subject: [Frugalware-git] frugalware-current: snes9x-gtk-33-1-i686 Message-ID: <20080613064835.21B851770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=844b96c7bf2de2362991bb6f4bb949a940462efe commit 844b96c7bf2de2362991bb6f4bb949a940462efe Author: Devil505 Date: Fri Jun 13 08:48:25 2008 +0200 snes9x-gtk-33-1-i686 * version bump diff --git a/source/games-extra/snes9x-gtk/FrugalBuild b/source/games-extra/snes9x-gtk/FrugalBuild index 8281d0c..db457b6 100644 --- a/source/games-extra/snes9x-gtk/FrugalBuild +++ b/source/games-extra/snes9x-gtk/FrugalBuild @@ -3,7 +3,7 @@ pkgname=snes9x-gtk _F_archive_name="snes9x-1.51-src-gtk" -pkgver=31 +pkgver=33 pkgrel=1 pkgdesc="GTK+ Version of snes9x, a portable Emulator for the Super Nintento Entertainment System" url="http://snes9x.com/phpbb2/viewtopic.php?t=3703" @@ -15,7 +15,7 @@ up2date="lynx -dump $url | Flasttar" source=(http://bearoso.googlepages.com/$_F_archive_name-$pkgver.tar.bz2) Fconfopts="${Fconfopts[@]} -with-gtk --with-opengl --with-netplay" _F_cd_path="snes9x-1.51-src" -sha1sums=('3c5ae6147de11d1b9d8a25b122edb436bd0b410c') +sha1sums=('c37052afb1fff4c782887221c853ca73251f1552') _F_desktop_name="Snes9X GTK+" _F_desktop_desc="SNES Emulator" From ryuo at frugalware.org Fri Jun 13 08:55:57 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Jun 13 08:55:58 2008 Subject: [Frugalware-git] frugalware-current: xfce4-places-plugin-1.1.0-1-i686 Message-ID: <20080613065557.8A7BD1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=40e04b30a4918f3d347aabb50bd2224deb73d1aa commit 40e04b30a4918f3d347aabb50bd2224deb73d1aa Author: James Buren Date: Fri Jun 13 01:54:20 2008 -0500 xfce4-places-plugin-1.1.0-1-i686 * version bump diff --git a/source/xfce4/xfce4-places-plugin/FrugalBuild b/source/xfce4/xfce4-places-plugin/FrugalBuild index 2326628..45657c2 100644 --- a/source/xfce4/xfce4-places-plugin/FrugalBuild +++ b/source/xfce4/xfce4-places-plugin/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-places-plugin -pkgver=1.0.0 +pkgver=1.1.0 pkgrel=1 pkgdesc="A file browser launcher plugin for the Xfce4 panel." makedepends=('intltool') @@ -11,6 +11,6 @@ groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64') _F_gnome_iconcache="y" Finclude xfce4 gnome-scriptlet -sha1sums=('16cb0b7c3d869010f12656da64277e213bbb8de8') +sha1sums=('599ab07f7d4bd9bb24af69ffba74f88dfe01b38e') # optimization OK From ryuo at frugalware.org Fri Jun 13 09:32:53 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Jun 13 09:32:56 2008 Subject: [Frugalware-git] frugalware-current: libisofs-0.6.6-1-i686 Message-ID: <20080613073253.350F91770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ce645a5ec1f56acfff60e29fcdcde8c137648058 commit ce645a5ec1f56acfff60e29fcdcde8c137648058 Author: James Buren Date: Fri Jun 13 02:29:03 2008 -0500 libisofs-0.6.6-1-i686 * new package diff --git a/source/lib-extra/libisofs/FrugalBuild b/source/lib-extra/libisofs/FrugalBuild new file mode 100644 index 0000000..9ff64a3 --- /dev/null +++ b/source/lib-extra/libisofs/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.07 SBU +# Maintainer: James Buren + +pkgname=libisofs +pkgver=0.6.6 +pkgrel=1 +pkgdesc="A library for creating ISO filesystem, among other things." +url="http://libburnia-project.org" +depends=('glibc' 'libburn') +groups=('lib-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url/wiki/Releases" +source=(http://files.libburnia-project.org/releases/$pkgname-$pkgver.tar.gz) +sha1sums=('1d348486f4ae54c5d336f12b691ffdf090a21481') + +# optimization OK From ryuo at frugalware.org Fri Jun 13 09:41:36 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Jun 13 09:41:38 2008 Subject: [Frugalware-git] frugalware-current: xfburn-0.3.0-1-i686 Message-ID: <20080613074136.149AC1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ab7eb385c51f118b5b09f593e398bb9a1323e8ba commit ab7eb385c51f118b5b09f593e398bb9a1323e8ba Author: James Buren Date: Fri Jun 13 02:41:31 2008 -0500 xfburn-0.3.0-1-i686 * version bump * dependency update diff --git a/source/xfce4-extra/xfburn/FrugalBuild b/source/xfce4-extra/xfburn/FrugalBuild index 7419a19..43c1070 100644 --- a/source/xfce4-extra/xfburn/FrugalBuild +++ b/source/xfce4-extra/xfburn/FrugalBuild @@ -2,13 +2,12 @@ # Maintainer: Priyank Gosalia pkgname=xfburn -pkgver=0.2.0 -pkgrel=2 +pkgver=0.3.0 +pkgrel=1 pkgdesc="A CD Recorder for Xfce4." url="http://www.xfce.org/projects/xfburn/" makedepends=('intltool' 'pkgconfig') -depends=('thunar>=0.9.0' 'libexo>=0.3.4' 'libxfcegui4>=4.4.2' 'cdrtools' \ - 'cdrdao') +depends=('thunar>=0.9.0' 'libexo>=0.3.4' 'libxfcegui4>=4.4.2' 'libisofs') options=('scriptlet') groups=('xfce4-extra') archs=('i686' 'x86_64') @@ -16,6 +15,6 @@ _F_gnome_iconcache="y" Finclude gnome-scriptlet up2date="Flasttar http://foo-projects.org/~pollux/xfburn" source=(http://foo-projects.org/~pollux/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('9d60dc73b6f5d98515d1cc7b8b7ac82271bdeb7e') +sha1sums=('cfce827a11adc4f140640c6a673f656aa6a2c8ad') # optimization OK From ryuo at frugalware.org Fri Jun 13 09:53:58 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Jun 13 09:54:00 2008 Subject: [Frugalware-git] frugalware-current: tea-17.6.1-1-i686 Message-ID: <20080613075358.BE78F1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4ed46c0e8330bb31267563e65faa991450d62a8d commit 4ed46c0e8330bb31267563e65faa991450d62a8d Author: James Buren Date: Fri Jun 13 02:53:41 2008 -0500 tea-17.6.1-1-i686 * version bump diff --git a/source/gnome-extra/tea/FrugalBuild b/source/gnome-extra/tea/FrugalBuild index 3826498..0140513 100644 --- a/source/gnome-extra/tea/FrugalBuild +++ b/source/gnome-extra/tea/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=tea -pkgver=17.6.0 +pkgver=17.6.1 pkgrel=1 pkgdesc="TEA is a GTK2-based text editor for Linux and *BSD." _F_sourceforge_name="tea" @@ -19,7 +19,7 @@ _F_desktop_name=Tea _F_desktop_icon=tea.png _F_desktop_categories="Utility;Editor;" _F_cd_path="$pkgname-$pkgver" -sha1sums=('3cca4b2d78ff73de72d5568f79e91030e40d7efa') +sha1sums=('f5d7e7f836217f953bcdaf12b0d86922ddda5477') build() { From ryuo at frugalware.org Fri Jun 13 10:29:36 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Jun 13 10:29:39 2008 Subject: [Frugalware-git] frugalware-current: miro-1.2.4-1-i686 Message-ID: <20080613082936.DD00C1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0aaca33a61eda29b1de92b192d56e40fc2ca8521 commit 0aaca33a61eda29b1de92b192d56e40fc2ca8521 Author: James Buren Date: Fri Jun 13 03:27:44 2008 -0500 miro-1.2.4-1-i686 * version bump diff --git a/source/gnome-extra/miro/FrugalBuild b/source/gnome-extra/miro/FrugalBuild index 33208e7..9888a1c 100644 --- a/source/gnome-extra/miro/FrugalBuild +++ b/source/gnome-extra/miro/FrugalBuild @@ -3,7 +3,7 @@ pkgname=miro _F_archive_name=Miro -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=1 pkgdesc="The free and open source internet TV platform." url="http://www.getmiro.com/" @@ -18,7 +18,7 @@ options=('scriptlet') up2date="lynx -dump 'http://ftp.osuosl.org/pub/pculture.org/miro/src/?C=M;O=A'| Flasttar" source=(http://ftp.osuosl.org/pub/pculture.org/$pkgname/src/${_F_archive_name}-$pkgver.tar.gz \ qt-mt.pc gcc43.patch) -sha1sums=('3a20801ebeeeb537cc1ed9f6fc3b37b210bee8e4' \ +sha1sums=('8533d8003cf1bcfb410b86c34804f75b95435a58' \ '153e1902352eb4d724ec816b8097f01830178181' \ 'e6cf10bbff82d7a2b608904734b005004ae6b6ca') From ryuo at frugalware.org Fri Jun 13 10:41:31 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Jun 13 10:41:32 2008 Subject: [Frugalware-git] frugalware-current: perl-audio-mixer-0.7-1-i686 Message-ID: <20080613084131.237E51770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=41c5ed5214afc9f2730e018539e2d6aacc8dd237 commit 41c5ed5214afc9f2730e018539e2d6aacc8dd237 Author: James Buren Date: Fri Jun 13 03:40:26 2008 -0500 perl-audio-mixer-0.7-1-i686 * added x86_64 to archs diff --git a/source/devel-extra/perl-audio-mixer/FrugalBuild b/source/devel-extra/perl-audio-mixer/FrugalBuild index 24902f5..a176f92 100644 --- a/source/devel-extra/perl-audio-mixer/FrugalBuild +++ b/source/devel-extra/perl-audio-mixer/FrugalBuild @@ -7,5 +7,6 @@ pkgver=0.7 pkgdesc="Perl extension for Sound Mixer control" Finclude perl sha1sums=('dcdc83b78726d760cf59e17bf262b1fad8cda09c') +archs=('i686' 'x86_64') # optimization OK From ryuo at frugalware.org Fri Jun 13 10:41:31 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Jun 13 10:41:35 2008 Subject: [Frugalware-git] frugalware-current: perl-x11-freedesktop-desktopentry-0.04-1-i686 Message-ID: <20080613084131.43D0A17780AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=763d632082901d15c215bfdaa2a377ae0b34107f commit 763d632082901d15c215bfdaa2a377ae0b34107f Author: James Buren Date: Fri Jun 13 03:40:59 2008 -0500 perl-x11-freedesktop-desktopentry-0.04-1-i686 * added x86_64 to archs diff --git a/source/devel-extra/perl-x11-freedesktop-desktopentry/FrugalBuild b/source/devel-extra/perl-x11-freedesktop-desktopentry/FrugalBuild index 2aeaf83..568207f 100644 --- a/source/devel-extra/perl-x11-freedesktop-desktopentry/FrugalBuild +++ b/source/devel-extra/perl-x11-freedesktop-desktopentry/FrugalBuild @@ -7,3 +7,4 @@ pkgver=0.04 pkgdesc="an interface to Freedesktop.org .desktop files." Finclude perl sha1sums=('599ac376784d3187c0ed11e284ed9a81a0b0a1e8') +archs=('i686' 'x86_64') From ryuo at frugalware.org Fri Jun 13 10:43:40 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Jun 13 10:43:42 2008 Subject: [Frugalware-git] frugalware-current: perlpanel-0.9.1-1-i686 Message-ID: <20080613084340.B21AF1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b10d5f939030d995626910bd2479b1fbff7cb702 commit b10d5f939030d995626910bd2479b1fbff7cb702 Author: James Buren Date: Fri Jun 13 03:43:41 2008 -0500 perlpanel-0.9.1-1-i686 * added x86_64 to archs diff --git a/source/x11-extra/perlpanel/FrugalBuild b/source/x11-extra/perlpanel/FrugalBuild index 3fe630a..f31fc73 100644 --- a/source/x11-extra/perlpanel/FrugalBuild +++ b/source/x11-extra/perlpanel/FrugalBuild @@ -9,7 +9,7 @@ url="http://savannah.nongnu.org/projects/perlpanel" depends=('perl-gtk2-gladexml' 'perl-xml-simple' 'perl-gnome2-wnck' 'perl-gettext') rodepends=('perl-date-manip' 'perl-audio-mixer' 'perl-x11-freedesktop-desktopentry') groups=('x11-extra') -archs=('i686') +archs=('i686' 'x86_64') # no known newer version, and main website is gone. # disable up2date for now, gotten from debian up2date="echo $pkgver" From bouleetbil at frogdev.info Fri Jun 13 11:29:46 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Jun 13 11:29:49 2008 Subject: [Frugalware-git] frugalware-current: jaudiotagger-1.0.8-1-i686 Message-ID: <20080613092946.972EB1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5693799fceb40847a64446104614cc43ea6fb19d commit 5693799fceb40847a64446104614cc43ea6fb19d Author: bouleetbil Date: Fri Jun 13 11:21:02 2008 +0200 jaudiotagger-1.0.8-1-i686 *new package diff --git a/source/devel-extra/jaudiotagger/FrugalBuild b/source/devel-extra/jaudiotagger/FrugalBuild new file mode 100644 index 0000000..ab891de --- /dev/null +++ b/source/devel-extra/jaudiotagger/FrugalBuild @@ -0,0 +1,27 @@ +# Compiling Time: 0.26 SBU +# Maintainer: bouleetbil + +pkgname=jaudiotagger +_F_archive_name="jaudiotaggerv" +Fpkgversep="" +pkgver=1.0.8 +pkgrel=1 +pkgdesc="Jaudiotagger is the Audio Tagging library written in Java" +url="http://www.jthink.net/$pkgname/index.jsp" +Finclude java +groups=('devel-extra') +archs=('i686') +up2date="elinks -dump https://$pkgname.dev.java.net/projectpages/releases.html \ + | grep .zip | head -1 | cut -d 'v' -f2 | sed 's|.zip||'" +source=(https://$pkgname.dev.java.net/files/documents/2750/78029/${_F_archive_name}${pkgver}.zip \ + jaudiotagger-1.0.8-buildfixes.patch) +sha1sums=('c14b70bc765c2ee73a9a314c144742e9d58f37aa' \ + '1f02645b884936e16c53c72e8fda3bb133ac4712') + +build() { + Fcd + Fpatchall + Fjavacleanup + Fant build.jar + Fjar dist/$pkgname.jar +} diff --git a/source/devel-extra/jaudiotagger/jaudiotagger-1.0.8-buildfixes.patch b/source/devel-extra/jaudiotagger/jaudiotagger-1.0.8-buildfixes.patch new file mode 100644 index 0000000..d691a88 --- /dev/null +++ b/source/devel-extra/jaudiotagger/jaudiotagger-1.0.8-buildfixes.patch @@ -0,0 +1,51 @@ +--- build.xml 2007-11-13 20:59:00.000000000 +0200 ++++ build.xml.fixed 2008-06-12 22:53:57.000000000 +0200 +@@ -9,7 +9,7 @@ + + + +- ++ + + + +@@ -165,7 +165,7 @@ + + + +- ++ + + + +@@ -197,13 +197,6 @@ + + + +- +- +- +- +- +- +- + + + +@@ -264,8 +257,6 @@ + + + +- +- + + + +@@ -305,4 +296,4 @@ + + + +- +\ Dosya sonunda yenisatır yok. ++ + From devil505linux at gmail.com Fri Jun 13 11:47:06 2008 From: devil505linux at gmail.com (Devil505) Date: Fri Jun 13 11:47:07 2008 Subject: [Frugalware-git] frugalware-current: bouml-4.4-1-x86_64 Message-ID: <20080613094706.256DD1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=58df9244762052604e67c51c0fa1b4c1e0ec8526 commit 58df9244762052604e67c51c0fa1b4c1e0ec8526 Author: Devil505 Date: Fri Jun 13 11:46:39 2008 +0200 bouml-4.4-1-x86_64 * version bump diff --git a/source/xapps-extra/bouml/FrugalBuild b/source/xapps-extra/bouml/FrugalBuild index 4db68dc..39a8a3a 100644 --- a/source/xapps-extra/bouml/FrugalBuild +++ b/source/xapps-extra/bouml/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=bouml -pkgver=4.3.5 +pkgver=4.4 pkgrel=1 pkgdesc="Free UML 2 tool box with C++, Java and Idl code generation" _F_sourceforge_sep="_" @@ -14,6 +14,6 @@ options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') _F_cd_path="${pkgname}_${pkgver}" -sha1sums=('73c40df173bdecfefe035e462cc84cc55929b353') +sha1sums=('6b2d9646db42bdc8174694a7fa2d276e207f5f1c') # optimization OK From bouleetbil at frogdev.info Fri Jun 13 14:05:08 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Jun 13 14:05:12 2008 Subject: [Frugalware-git] frugalware-current: lucene-2.3.2-1-i686 Message-ID: <20080613120508.E51C41770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7d1e436268b0320d9acdc383434e77c7378eeef8 commit 7d1e436268b0320d9acdc383434e77c7378eeef8 Author: bouleetbil Date: Fri Jun 13 13:36:57 2008 +0200 lucene-2.3.2-1-i686 *new package diff --git a/source/devel-extra/lucene/FrugalBuild b/source/devel-extra/lucene/FrugalBuild new file mode 100644 index 0000000..5a858af --- /dev/null +++ b/source/devel-extra/lucene/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0.20 SBU +# Maintainer: bouleetbil + +pkgname=lucene +pkgver=2.3.2 +pkgrel=1 +pkgdesc="High-performance, full-featured text search engine written entirely in Java" +url="http://jakarta.apache.org/$pkgname/" +Finclude java +groups=('devel-extra') +archs=('i686') +up2date="Flastarchive http://www.apache.org/dist/$pkgname/java/ -src.tar.gz" +source=(http://www.apache.org/dist/$pkgname/java/$pkgname-$pkgver-src.tar.gz) +sha1sums=('0088a7c521c1bcc4b218d52da72eabc43d2279c9') + +build() { + Fcd + Fjavacleanup + Fant + mv build/${pkgname}-core-2.3.jar ${pkgname}-core.jar || Fdie + Fjar ${pkgname}-core.jar +} From bouleetbil at frogdev.info Fri Jun 13 14:13:11 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Jun 13 14:13:13 2008 Subject: [Frugalware-git] frugalware-current: jakarta-oro-2.0.8-1 Message-ID: <20080613121311.2ADE41770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=659ee8bc5b30048a3ecff64d0354483c54a663a1 commit 659ee8bc5b30048a3ecff64d0354483c54a663a1 Author: bouleetbil Date: Fri Jun 13 14:05:42 2008 +0200 jakarta-oro-2.0.8-1 *new package diff --git a/source/devel-extra/jakarta-oro/FrugalBuild b/source/devel-extra/jakarta-oro/FrugalBuild new file mode 100644 index 0000000..dc98880 --- /dev/null +++ b/source/devel-extra/jakarta-oro/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0.03 SBU +# Maintainer: bouleetbil + +pkgname=jakarta-oro +pkgver=2.0.8 +pkgrel=1 +pkgdesc="Set text-processing Java classes that provide Perl5 compatible regular expressions." +url="http://jakarta.apache.org/oro/" +Finclude java +groups=('devel-extra') +archs=('i686') +up2date="lynx -dump http://www.apache.org/dist/jakarta/oro/source/ | Flasttar" +source=(http://www.apache.org/dist/jakarta/oro/source/$pkgname-$pkgver.tar.gz) +sha1sums=('23d708b77885c97149873e808fdf4bcf05fe6708') + +build() { + Fcd + Fjavacleanup + Fant + mv $pkgname-$pkgver.jar $pkgname.jar || Fdie + Fjar ${pkgname}.jar +} From vmiklos at frugalware.org Fri Jun 13 16:00:40 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 13 16:00:42 2008 Subject: [Frugalware-git] homepage-ng: FSA466-rxvt Message-ID: <20080613140040.61ACD1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=87291a30a9471adf406005b3775251818c42e4ae commit 87291a30a9471adf406005b3775251818c42e4ae Author: Miklos Vajna Date: Fri Jun 13 16:00:34 2008 +0200 FSA466-rxvt diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index c238862..1f0235c 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,17 @@ + 466 + 2008-06-13 + rxvt + 2.6.4-2 + 2.7.10-1kalgan1 + http://bugs.frugalware.org/task/2925 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1142 + Bernhard R. Link has reported a security issue in rxvt, which can be exploited by malicious, local users to gain escalated privileges. + The security issue is caused due to the program using ":0" as it's X11 display if the DISPLAY environment variable is missing. This can be exploited to execute arbitrary commands with the privileges of the user running rxvt via a malicious X server. + + 465 2008-06-10 net-snmp From vmiklos at frugalware.org Fri Jun 13 16:03:16 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 13 16:03:18 2008 Subject: [Frugalware-git] homepage-ng: FSA467-aterm Message-ID: <20080613140316.85E381770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=857c15ede38570f6ef5251eecb0b9d0fa4eda405 commit 857c15ede38570f6ef5251eecb0b9d0fa4eda405 Author: Miklos Vajna Date: Fri Jun 13 16:03:07 2008 +0200 FSA467-aterm diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 1f0235c..5c24a05 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,17 @@ + 467 + 2008-06-13 + aterm + 1.0.1-1 + 1.0.1-2kalgan1 + http://bugs.frugalware.org/task/3088 + There is no CVE for this issue. + A security issue has been reported in aterm, which can be exploited by malicious, local users to gain escalated privileges. + For more information, see FSA466. + + 466 2008-06-13 rxvt From vmiklos at frugalware.org Fri Jun 13 16:05:13 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 13 16:05:15 2008 Subject: [Frugalware-git] homepage-ng: FSA468-rxvt-unicode Message-ID: <20080613140513.962621770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=75caf36f25707c426c4a3c548b81d5c1a6bd298e commit 75caf36f25707c426c4a3c548b81d5c1a6bd298e Author: Miklos Vajna Date: Fri Jun 13 16:05:08 2008 +0200 FSA468-rxvt-unicode diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 5c24a05..4d23ee2 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,17 @@ + 468 + 2008-06-13 + rxvt-unicode + 9.02-1 + 9.02-2kalgan1 + http://bugs.frugalware.org/task/3089 + There is no CVE for this issue. + A security issue has been reported in rxvt-unicode, which can be exploited by malicious, local users to gain escalated privileges. + For more information, see FSA466. + + 467 2008-06-13 aterm From vmiklos at frugalware.org Fri Jun 13 16:07:29 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 13 16:07:31 2008 Subject: [Frugalware-git] homepage-ng: FSA469-mrxvt Message-ID: <20080613140729.EB7501770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=a243e1ca71745ada1d42ba4a52e4109345ab2547 commit a243e1ca71745ada1d42ba4a52e4109345ab2547 Author: Miklos Vajna Date: Fri Jun 13 16:07:26 2008 +0200 FSA469-mrxvt diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 4d23ee2..f3ac257 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,17 @@ + 469 + 2008-06-13 + mrxvt + 0.5.3-1 + 0.5.3-2kalgan1 + http://bugs.frugalware.org/task/3090 + There is no CVE for this issue. + A security issue has been reported in mrxvt, which can be exploited by malicious, local users to gain escalated privileges. + For more information, see FSA466. + + 468 2008-06-13 rxvt-unicode From vmiklos at frugalware.org Fri Jun 13 16:12:33 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 13 16:12:34 2008 Subject: [Frugalware-git] homepage-ng: FSA450-imlib2 Message-ID: <20080613141233.7F20A1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=3a81b930d702cdb9bd15e4f290600dd4a77e4ca9 commit 3a81b930d702cdb9bd15e4f290600dd4a77e4ca9 Author: Miklos Vajna Date: Fri Jun 13 16:12:29 2008 +0200 FSA450-imlib2 diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index f3ac257..c616b4c 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,20 @@ + 450 + 2008-06-13 + imlib2 + 1.4.0-1 + 1.4.0-2kalgan1 + http://bugs.frugalware.org/task/3124 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2426 + Secunia Research has discovered two vulnerabilities in imlib2, which can be exploited by malicious people to cause a DoS (Denial of Service) or compromise an application using the library. + 1) A boundary error exists within the "load()" function in src/modules/loaders/loader_pnm.c when processing the header of a PNM image file. This can be exploited to cause a stack-based buffer overflow by e.g. tricking a user into opening a specially crafted PNM image in an application using the imlib2 library. + Successful exploitation allows execution of arbitrary code. + 2) A boundary error exists within the "load()" function in src/modules/loader_xpm.c when processing an XPM image file. This can be exploited to cause a stack-based buffer overflow by e.g. tricking a user into opening a specially crafted XPM image in an application using the imlib2 library. + Successful exploitation may allow execution of arbitrary code. + + 469 2008-06-13 mrxvt From vmiklos at frugalware.org Fri Jun 13 16:14:53 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 13 16:14:55 2008 Subject: [Frugalware-git] homepage-ng: FSA451-stunnel Message-ID: <20080613141453.75A4B1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=f0a6954bb324444230bd622f664f0cdce1a4f510 commit f0a6954bb324444230bd622f664f0cdce1a4f510 Author: Miklos Vajna Date: Fri Jun 13 16:14:50 2008 +0200 FSA451-stunnel diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index c616b4c..86d800d 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,17 @@ + 451 + 2008-06-13 + stunnel + 4.21-1 + 4.24-1kalgan1 + http://bugs.frugalware.org/task/3122 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2420 + A security issue has been reported in Stunnel, which can be exploited by malicious people to bypass certain security restrictions. + The security issue is caused due to an unspecified error in the OCSP functionality and can lead to a revoked certificate being successfully authenticated. + + 450 2008-06-13 imlib2 From vmiklos at frugalware.org Fri Jun 13 16:16:48 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 13 16:16:50 2008 Subject: [Frugalware-git] homepage-ng: FSA452-emacs Message-ID: <20080613141648.87D701770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=19cc3dbd8c074686f112abf1898665378a82d6b0 commit 19cc3dbd8c074686f112abf1898665378a82d6b0 Author: Miklos Vajna Date: Fri Jun 13 16:16:45 2008 +0200 FSA452-emacs diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 86d800d..5ad0de6 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,18 @@ + 452 + 2008-06-13 + emacs + 22.1-3kalgan1 + 22.1-3kalgan2 + http://bugs.frugalware.org/task/3086 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2142 + Morten Welinder has reported a vulnerability in GNU Emacs, which can be exploited by malicious people to compromise a user's system. + The vulnerability is caused due to an error in the processing of fast-lock files (.flc) for corresponding source files. This can be exploited to execute arbitrary Emacs Lisp code when e.g. a source file is opened and a specially crafted fast-lock file exists in the same directory. + Successful exploitation requires that "font-lock-support-mode" is set to "fast-lock-mode". + + 451 2008-06-13 stunnel From vmiklos at frugalware.org Fri Jun 13 16:19:05 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 13 16:19:07 2008 Subject: [Frugalware-git] homepage-ng: FSA453-libvorbis Message-ID: <20080613141905.CC2121770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=fcdbe0728e067bcd3a41d334c764f3fe68ada35f commit fcdbe0728e067bcd3a41d334c764f3fe68ada35f Author: Miklos Vajna Date: Fri Jun 13 16:19:02 2008 +0200 FSA453-libvorbis diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 5ad0de6..b624c2e 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,22 @@ + 453 + 2008-06-13 + libvorbis + 1.2.0-1 + 1.2.0-2kalgan1 + http://bugs.frugalware.org/task/3093 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1419 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1420 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1423 + Some vulnerabilities have been reported in libvorbis, which can be exploited by malicious people to cause a DoS (Denial of Service) and potentially to compromise an application using the library. + 1) An input validation error can be exploited to crash an application, cause an infinite loop, or to cause a heap overflow via a specially crafted OGG file containing a codebook dimension of "0". + 2) An integer overflow error in the processing of residue partition values can be exploited to cause a heap-based buffer overflow via a specially crafted OGG file. + 3) An integer overflow error exists in the computation of "quantvals" and of required space for "quantlist". This can be exploited to cause a heap-based buffer overflow via a specially crafted OGG file. + Successful exploitation may allow execution of arbitrary code. + + 452 2008-06-13 emacs From vmiklos at frugalware.org Fri Jun 13 16:21:18 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 13 16:21:20 2008 Subject: [Frugalware-git] homepage-ng: FSA453-blender Message-ID: <20080613142118.9A1051770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=31ced402f472b36980dd70dfb8385c526f1b3e5b commit 31ced402f472b36980dd70dfb8385c526f1b3e5b Author: Miklos Vajna Date: Fri Jun 13 16:21:15 2008 +0200 FSA453-blender diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index b624c2e..84908a0 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,18 @@ + 454 + 2008-06-13 + blender + 2.45-1 + 2.45-2kalgan1 + http://bugs.frugalware.org/task/3039 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1102 + Secunia Research has discovered a vulnerability in Blender, which can be exploited by malicious people to compromise a vulnerable system. + The vulnerability is caused due to a boundary error within the "imb_loadhdr()" function in source/blender/imbuf/intern/radiance_hdr.c, which can be exploited to cause a stack-based buffer overflow by e.g. tricking a user into opening a specially crafted Blender (*.blend) file containing a malicious Radiance RGBE image. + Successful exploitation allows execution of arbitrary code. + + 453 2008-06-13 libvorbis From vmiklos at frugalware.org Fri Jun 13 16:23:51 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 13 16:23:52 2008 Subject: [Frugalware-git] homepage-ng: FSA455-samba Message-ID: <20080613142351.BFDB91770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=11c8cbc3c8f473641b980b1e73144246c5d7b093 commit 11c8cbc3c8f473641b980b1e73144246c5d7b093 Author: Miklos Vajna Date: Fri Jun 13 16:23:48 2008 +0200 FSA455-samba diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 84908a0..4f01810 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,18 @@ + 455 + 2008-06-13 + samba + 3.0.28-1 + 3.0.30-1kalgan1 + http://bugs.frugalware.org/task/3115 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-1105 + Secunia Research has discovered a vulnerability in Samba, which can be exploited by malicious people to compromise a vulnerable system. + The vulnerability is caused due to a boundary error within the "receive_smb_raw()" function in lib/util_sock.c when parsing SMB packets. This can be exploited to cause a heap-based buffer overflow via an overly large SMB packet received in a client context. + Successful exploitation allows execution of arbitrary code by tricking a user into connecting to a malicious server (e.g. by clicking an "smb://" link) or by sending specially crafted packets to an "nmbd" server configured as a local or domain master browser. + + 454 2008-06-13 blender From vmiklos at frugalware.org Fri Jun 13 16:26:42 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 13 16:26:43 2008 Subject: [Frugalware-git] homepage-ng: FSA456-asterisk-addons Message-ID: <20080613142642.06BDC1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=f4a0b1dc3cd34f32e39c4a1b33ff5894c1d6da68 commit f4a0b1dc3cd34f32e39c4a1b33ff5894c1d6da68 Author: Miklos Vajna Date: Fri Jun 13 16:26:38 2008 +0200 FSA456-asterisk-addons diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 4f01810..9d9eb48 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,17 @@ + 456 + 2008-06-13 + asterisk-addons + 1.4.4-1 + 1.4.7-1kalgan1 + http://bugs.frugalware.org/task/3136 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2543 + A vulnerability has been reported in Asterisk Addons, which can be exploited by malicious people to cause a DoS (Denial of Service). + The problem is that the "ooh323" channel driver extracts memory addresses from incoming TCP packets and uses them in memory operations. This can be exploited to crash an affected application by sending a TCP packet containing invalid memory references. + + 455 2008-06-13 samba From vmiklos at frugalware.org Fri Jun 13 16:29:28 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 13 16:29:30 2008 Subject: [Frugalware-git] homepage-ng: FSA457-graphicsmagick Message-ID: <20080613142928.A13631770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=f0b786256ebc56a6705725562d23ef593470efac commit f0b786256ebc56a6705725562d23ef593470efac Author: Miklos Vajna Date: Fri Jun 13 16:29:21 2008 +0200 FSA457-graphicsmagick diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 9d9eb48..8bab250 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,22 @@ + 457 + 2008-06-13 + graphicsmagick + 1.1.12-1kalgan1 + 1.1.14-1kalgan1 + http://bugs.frugalware.org/task/3137 + There is no CVE for this issue, see: + http://sourceforge.net/project/shownotes.php?release_id=604785 + http://sourceforge.net/project/shownotes.php?release_id=604837 + Some vulnerabilities have been reported in GraphicsMagick, which can be exploited by malicious people to cause a DoS (Denial of Service) or potentially compromise a vulnerable system. + 1) Two boundary errors exist within the "ReadPALMImage()" function in coders/palm.c. These can be exploited to cause a heap-based buffer underflow via a specially crafted PALM image. + 2) A boundary error exists within the "DecodeImage()" function in coders/pict.c. This can be exploited to cause a heap-based buffer overflow via a specially crafted PICT image. + 3) Multiple unspecified errors within the processing of XCF, DPX, and CINEON images can be exploited to crash the application. + Successful exploitation may allow execution of arbitrary code. + + 456 2008-06-13 asterisk-addons From vmiklos at frugalware.org Fri Jun 13 16:37:13 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 13 16:37:15 2008 Subject: [Frugalware-git] homepage-ng: FSA458-xdvik Message-ID: <20080613143713.E9BE21770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=f5808f5d2ac68d6840e7494a8d7865b12b7680a6 commit f5808f5d2ac68d6840e7494a8d7865b12b7680a6 Author: Miklos Vajna Date: Fri Jun 13 16:37:10 2008 +0200 FSA458-xdvik diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 8bab250..2713215 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,17 @@ + 458 + 2008-06-13 + xdvik + 22.84.12-1 + 22.84.14-1kalgan1 + http://bugs.frugalware.org/task/3127 + There is no CVE for this issue, see http://xdvi.sourceforge.net/releases.html#22.84.14 + A security issue has been reported in xdvik, which can be exploited by malicious, local users. + The vulnerability is caused by creating predictably named temporary files by using mktemp. + + 457 2008-06-13 graphicsmagick From ryuo at frugalware.org Fri Jun 13 18:27:09 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Jun 13 18:27:11 2008 Subject: [Frugalware-git] frugalware-current: xf86-input-evtouch-0.8.7-1-i686 Message-ID: <20080613162709.A64271770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dd107c50a4af0c7734029af6b7914ae37f62bf40 commit dd107c50a4af0c7734029af6b7914ae37f62bf40 Author: James Buren Date: Fri Jun 13 11:26:40 2008 -0500 xf86-input-evtouch-0.8.7-1-i686 * removed calibration script, it doesnt work at all. * will replace with a good alternative later diff --git a/source/x11-extra/xf86-input-evtouch/FrugalBuild b/source/x11-extra/xf86-input-evtouch/FrugalBuild index 42d7f9a..4436e3a 100644 --- a/source/x11-extra/xf86-input-evtouch/FrugalBuild +++ b/source/x11-extra/xf86-input-evtouch/FrugalBuild @@ -21,13 +21,7 @@ sha1sums=('d8180ea721f00d833756d894075f84920d1082ac' \ build() { - # correct path of data file for ev_calibrate - Fsed 'CURSORDIRECTORY"/empty_cursor.xbm"' 'CURSORDIRECTORY"/usr/share/'$pkgname'/empty_cursor.xbm"' ev_calibrate.c - # convert font to one that is universal to most xorg installs - Fsed 'helvetica' 'fixed' ev_calibrate.c - Fbuild --enable-evcalibrate --enable-udevinstall - Fln /usr/lib/$pkgname/calibrate.sh /usr/sbin/calibrate.sh - Fln /usr/lib/$pkgname/ev_calibrate /usr/sbin/ev_calibrate + Fbuild --enable-udevinstall } # optimization OK From vmiklos at frugalware.org Fri Jun 13 18:29:01 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 13 18:29:02 2008 Subject: [Frugalware-git] frugalware-current: add artwork rules from phayz Message-ID: <20080613162901.42B1F1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=48bc45c03f4242b2d36f952674c92800ce71efe1 commit 48bc45c03f4242b2d36f952674c92800ce71efe1 Author: Miklos Vajna Date: Fri Jun 13 18:28:50 2008 +0200 add artwork rules from phayz diff --git a/docs/artwork-rules.txt b/docs/artwork-rules.txt new file mode 100644 index 0000000..a0c4fea --- /dev/null +++ b/docs/artwork-rules.txt @@ -0,0 +1,30 @@ += Artwork requirements + +== Introduction + +This document details the requirements that must be met by all artwork +if it is to be accepted into the official Frugalware gallery. + +== The rules + +* All artwork must be licensed under the Free Art License 1.3 + (link:http://artlibre.org/licence[full details]). + +* Where the Frugalware logo appears, only the officially approved logo + may be used. Refer + link:http://frugalware.org/images/logo-new-big.png[here] for the logo. + +* Artwork must be submitted in SVG format as this allows for + derivative works to be made without affecting the impact of the + original artwork. Examples of derivative works include wallpapers in + various sizes and height/width ratios, and/or KDM/GDM/SLiM themes. + +* All artwork must be submitted together with any associated source + files - i.e. files which are required by the graphics editor used by + the entrant to reproduce and/or edit the artwork. + +* Only FLOSS software may be used to create the wallpaper. + +* Neither the release's version number, nor code-name are to appear in + artwork, or there should be a version without them for later use when + a given release is no longer supported. diff --git a/docs/index-devel.txt b/docs/index-devel.txt index edf4c91..27809aa 100644 --- a/docs/index-devel.txt +++ b/docs/index-devel.txt @@ -22,6 +22,8 @@ Documentations: * link:release-howto.html[Release HOWTO] +* link:artwork-rules.html[Artwork requirements] + * link:ids.html[User / Group IDs] * link:rebuild.html[Rebuild Policy] diff --git a/docs/index.txt b/docs/index.txt index 0b640f4..fda82b4 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -63,6 +63,8 @@ Techninal documentation: * link:release-howto.html[Release HOWTO] +* link:artwork-rules.html[Artwork requirements] + * link:ids.html[User / Group IDs] * link:rebuild.html[Rebuild Policy] From vmiklos at frugalware.org Fri Jun 13 18:32:42 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jun 13 18:32:44 2008 Subject: [Frugalware-git] frugalware-current: docs/artwork: change link to the English one Message-ID: <20080613163242.7B9921770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=929147652cd369243388bf9589e0944526f6a742 commit 929147652cd369243388bf9589e0944526f6a742 Author: Miklos Vajna Date: Fri Jun 13 18:32:39 2008 +0200 docs/artwork: change link to the English one diff --git a/docs/artwork-rules.txt b/docs/artwork-rules.txt index a0c4fea..279db49 100644 --- a/docs/artwork-rules.txt +++ b/docs/artwork-rules.txt @@ -8,7 +8,7 @@ if it is to be accepted into the official Frugalware gallery. == The rules * All artwork must be licensed under the Free Art License 1.3 - (link:http://artlibre.org/licence[full details]). + (link:http://artlibre.org/licence/lal/en/[full details]). * Where the Frugalware logo appears, only the officially approved logo may be used. Refer From janny at frugalware.org Fri Jun 13 22:10:35 2008 From: janny at frugalware.org (Janos Kovacs) Date: Fri Jun 13 22:10:37 2008 Subject: [Frugalware-git] frugalware-current: pgadmin3-1.8.4-1-i686 Message-ID: <20080613201035.CD5781770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=129ad4d999938f4e9419f6a0ab2517c6541715f0 commit 129ad4d999938f4e9419f6a0ab2517c6541715f0 Author: Janos Kovacs Date: Fri Jun 13 22:09:33 2008 +0200 pgadmin3-1.8.4-1-i686 * add new source mirror diff --git a/source/xapps-extra/pgadmin3/FrugalBuild b/source/xapps-extra/pgadmin3/FrugalBuild index 368425a..16c411d 100644 --- a/source/xapps-extra/pgadmin3/FrugalBuild +++ b/source/xapps-extra/pgadmin3/FrugalBuild @@ -10,7 +10,7 @@ archs=('i686') groups=('xapps-extra') depends=('wxgtk-u8' 'wxgtk-locale' 'postgresql' 'libxslt') up2date="lynx -dump ${url}|Flasttargz" -source=(http://ftp.be.postgresql.org/pub/postgresql/${pkgname}/release/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz) +source=(http://ftp2.be.postgresql.org/pub/postgresql/${pkgname}/release/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz) sha1sums=('c3103792c678183c5a9081daac56ebf467d674ff') build() { From ryuo at frugalware.org Fri Jun 13 22:17:54 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Jun 13 22:17:55 2008 Subject: [Frugalware-git] frugalware-current: touchkit-2.03.1712-1-i686 Message-ID: <20080613201754.424161770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4ce2147a89e78f6cc50d0cfb1e2548b1cce7f4f3 commit 4ce2147a89e78f6cc50d0cfb1e2548b1cce7f4f3 Author: James Buren Date: Fri Jun 13 15:15:57 2008 -0500 touchkit-2.03.1712-1-i686 * new package diff --git a/source/x11-extra/touchkit/FrugalBuild b/source/x11-extra/touchkit/FrugalBuild new file mode 100644 index 0000000..d82e55a --- /dev/null +++ b/source/x11-extra/touchkit/FrugalBuild @@ -0,0 +1,37 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=touchkit +pkgver=2.03.1712 +pkgrel=1 +pkgdesc="Proprietary xorg input driver for eGalax touchscreens." +url="http://210.64.17.162/web20/TouchKitDriver/linuxDriver.htm" +depends=('libpng' 'libsm' 'libxi' 'libxrandr' 'libxcursor' 'libxinerama' 'fontconfig' 'glib2' 'libstdc++') +groups=('x11-extra') +archs=('i686' 'x86_64') +if [ "`uname -m`" == "i686" ]; then + _F_pkg_suffix="32b" + sha1sums=('bffec5d395ce3bb1135dfe847f41ec071fb961d5') +else + _F_pkg_suffix="64b" + sha1sums=('f5120b75afdf371dcdc4b6862963a4a6d8796b22') +fi +_F_pkg_suffix="$_F_pkg_suffix-k26-x14.tar.gz" +_F_archive_name="TouchKit" +up2date="Flastarchive $url -$_F_pkg_suffix" +source=(http://210.64.17.162/web20/drivers/touch_driver/Linux/v`echo $pkgver | sed 's|\(.*\)\..*|\1|'`/TouchKit-$pkgver-$_F_pkg_suffix) +# proprietary, so nobuild. +options=('nobuild') + +build() +{ + Fcd ${_F_archive_name}_x14 + tar -xf $_F_archive_name.tar.gz || Fdie + cd ${_F_archive_name}_x14 || Fdie + Fexerel /usr/lib/xorg/modules/input/egalax_drv.so + Fexerel /usr/bin/$_F_archive_name + Fexerel TKCal/TKCal /usr/bin/TKCal + Fdocrel TKCal/readme + mv "Guide/Driver Guide.pdf" ./Driver_Guide.pdf || Fdie + Fdocrel Driver_Guide.pdf +} From janny at frugalware.org Fri Jun 13 22:19:35 2008 From: janny at frugalware.org (Janos Kovacs) Date: Fri Jun 13 22:19:36 2008 Subject: [Frugalware-git] frugalware-current: pgadmin3-1.8.4-1-i686 Message-ID: <20080613201935.B1EC11770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e9248ce8fc95c9d668125b1df45cc483ddf5d1cb commit e9248ce8fc95c9d668125b1df45cc483ddf5d1cb Author: Janos Kovacs Date: Fri Jun 13 22:19:02 2008 +0200 pgadmin3-1.8.4-1-i686 * correction in sources() diff --git a/source/xapps-extra/pgadmin3/FrugalBuild b/source/xapps-extra/pgadmin3/FrugalBuild index 16c411d..773e312 100644 --- a/source/xapps-extra/pgadmin3/FrugalBuild +++ b/source/xapps-extra/pgadmin3/FrugalBuild @@ -10,7 +10,7 @@ archs=('i686') groups=('xapps-extra') depends=('wxgtk-u8' 'wxgtk-locale' 'postgresql' 'libxslt') up2date="lynx -dump ${url}|Flasttargz" -source=(http://ftp2.be.postgresql.org/pub/postgresql/${pkgname}/release/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz) +source=(http://ftp2.uk.postgresql.org/sites/ftp.postgresql.org/${pkgname}/release/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz) sha1sums=('c3103792c678183c5a9081daac56ebf467d674ff') build() { From ryuo at frugalware.org Fri Jun 13 22:32:06 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Jun 13 22:32:07 2008 Subject: [Frugalware-git] frugalware-current: touchkit-2.03.1712-1-i686 Message-ID: <20080613203206.31A2E1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7f53cfa7fe97df36f02dd4532e55349a098ceb82 commit 7f53cfa7fe97df36f02dd4532e55349a098ceb82 Author: James Buren Date: Fri Jun 13 15:31:33 2008 -0500 touchkit-2.03.1712-1-i686 * some touchups diff --git a/source/x11-extra/touchkit/FrugalBuild b/source/x11-extra/touchkit/FrugalBuild index d82e55a..3ff7fc7 100644 --- a/source/x11-extra/touchkit/FrugalBuild +++ b/source/x11-extra/touchkit/FrugalBuild @@ -9,24 +9,24 @@ url="http://210.64.17.162/web20/TouchKitDriver/linuxDriver.htm" depends=('libpng' 'libsm' 'libxi' 'libxrandr' 'libxcursor' 'libxinerama' 'fontconfig' 'glib2' 'libstdc++') groups=('x11-extra') archs=('i686' 'x86_64') -if [ "`uname -m`" == "i686" ]; then - _F_pkg_suffix="32b" +if [ "$CARCH" == "i686" ]; then + _F_pkg_suffix="32" sha1sums=('bffec5d395ce3bb1135dfe847f41ec071fb961d5') else - _F_pkg_suffix="64b" + _F_pkg_suffix="64" sha1sums=('f5120b75afdf371dcdc4b6862963a4a6d8796b22') fi -_F_pkg_suffix="$_F_pkg_suffix-k26-x14.tar.gz" +_F_pkg_suffix="-${_F_pkg_suffix}b-k26-x14.tar.gz" _F_archive_name="TouchKit" -up2date="Flastarchive $url -$_F_pkg_suffix" -source=(http://210.64.17.162/web20/drivers/touch_driver/Linux/v`echo $pkgver | sed 's|\(.*\)\..*|\1|'`/TouchKit-$pkgver-$_F_pkg_suffix) +up2date="Flastarchive $url $_F_pkg_suffix" +source=(http://210.64.17.162/web20/drivers/touch_driver/Linux/v`echo $pkgver | sed 's|\(.*\)\..*|\1|'`/TouchKit-$pkgver$_F_pkg_suffix) # proprietary, so nobuild. options=('nobuild') build() { Fcd ${_F_archive_name}_x14 - tar -xf $_F_archive_name.tar.gz || Fdie + Fextract $_F_archive_name.tar.gz cd ${_F_archive_name}_x14 || Fdie Fexerel /usr/lib/xorg/modules/input/egalax_drv.so Fexerel /usr/bin/$_F_archive_name From bouleetbil at frogdev.info Fri Jun 13 22:34:37 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Jun 13 22:34:38 2008 Subject: [Frugalware-git] frugalware-current: swingx-0.9.3-1-i686 Message-ID: <20080613203437.36E331770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7255f2f118f665ac4160774c7c7f30aad5a0b96d commit 7255f2f118f665ac4160774c7c7f30aad5a0b96d Author: bouleetbil Date: Fri Jun 13 22:24:54 2008 +0200 swingx-0.9.3-1-i686 *new package diff --git a/source/devel-extra/swingx/FixJavaBuild.diff b/source/devel-extra/swingx/FixJavaBuild.diff new file mode 100644 index 0000000..e5ef8c9 --- /dev/null +++ b/source/devel-extra/swingx/FixJavaBuild.diff @@ -0,0 +1,11 @@ +--- src/src/java/org/jdesktop/swingx/auth/LoginService.java 2008-06-13 21:43:03.000000000 +0200 ++++ src/src/java/org/jdesktop/swingx/auth/LoginService.java 2008-06-13 21:43:18.000000000 +0200 +@@ -27,7 +27,7 @@ + import javax.swing.event.EventListenerList; + + import org.jdesktop.beans.AbstractBean; +-import org.jdesktop.swingworker.SwingWorker; ++import javax.swing.SwingWorker; + + /** + * LoginService is the abstract base class for all classes implementing diff --git a/source/devel-extra/swingx/FrugalBuild b/source/devel-extra/swingx/FrugalBuild new file mode 100644 index 0000000..8fef662 --- /dev/null +++ b/source/devel-extra/swingx/FrugalBuild @@ -0,0 +1,31 @@ +# Compiling Time: 0.27 SBU +# Maintainer: bouleetbil + +pkgname=swingx +pkgver=0.9.3 +pkgrel=1 +pkgdesc="A collection of powerful, useful, and just plain fun Swing components." +Finclude java +makedepends=(${makedepends[@]} 'j2sdk') +depends=(${depends[@]} 'junit' 'jmock' 'batik' 'j2re') +groups=('devel-extra') +archs=('i686') +url="http://swinglabs.org/index.jsp" +up2date="lynx -dump -source http://swinglabs.org/downloads.jsp |grep $pkgname | tail -1 | cut -d '-' -f2" +source=(https://swingx.dev.java.net/files/documents/2981/99654/$pkgname-$pkgver-src.zip UseFWJar.diff \ + FixJavaBuild.diff) +sha1sums=('89306d37da53bafd71cd8c1dff03e1eb3874336b' \ + '8fdc047492eefaa9ec5835f764edfd696185130c' \ + 'fbe04a3feed679b294ddeb85fc3eb30785c68984') +_F_cd_path=${pkgname}-${pkgver}-src + +build() { + Fcd + Fpatchall + Fjavacleanup + #For work should use Java sun + export JAVA_HOME=/usr/lib/java + Fant jar + #install + Fjar dist/${pkgname}.jar +} diff --git a/source/devel-extra/swingx/UseFWJar.diff b/source/devel-extra/swingx/UseFWJar.diff new file mode 100644 index 0000000..d27eee1 --- /dev/null +++ b/source/devel-extra/swingx/UseFWJar.diff @@ -0,0 +1,42 @@ +--- src/swinglabs-build-impl.xml 2008-06-08 14:19:06.000000000 +0200 ++++ src/swinglabs-build-impl.xml 2008-06-13 16:17:36.000000000 +0200 +@@ -102,7 +102,7 @@ + + + +- ++ + + + + +--- src/nbproject/build-impl.xml 2008-06-08 14:19:04.000000000 +0200 ++++ src/nbproject/build-impl.xml 2008-06-13 16:18:27.000000000 +0200 +@@ -325,7 +325,7 @@ + + + +- ++ + + + + +--- src/nbproject/project.properties 2008-06-13 21:30:50.000000000 +0200 ++++ src/nbproject/project.properties 2008-06-13 21:31:07.000000000 +0200 +@@ -26,11 +26,11 @@ + ########################################################## + # Library references # + ########################################################## +-file.reference.jmock-1.1.0RC1.jar=lib/jmock-1.1.0RC1.jar +-file.reference.MultipleGradientPaint.jar=lib/optional/MultipleGradientPaint.jar ++file.reference.jmock-1.1.0RC1.jar=/usr/share/java/jmock.jar ++file.reference.MultipleGradientPaint.jar=/usr/share/java/batik-awt-util.jar + file.reference.src-java=src/java + file.reference.src-test=src/test +-file.reference.swing-worker.jar=lib/optional/swing-worker.jar ++ + file.reference.Filters.jar=lib/optional/Filters.jar + + ########################################################## + From ryuo at frugalware.org Fri Jun 13 22:37:01 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Jun 13 22:37:02 2008 Subject: [Frugalware-git] frugalware-current: touchkit-2.03.1712-1-i686 Message-ID: <20080613203701.792101770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6b4df54b80e0a9abeb482ed1a1d915a75fe7dcf6 commit 6b4df54b80e0a9abeb482ed1a1d915a75fe7dcf6 Author: James Buren Date: Fri Jun 13 15:36:31 2008 -0500 touchkit-2.03.1712-1-i686 * depends tweak diff --git a/source/x11-extra/touchkit/FrugalBuild b/source/x11-extra/touchkit/FrugalBuild index 3ff7fc7..5463fc1 100644 --- a/source/x11-extra/touchkit/FrugalBuild +++ b/source/x11-extra/touchkit/FrugalBuild @@ -6,7 +6,8 @@ pkgver=2.03.1712 pkgrel=1 pkgdesc="Proprietary xorg input driver for eGalax touchscreens." url="http://210.64.17.162/web20/TouchKitDriver/linuxDriver.htm" -depends=('libpng' 'libsm' 'libxi' 'libxrandr' 'libxcursor' 'libxinerama' 'fontconfig' 'glib2' 'libstdc++') +rodepends=('libpng' 'libsm' 'libxi' 'libxrandr' 'libxcursor' 'libxinerama' 'fontconfig' 'glib2' 'libstdc++') +depends=() groups=('x11-extra') archs=('i686' 'x86_64') if [ "$CARCH" == "i686" ]; then From devil505linux at gmail.com Fri Jun 13 22:58:43 2008 From: devil505linux at gmail.com (Devil505) Date: Fri Jun 13 22:58:46 2008 Subject: [Frugalware-git] frugalware-current: sonata-1.5.2-1-i686 Message-ID: <20080613205843.EC5291770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2c33aed614b0e85db34e8d12db7132d8aebd16f8 commit 2c33aed614b0e85db34e8d12db7132d8aebd16f8 Author: Devil505 Date: Fri Jun 13 22:58:22 2008 +0200 sonata-1.5.2-1-i686 * Changed m8r (detto->devil505) diff --git a/source/xapps-extra/sonata/FrugalBuild b/source/xapps-extra/sonata/FrugalBuild index d4c6c8e..c12cf4b 100644 --- a/source/xapps-extra/sonata/FrugalBuild +++ b/source/xapps-extra/sonata/FrugalBuild @@ -1,5 +1,6 @@ # Compiling Time: 0 SBU -# Maintainer: detto +# Maintainer: Devil505 +# Contributor: detto pkgname=sonata pkgver=1.5.2 From ryuo at frugalware.org Fri Jun 13 23:09:36 2008 From: ryuo at frugalware.org (James Buren) Date: Fri Jun 13 23:09:38 2008 Subject: [Frugalware-git] frugalware-current: brasero-0.7.1-3-i686 Message-ID: <20080613210936.EF71A1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8bba11cfd9548cf891748137967ee88d17c3e73d commit 8bba11cfd9548cf891748137967ee88d17c3e73d Author: James Buren Date: Fri Jun 13 16:09:09 2008 -0500 brasero-0.7.1-3-i686 * force a rebuild diff --git a/source/gnome-extra/brasero/FrugalBuild b/source/gnome-extra/brasero/FrugalBuild index 4ab9099..aa6aad1 100644 --- a/source/gnome-extra/brasero/FrugalBuild +++ b/source/gnome-extra/brasero/FrugalBuild @@ -3,7 +3,7 @@ pkgname=brasero pkgver=0.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="A CD/DVD Burning application for the GNOME desktop." url="http://www.gnome.org/projects/brasero/" makedepends=('intltool') From crazy at frugalware.org Fri Jun 13 23:48:55 2008 From: crazy at frugalware.org (crazy) Date: Fri Jun 13 23:48:57 2008 Subject: [Frugalware-git] frugalware-current: brasero-0.7.1-4-x86_64 Message-ID: <20080613214855.A56501770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=416b9fae711a66e4674fe6c64b1365f13c82dd2b commit 416b9fae711a66e4674fe6c64b1365f13c82dd2b Author: crazy Date: Fri Jun 13 23:48:10 2008 +0200 brasero-0.7.1-4-x86_64 * fix broken depends for heimdal>=1.2 diff --git a/source/gnome-extra/brasero/FrugalBuild b/source/gnome-extra/brasero/FrugalBuild index aa6aad1..5a27eed 100644 --- a/source/gnome-extra/brasero/FrugalBuild +++ b/source/gnome-extra/brasero/FrugalBuild @@ -3,14 +3,14 @@ pkgname=brasero pkgver=0.7.1 -pkgrel=3 +pkgrel=4 pkgdesc="A CD/DVD Burning application for the GNOME desktop." url="http://www.gnome.org/projects/brasero/" makedepends=('intltool') depends=('gnome-vfs>=2.22.0' 'libgnome>=2.22.0' 'libgnomeui>=2.22.1' 'cdrtools' 'dvd+rw-tools' \ 'nautilus-cd-burner>=2.22.1' 'gstreamer' 'gst-plugins-base' 'gst-plugins-good' \ 'hal' 'libxml2' 'totem>=2.22.1' 'perl-xml-parser' 'libnotify' 'dbus-glib>=0.71-2' \ - 'libbeagle' 'popt' 'libdvdcss') + 'libbeagle' 'popt' 'libdvdcss' 'heimdal>=1.2') groups=('gnome-extra') conflicts=('bonfire') replaces=('bonfire') From crazy at frugalware.org Sat Jun 14 00:39:02 2008 From: crazy at frugalware.org (crazy) Date: Sat Jun 14 00:39:04 2008 Subject: [Frugalware-git] frugalware-current: sourceforge.sh Message-ID: <20080613223902.7A8921770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=487fbc410356f702e1d40db6345ee179a2de3c69 commit 487fbc410356f702e1d40db6345ee179a2de3c69 Author: crazy Date: Sat Jun 14 00:38:12 2008 +0200 sourceforge.sh * only use s/_/-/ in source when _F_sourceforge_pkgver = $pkgver * for custom _F_sourceforge_pkgver that is not needed since $pkgver is right already * and the custom _F_sourceforge_pkgver may be 1_2_3 or alike. * reported by bouleetbil diff --git a/source/include/sourceforge.sh b/source/include/sourceforge.sh index f013c6e..ea8119f 100644 --- a/source/include/sourceforge.sh +++ b/source/include/sourceforge.sh @@ -95,4 +95,10 @@ 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}${_F_sourceforge_pkgver//_/-}${_F_sourceforge_ext}) +## we have now regular $pkgver so use s/_/-/ but in case we have a custom _F_sourceforge_pkgver +## which is for 'source only' we don't need that since $pkgver is right already +if [ -z $_F_sourceforge_pkgver ]; then + source=(http://${_F_sourceforge_mirror}.dl.sourceforge.net/sourceforge/${_F_sourceforge_dirname}/${_F_sourceforge_name}${_F_sourceforge_sep}${_F_sourceforge_pkgver//_/-}${_F_sourceforge_ext}) +else + source=(http://${_F_sourceforge_mirror}.dl.sourceforge.net/sourceforge/${_F_sourceforge_dirname}/${_F_sourceforge_name}${_F_sourceforge_sep}${_F_sourceforge_pkgver}${_F_sourceforge_ext}) +fi From bouleetbil at frogdev.info Sat Jun 14 00:52:06 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Jun 14 00:52:08 2008 Subject: [Frugalware-git] frugalware-current: htmlparser-1.6-1-i686 Message-ID: <20080613225206.D47091770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=af22c6889590426ce324bcafa96a48dd6a682320 commit af22c6889590426ce324bcafa96a48dd6a682320 Author: bouleetbil Date: Sat Jun 14 00:45:08 2008 +0200 htmlparser-1.6-1-i686 *new package diff --git a/source/devel-extra/htmlparser/FrugalBuild b/source/devel-extra/htmlparser/FrugalBuild new file mode 100644 index 0000000..b936820 --- /dev/null +++ b/source/devel-extra/htmlparser/FrugalBuild @@ -0,0 +1,25 @@ +# Compiling Time: 0.08 SBU +# Maintainer: bouleetbil + +pkgname=htmlparser +pkgver=1.6 +pkgrel=1 +pkgdesc="HTML Parser is a Java library used to parse HTML" +_F_sourceforge_sep="None" +_F_sourceforge_ext=".zip" +_F_sourceforge_pkgver="1_6_20060610" +Finclude sourceforge java +groups=('devel-extra') +archs=('i686') +sha1sums=('93f6b12b95fe46602d3dc68ccec3523566a38dd4') +_F_cd_path=${pkgname}1_6 +build() +{ + Fcd + Fjavacleanup + Fextract src.zip + Fant + #install + Fjar lib/htmllexer.jar + Fjar lib/htmlparser.jar +} From vmiklos at frugalware.org Sat Jun 14 02:18:14 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 14 02:18:17 2008 Subject: [Frugalware-git] pacman-tools: dg send: clean up -h output Message-ID: <20080614001814.AC4771770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=63782b6c0ad2ef0ddfe36ce8d30d97bc0bf06de9 commit 63782b6c0ad2ef0ddfe36ce8d30d97bc0bf06de9 Author: Miklos Vajna Date: Sat Jun 14 02:16:56 2008 +0200 dg send: clean up -h output diff --git a/darcs-git.py b/darcs-git.py index d3051e4..e7e120c 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -712,15 +712,12 @@ def send(argv): print """Usage: darcs-git send [OPTION]... Send by email a bundle of one or more patches. -The recommended work is: +The recommended workflow is: - 1) darcs-git config sendemail.to foo@bar.com - This is the address of the maintainer and you have to run this - command only once. - 2) darcs-git format-patch + 1) darcs-git format-patch Optionally you can now edit the patches to add custom headers like Cc and In-Reply-To ones. - 3) darcs-git send *.patch + 2) darcs-git send --to="M A Intener " *.patch Use "darcs-git help send-email" for more information. From boobaa at frugalware.org Sat Jun 14 08:12:14 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Sat Jun 14 08:12:17 2008 Subject: [Frugalware-git] frugalware-current: opera-9.50-1-i686 Message-ID: <20080614061214.3053C1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=651904baa6b8928312b432987daf01d930121ba7 commit 651904baa6b8928312b432987daf01d930121ba7 Author: CSCSY Lszl Date: Sat Jun 14 08:11:53 2008 +0200 opera-9.50-1-i686 version bump ok by voroskoi@ diff --git a/source/xapps-extra/opera/FrugalBuild b/source/xapps-extra/opera/FrugalBuild index 9a74d7d..5018bea 100644 --- a/source/xapps-extra/opera/FrugalBuild +++ b/source/xapps-extra/opera/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: voroskoi pkgname=opera -pkgver=9.27 -pkgextraver=20080331.6-shared-qt.i386-en +pkgver=9.50 +pkgextraver=gcc4-shared-qt3.i386 pkgrel=1 pkgdesc="Opera web browser." url="http://www.opera.com/linux/" @@ -13,7 +13,7 @@ rodepends=('qt') groups=('xapps-extra') archs=('i686') up2date="lynx -dump ftp://ftp.opera.com/pub/opera/linux/ |grep -wo opera.*[0-9][0-9][0-9] |sort -r | sed -ne 's|.*x/\(.*\)|\1|;s/\([0-9]\)/\1./;1 p'" -source=(ftp://ftp.opera.com/pub/opera/linux/${pkgver//./}/final/en/i386/shared/opera-$pkgver-$pkgextraver.tar.bz2) +source=(ftp://ftp.opera.com/pub/opera/linux/${pkgver//./}/final/en/i386/shared/opera-$pkgver.$pkgextraver.tar.bz2) options=('nobuild' 'nodocs') _F_desktop_name=Opera _F_desktop_desc="Opera Internet Web Suite" @@ -21,10 +21,10 @@ _F_desktop_icon=/usr/share/opera/images/opera_48x48.png build() { - Fcd $pkgname-$pkgver-$pkgextraver-709 + Fcd $pkgname-$pkgver-2042.$pkgextraver ./install.sh --prefix=/usr --DESTDIR=$Fdestdir || Fdie _F_desktop_categories="Network;" Fdesktop2 echo "StartUpNotify=false" >> $Fdestdir$Fmenudir/$pkgname.desktop || Fdie } -sha1sums=('86ec33375f3cf98a72c8bcdf4dc45bcbdfaf39ef') +sha1sums=('964b9c6f81396679638d90f22d1db9a1b55fcfe8') From boobaa at frugalware.org Sat Jun 14 08:15:56 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Sat Jun 14 08:15:58 2008 Subject: [Frugalware-git] frugalware-current: rss2email-2.63-1-i686 Message-ID: <20080614061556.F21001770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=76bab59fc60e63f6b721f93ca32ef2dd77635422 commit 76bab59fc60e63f6b721f93ca32ef2dd77635422 Author: CSCSY Lszl Date: Sat Jun 14 08:15:42 2008 +0200 rss2email-2.63-1-i686 version bump diff --git a/source/network-extra/rss2email/FrugalBuild b/source/network-extra/rss2email/FrugalBuild index c9bd0ab..0db5c67 100644 --- a/source/network-extra/rss2email/FrugalBuild +++ b/source/network-extra/rss2email/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CSCSY Lszl pkgname=rss2email -pkgver=2.62 +pkgver=2.63 pkgrel=1 pkgdesc="read newsfeeds from your email client" url="http://rss2email.infogami.com/" @@ -16,10 +16,10 @@ source=(http://$pkgname.infogami.com/$pkgname.py \ http://feedparser.org/feedparser.py \ http://lindsey.smith.googlepages.com/r2e \ README.Frugalware) -sha1sums=('0c69c3325fa9ddac11f8d461337f11c989c62f66' \ - '778b66d2c5a6df80e609590402add947ab2cdea3' \ +sha1sums=('32091d8cc9378e6346a9589d9783505259564337' \ + 'feb09264045adfb7e4ef12344e446a15e2005a11' \ 'f9c2a4b3a4b2a586e74da8fdcf1760fe3a96c818' \ - 'd2b9524e7558bb95ab2bc2c458f4123cfceab7b4' \ + '11eb7b878c30fac548d56aed90c1503143583e3d' \ 'b7200b4072ffc1ad56b62c94ab284246f73316bc') build() { From boobaa at frugalware.org Sat Jun 14 08:17:28 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Sat Jun 14 08:17:29 2008 Subject: [Frugalware-git] frugalware-current: drupal-nodefamily-5.x_1.4-1-i686 Message-ID: <20080614061728.577CD1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ea20268206cfd4f18a6b098d97806d27e3981fbb commit ea20268206cfd4f18a6b098d97806d27e3981fbb Author: CSCSY Lszl Date: Sat Jun 14 08:17:20 2008 +0200 drupal-nodefamily-5.x_1.4-1-i686 version bump diff --git a/source/network-extra/drupal-nodefamily/FrugalBuild b/source/network-extra/drupal-nodefamily/FrugalBuild index 194446a..f81357a 100644 --- a/source/network-extra/drupal-nodefamily/FrugalBuild +++ b/source/network-extra/drupal-nodefamily/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSCSY Lszl _F_drupal_module=nodefamily -pkgver=5.x_1.3 +pkgver=5.x_1.4 pkgrel=1 pkgdesc="With this Drupal module you can define relations between content types." Finclude drupal -sha1sums=('fc2ff9bebd42ba13392c8b2edc2bf5bb254b8113') +sha1sums=('54a508d7b3096445b01a2fc88770ec0bb0457239') From boobaa at frugalware.org Sat Jun 14 08:19:05 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Sat Jun 14 08:19:06 2008 Subject: [Frugalware-git] frugalware-current: drupal-usernode-5.x_1.4-1-i686 Message-ID: <20080614061905.498181770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5208a2381f74222252183ad7296705c3aeadc79a commit 5208a2381f74222252183ad7296705c3aeadc79a Author: CSCSY Lszl Date: Sat Jun 14 08:18:54 2008 +0200 drupal-usernode-5.x_1.4-1-i686 version bump diff --git a/source/network-extra/drupal-usernode/FrugalBuild b/source/network-extra/drupal-usernode/FrugalBuild index 3edd19f..a8fa29b 100644 --- a/source/network-extra/drupal-usernode/FrugalBuild +++ b/source/network-extra/drupal-usernode/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSCSY Lszl _F_drupal_module=usernode -pkgver=5.x_1.3 +pkgver=5.x_1.4 pkgrel=1 pkgdesc="This Drupal module tries to make users nodes." Finclude drupal -sha1sums=('abe7641480773a8c855f713135e0d34c8f4d7dc4') +sha1sums=('bd6d8b4b789100110ee54d8516a406e26984d3ac') From boobaa at frugalware.org Sat Jun 14 08:20:09 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Sat Jun 14 08:20:11 2008 Subject: [Frugalware-git] frugalware-current: drupal-content_access-5.x_1.4-1-i686 Message-ID: <20080614062009.42B421770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7ccaf980810d273912dcf79b6088e83a1d304d06 commit 7ccaf980810d273912dcf79b6088e83a1d304d06 Author: CSCSY Lszl Date: Sat Jun 14 08:20:00 2008 +0200 drupal-content_access-5.x_1.4-1-i686 version bump diff --git a/source/network-extra/drupal-content_access/FrugalBuild b/source/network-extra/drupal-content_access/FrugalBuild index 190e2b6..8d8b994 100644 --- a/source/network-extra/drupal-content_access/FrugalBuild +++ b/source/network-extra/drupal-content_access/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSCSY Lszl _F_drupal_module=content_access -pkgver=5.x_1.3 +pkgver=5.x_1.4 pkgrel=1 pkgdesc="This Drupal module can manage permissions for content types by role and author" Finclude drupal -sha1sums=('c38b29c7fe85eadf642711607e623733de220086') +sha1sums=('9f4055222d2a17a25fbb1bf3e0bde8699ffe689f') From boobaa at frugalware.org Sat Jun 14 08:25:06 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Sat Jun 14 08:25:08 2008 Subject: [Frugalware-git] frugalware-current: spamassassin-3.2.5-1-i686 Message-ID: <20080614062506.D9EAC1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0acb5d01012b8114242ad061bc6786fb186b0ee1 commit 0acb5d01012b8114242ad061bc6786fb186b0ee1 Author: CSCSY Lszl Date: Sat Jun 14 08:24:55 2008 +0200 spamassassin-3.2.5-1-i686 version bump diff --git a/source/network-extra/spamassassin/FrugalBuild b/source/network-extra/spamassassin/FrugalBuild index 7f04a83..268fe06 100644 --- a/source/network-extra/spamassassin/FrugalBuild +++ b/source/network-extra/spamassassin/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Bence Nagy pkgname=spamassassin -pkgver=3.2.4 -pkgrel=3 +pkgver=3.2.5 +pkgrel=1 pkgdesc="A mail filter to identify spam." url="http://spamassassin.apache.org" # s/perl-mail-spf-query/perl-mail-spf/ if and when SA accepts it's version :S @@ -30,7 +30,7 @@ build() { Frcd spamd Ffile /etc/sysconfig/spamd } -sha1sums=('5c0e01831256518b27139507a4ded38e582d8649'\ +sha1sums=('14b1f6eae0221a152176f7f597f55581445e800a'\ '3b47547d8649cbfb82b11276a3986e4e17d1c997'\ '4883d67843dc9b32f71667b8a2b549fb9f88a0b7') From ryuo at frugalware.org Sat Jun 14 08:44:14 2008 From: ryuo at frugalware.org (James Buren) Date: Sat Jun 14 08:44:16 2008 Subject: [Frugalware-git] frugalware-current: echinus-0.2.9-1-i686 Message-ID: <20080614064414.11F6F1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1f26194257f84547fc2c9caf3f47b13b6af9bc78 commit 1f26194257f84547fc2c9caf3f47b13b6af9bc78 Author: James Buren Date: Sat Jun 14 01:43:13 2008 -0500 echinus-0.2.9-1-i686 * version bump diff --git a/source/x11-extra/echinus/FrugalBuild b/source/x11-extra/echinus/FrugalBuild index 999d617..bf265bb 100644 --- a/source/x11-extra/echinus/FrugalBuild +++ b/source/x11-extra/echinus/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: James Buren pkgname=echinus -pkgver=0.2.8 +pkgver=0.2.9 pkgrel=1 pkgdesc="A minimal WM supporting floating, tiled, and maximized layouts." url="http://www.rootshell.be/~polachok/code" @@ -11,7 +11,7 @@ groups=('x11-extra') archs=('i686' 'x86_64') up2date="Flasttar $url" source=($url/$pkgname-$pkgver.tar.gz) -sha1sums=('019e0508173ac5ca6b8d51bcc08c803f6a55ea6c') +sha1sums=('8c67625bcb491da6b295620459eec4dbe646ddfc') build() { From ryuo at frugalware.org Sat Jun 14 09:36:27 2008 From: ryuo at frugalware.org (James Buren) Date: Sat Jun 14 09:36:29 2008 Subject: [Frugalware-git] frugalware-current: asterisk-1.4.21-1-i686 Message-ID: <20080614073627.3DBBB1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=558a62c7ab09072090f71644d72c43185d43a657 commit 558a62c7ab09072090f71644d72c43185d43a657 Author: James Buren Date: Sat Jun 14 02:33:32 2008 -0500 asterisk-1.4.21-1-i686 * version bump diff --git a/source/apps-extra/asterisk/FrugalBuild b/source/apps-extra/asterisk/FrugalBuild index a65a123..6e0ae1b 100644 --- a/source/apps-extra/asterisk/FrugalBuild +++ b/source/apps-extra/asterisk/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Balint Kovacs pkgname=asterisk -pkgver=1.4.20.1 +pkgver=1.4.21 pkgrel=1 pkgdesc="Open Source Private Branch Exchange (PBX)." url="http://asterisk.org/" @@ -17,7 +17,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://ftp.digium.com/pub/asterisk/|grep asterisk-[0-9\.]*tar.gz$|Flasttar" source=(http://ftp.digium.com/pub/$pkgname/$pkgname-$pkgver.tar.gz \ rc.asterisk) -sha1sums=('402c06fdf5171bdeec90f0a456f5582230c64284' \ +sha1sums=('dc8a15e1cd1a1fc7eccff35a6208d1a0dff051b6' \ '1c18155cdece83d556e2295b54508636ff74f307') build() From ryuo at frugalware.org Sat Jun 14 09:43:15 2008 From: ryuo at frugalware.org (James Buren) Date: Sat Jun 14 09:43:16 2008 Subject: [Frugalware-git] frugalware-current: keytouch-2.4.0-1-i686 Message-ID: <20080614074315.C0F211770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3525f6958234bc4a97bff8ac4483a190119314e3 commit 3525f6958234bc4a97bff8ac4483a190119314e3 Author: James Buren Date: Sat Jun 14 02:42:59 2008 -0500 keytouch-2.4.0-1-i686 * version bump diff --git a/source/gnome-extra/keytouch/FrugalBuild b/source/gnome-extra/keytouch/FrugalBuild index 2e7f6f9..05cfcce 100644 --- a/source/gnome-extra/keytouch/FrugalBuild +++ b/source/gnome-extra/keytouch/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=keytouch -pkgver=2.3.2 +pkgver=2.4.0 pkgrel=1 pkgdesc="A program which allows you to easily configure the extra function keys of your keyboard." Finclude sourceforge @@ -17,7 +17,7 @@ _F_desktop_name="Keytouch" _F_desktop_desc="Keyboard configuration tool" _F_desktop_icon="keytouch.png" _F_desktop_categories="Utility;" -sha1sums=('80a409e3835a201796a0a6db1d629dd2902dc8f7' \ +sha1sums=('6b9aaa6cd60ff0ba42c39d325f2d80e51bc1e968' \ 'b1c3e5e3fa8b865a40e20d406bd937ac2b752ff9' \ '307f01df920314b41b3c0b05064732422c1fadcf') From ryuo at frugalware.org Sat Jun 14 09:52:23 2008 From: ryuo at frugalware.org (James Buren) Date: Sat Jun 14 09:52:25 2008 Subject: [Frugalware-git] frugalware-current: conduit-0.3.11.2-1-i686 Message-ID: <20080614075223.F39E81770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=752d61fe5a48d34534a2a481af91a1970a43d037 commit 752d61fe5a48d34534a2a481af91a1970a43d037 Author: James Buren Date: Sat Jun 14 02:51:57 2008 -0500 conduit-0.3.11.2-1-i686 * version bump diff --git a/source/gnome-extra/conduit/FrugalBuild b/source/gnome-extra/conduit/FrugalBuild index fc01814..8951b2e 100644 --- a/source/gnome-extra/conduit/FrugalBuild +++ b/source/gnome-extra/conduit/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=conduit -pkgver=0.3.10 +pkgver=0.3.11.2 pkgrel=1 pkgdesc="Conduit is a synchronization solution for GNOME" url="http://www.gnome.org/" @@ -12,7 +12,7 @@ depends=('pygtk' 'dbus-python' 'vobject' 'pygoocanvas>=0.9.0' \ makedepends=('perl-xml-parser' 'intltool' 'gnome-doc-utils') groups=('gnome-extra') archs=('i686' 'x86_64') -sha1sums=('c766d7d0eaebeb4b581e54c8f4c7c5171ed07088') +sha1sums=('c67d27b9c17368f9f5cc767fe203c4aaffc93720') _F_gnome_iconcache="y" _F_gnome_desktop="y" _F_gnome_devel="y" From ryuo at frugalware.org Sat Jun 14 10:45:02 2008 From: ryuo at frugalware.org (James Buren) Date: Sat Jun 14 10:45:04 2008 Subject: [Frugalware-git] frugalware-current: barpanel-0.4.0-1-i686 Message-ID: <20080614084502.7600D1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6be152e758ba40b37377aace931378ca5b1fec60 commit 6be152e758ba40b37377aace931378ca5b1fec60 Author: James Buren Date: Sat Jun 14 03:43:57 2008 -0500 barpanel-0.4.0-1-i686 * version bump * updated depends diff --git a/source/gnome-extra/barpanel/FrugalBuild b/source/gnome-extra/barpanel/FrugalBuild index bc34c26..7edb87c 100644 --- a/source/gnome-extra/barpanel/FrugalBuild +++ b/source/gnome-extra/barpanel/FrugalBuild @@ -2,14 +2,14 @@ # Maintainer: James Buren pkgname=barpanel -pkgver=0.3.1 -pkgrel=2 +pkgver=0.4.0 +pkgrel=1 pkgdesc="A continuation of foopanel." url="http://www.ossproject.org/projects/barpanel" -rodepends=('pygtk' 'pyxdg' 'gnome-python-desktop-wnck') +rodepends=('pygtk' 'pyxdg' 'gnome-python-desktop-wnck' 'dbus-python' 'hal') depends=('python') groups=('gnome-extra') archs=('i686' 'x86_64') up2date="Flasttar $url/download" source=(http://www.ossproject.org/files/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('38cc3d8ab211d07d40d7fba2f145950e25571afd') +sha1sums=('493ecb3a0aba30c0594d13ecbed8accfb7ead0df') From ryuo at frugalware.org Sat Jun 14 11:59:55 2008 From: ryuo at frugalware.org (James Buren) Date: Sat Jun 14 11:59:57 2008 Subject: [Frugalware-git] frugalware-current: barpanel-0.4.0-1-i686 Message-ID: <20080614095955.18C501770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=46fa3b11b427f869500825b66511ebf149d9101f commit 46fa3b11b427f869500825b66511ebf149d9101f Author: James Buren Date: Sat Jun 14 04:59:55 2008 -0500 barpanel-0.4.0-1-i686 * added a README diff --git a/source/gnome-extra/barpanel/README.Frugalware b/source/gnome-extra/barpanel/README.Frugalware new file mode 100644 index 0000000..c8f6dca --- /dev/null +++ b/source/gnome-extra/barpanel/README.Frugalware @@ -0,0 +1,14 @@ +Some tips and trick for use with barpanel: + +* Copy the config.xml.in in the package to ~/.barpanel/config.xml to be able +to create your own local changes. You can find its location with pacman-g2 +-Ql barpanel. + +* Barpanel themes are simply gtk2 themes, so if you want it to match your own +gtk theme, a simple way you can try is this: +cd ~/.barpanel/themes +ln -s (path to your gtk theme)/gtk-2.0 (name of theme) + +Then, change the theme in your ~/.barpanel/config.xml configuration file. + +Enjoy. From crazy at frugalware.org Sat Jun 14 15:38:04 2008 From: crazy at frugalware.org (crazy) Date: Sat Jun 14 15:38:06 2008 Subject: [Frugalware-git] frugalware-current: gnome-python-desktop-2.22.0-2-x86_64 Message-ID: <20080614133804.2B8721770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d7ae4b4c6617b6ec28d9000503c94f11994b1ba9 commit d7ae4b4c6617b6ec28d9000503c94f11994b1ba9 Author: crazy Date: Sat Jun 14 15:36:01 2008 +0200 gnome-python-desktop-2.22.0-2-x86_64 * release bump * removed gnome-python{-desktop} depends/rodepends from * gnome-python-desktop-wnck even when not right for gnome * apps and added a note about. * That is needed to make some rox , perl? apps and of course * ryou happy .. amen! diff --git a/source/gnome/gnome-python-desktop/FrugalBuild b/source/gnome/gnome-python-desktop/FrugalBuild index df9dd0f..4050876 100644 --- a/source/gnome/gnome-python-desktop/FrugalBuild +++ b/source/gnome/gnome-python-desktop/FrugalBuild @@ -4,7 +4,7 @@ pkgname=gnome-python-desktop pkgver=2.22.0 -pkgrel=1 +pkgrel=2 pkgdesc="Python bindings for GNOME desktop" url="http://www.pygtk.org/" depends=('gnome-python>=2.22.0') @@ -24,80 +24,84 @@ subdepends=("$pkgname=$pkgver gnome-panel>=2.20.0" "$pkgname=$pkgver gnome-deskt "$pkgname=$pkgver libgnomeprint>=2.18.1 libgnomeprintui>=2.18.1" "$pkgname=$pkgver gtksourceview1 $pkgname-print=$pkgver" \ "$pkgname=$pkgver libgtop>=2.20.0" "$pkgname=$pkgver gnome-media>=2.20.0" "$pkgname=$pkgver metacity>=2.20.0" \ "$pkgname=$pkgver nautilus-cd-burner>=2.18.0" "$pkgname=$pkgver librsvg" "$pkgname=$pkgver totem>=2.20.0" \ - "$pkgname=$pkgver libwnck>=2.20.0" "$pkgname=$pkgver bug-buddy>=2.20.0") + "python libxext glibc freetype2 libxau libxdmcp libice libxdamage libxml2 libwnck>=2.20.0" "$pkgname=$pkgver bug-buddy>=2.20.0") subgroups=('gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') +## NOTE: the depends are not really right for gnome-python-desktop-wnck , $pkgname depends/rodepends got removed +## to make some rox crap happy. So you have to add gnome-python{-desktop} depends to any gnome* package need +## gnome-python-desktop-wnck + build() { Fbuild --enable-metacity - + # Split all this crap off, seriously, a menu editor pulls in hundreds of unnecessary depends - + # -applet Fsplit $pkgname-applet $_F_python_libdir/gtk-2.0/gnomeapplet.so Fsplit $pkgname-applet $_F_python_libdir/gtk-2.0/gnomeapplet.la Fsplit $pkgname-applet $_F_python_libdir/gtk-2.0/gnome Fsplit $pkgname-applet $_F_gnome_pygtkdefsdir/applet.defs - + # -desktop Fsplit $pkgname-desktop $_F_python_libdir/gtk-2.0/gnomedesktop Fsplit $pkgname-desktop $_F_gnome_pygtkdefsdir/_gnomedesktop.defs - + # -keyring Fsplit $pkgname-keyring $_F_python_libdir/gtk-2.0/gnomekeyring.la Fsplit $pkgname-keyring $_F_python_libdir/gtk-2.0/gnomekeyring.so Fsplit $pkgname-keyring $_F_gnome_pygtkdefsdir/gnomekeyring.defs - + # -print Fsplit $pkgname-print $_F_python_libdir/gtk-2.0/gnomeprint Fsplit $pkgname-print usr/share/gtk-doc/html/pygnomeprint Fsplit $pkgname-print usr/share/gtk-doc/html/pygnomeprintui Fsplit $pkgnane-print $_F_gnome_pygtkdefsdir/printui.defs Fsplit $pkgnane-print $_F_gnome_pygtkdefsdir/print.defs - + # -gtksourceview Fsplit $pkgname-gtksourceview $_F_python_libdir/gtk-2.0/gtksourceview.so Fsplit $pkgname-gtksourceview $_F_python_libdir/gtk-2.0/gtksourceview.la Fsplit $pkgname-gtksourceview usr/share/gtk-doc/html/pygtksourceview Fsplit $pkgname-gtksourceview $_F_gnome_pygtkdefsdir/gtksourceview.defs - + # -gtop Fsplit $pkgname-gtop $_F_python_libdir/gtk-2.0/gtop.so Fsplit $pkgname-gtop $_F_python_libdir/gtk-2.0/gtop.la - + # -mediaprofiles Fsplit $pkgname-mediaprofiles $_F_python_libdir/gtk-2.0/mediaprofiles.la Fsplit $pkgname-mediaprofiles $_F_python_libdir/gtk-2.0/mediaprofiles.so Fsplit $pkgname-mediaprofiles $_F_gnome_pygtkdefsdir/mediaprofiles.defs - + # -metacity Fsplit $pkgname-metacity $_F_python_libdir/gtk-2.0/metacity.la Fsplit $pkgname-metacity $_F_python_libdir/gtk-2.0/metacity.so Fsplit $pkgname-metacity $_F_gnome_pygtkdefsdir/metacity.defs - + # -nautilusburn Fsplit $pkgname-nautilusburn $_F_python_libdir/gtk-2.0/nautilusburn.la Fsplit $pkgname-nautilusburn $_F_python_libdir/gtk-2.0/nautilusburn.so Fsplit $pkgname-nautilusburn $_F_gnome_pygtkdefsdir/nautilus_burn.defs - + # -rsvg Fsplit $pkgname-rsvg $_F_python_libdir/gtk-2.0/rsvg.so Fsplit $pkgname-rsvg $_F_python_libdir/gtk-2.0/rsvg.la - + # -bugbuddy Fsplit $pkgname-bugbuddy $_F_python_libdir/gtk-2.0/bugbuddy.py Fsplit $pkgname-bugbuddy $_F_python_libdir/gtk-2.0/bugbuddy.pyc Fsplit $pkgname-bugbuddy $_F_python_libdir/gtk-2.0/bugbuddy.pyo - + # -totem Fsplit $pkgname-totem $_F_python_libdir/gtk-2.0/totem - + # -wnck Fsplit $pkgname-wnck $_F_python_libdir/gtk-2.0/wnck.la Fsplit $pkgname-wnck $_F_python_libdir/gtk-2.0/wnck.so Fsplit $pkgname-wnck $_F_gnome_pygtkdefsdir/wnck.defs - + # ...phew! } From ryuo at frugalware.org Sat Jun 14 15:57:49 2008 From: ryuo at frugalware.org (James Buren) Date: Sat Jun 14 15:57:50 2008 Subject: [Frugalware-git] frugalware-current: barpanel-0.4.0-2-i686 Message-ID: <20080614135749.F32101778001@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5cd731e2d0c03ffaeac47b472ec172531f64a96e commit 5cd731e2d0c03ffaeac47b472ec172531f64a96e Author: James Buren Date: Sat Jun 14 08:57:03 2008 -0500 barpanel-0.4.0-2-i686 * clean up diff --git a/source/gnome-extra/barpanel/FrugalBuild b/source/gnome-extra/barpanel/FrugalBuild deleted file mode 100644 index 7edb87c..0000000 --- a/source/gnome-extra/barpanel/FrugalBuild +++ /dev/null @@ -1,15 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: James Buren - -pkgname=barpanel -pkgver=0.4.0 -pkgrel=1 -pkgdesc="A continuation of foopanel." -url="http://www.ossproject.org/projects/barpanel" -rodepends=('pygtk' 'pyxdg' 'gnome-python-desktop-wnck' 'dbus-python' 'hal') -depends=('python') -groups=('gnome-extra') -archs=('i686' 'x86_64') -up2date="Flasttar $url/download" -source=(http://www.ossproject.org/files/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('493ecb3a0aba30c0594d13ecbed8accfb7ead0df') diff --git a/source/gnome-extra/barpanel/README.Frugalware b/source/gnome-extra/barpanel/README.Frugalware deleted file mode 100644 index c8f6dca..0000000 --- a/source/gnome-extra/barpanel/README.Frugalware +++ /dev/null @@ -1,14 +0,0 @@ -Some tips and trick for use with barpanel: - -* Copy the config.xml.in in the package to ~/.barpanel/config.xml to be able -to create your own local changes. You can find its location with pacman-g2 --Ql barpanel. - -* Barpanel themes are simply gtk2 themes, so if you want it to match your own -gtk theme, a simple way you can try is this: -cd ~/.barpanel/themes -ln -s (path to your gtk theme)/gtk-2.0 (name of theme) - -Then, change the theme in your ~/.barpanel/config.xml configuration file. - -Enjoy. From ryuo at frugalware.org Sat Jun 14 15:57:49 2008 From: ryuo at frugalware.org (James Buren) Date: Sat Jun 14 15:57:52 2008 Subject: [Frugalware-git] frugalware-current: barpanel-0.4.0-2-i686 Message-ID: <20080614135749.DBD551770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=34e7c65c5b8b716d61454cd57340ef8ad84bd0eb commit 34e7c65c5b8b716d61454cd57340ef8ad84bd0eb Author: James Buren Date: Sat Jun 14 08:54:22 2008 -0500 barpanel-0.4.0-2-i686 * moved to x11-extra diff --git a/source/x11-extra/barpanel/FrugalBuild b/source/x11-extra/barpanel/FrugalBuild new file mode 100644 index 0000000..0a6ca82 --- /dev/null +++ b/source/x11-extra/barpanel/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=barpanel +pkgver=0.4.0 +pkgrel=2 +pkgdesc="A continuation of foopanel." +url="http://www.ossproject.org/projects/barpanel" +rodepends=('pygtk' 'pyxdg' 'gnome-python-desktop-wnck' 'dbus-python' 'hal') +depends=('python') +groups=('x11-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url/download" +source=(http://www.ossproject.org/files/$pkgname/$pkgname-$pkgver.tar.gz) +sha1sums=('493ecb3a0aba30c0594d13ecbed8accfb7ead0df') diff --git a/source/x11-extra/barpanel/README.Frugalware b/source/x11-extra/barpanel/README.Frugalware new file mode 100644 index 0000000..c8f6dca --- /dev/null +++ b/source/x11-extra/barpanel/README.Frugalware @@ -0,0 +1,14 @@ +Some tips and trick for use with barpanel: + +* Copy the config.xml.in in the package to ~/.barpanel/config.xml to be able +to create your own local changes. You can find its location with pacman-g2 +-Ql barpanel. + +* Barpanel themes are simply gtk2 themes, so if you want it to match your own +gtk theme, a simple way you can try is this: +cd ~/.barpanel/themes +ln -s (path to your gtk theme)/gtk-2.0 (name of theme) + +Then, change the theme in your ~/.barpanel/config.xml configuration file. + +Enjoy. From devil505linux at gmail.com Sat Jun 14 18:36:51 2008 From: devil505linux at gmail.com (Devil505) Date: Sat Jun 14 18:36:54 2008 Subject: [Frugalware-git] frugalware-current: tagpy-0.94.5-1-i686 Message-ID: <20080614163651.DD04E1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b09656edf17401f259a1a846b28d21a1ee7141ba commit b09656edf17401f259a1a846b28d21a1ee7141ba Author: Devil505 Date: Sat Jun 14 18:36:02 2008 +0200 tagpy-0.94.5-1-i686 * new package diff --git a/source/lib-extra/tagpy/FrugalBuild b/source/lib-extra/tagpy/FrugalBuild new file mode 100644 index 0000000..46c2df2 --- /dev/null +++ b/source/lib-extra/tagpy/FrugalBuild @@ -0,0 +1,30 @@ +# Compiling Time: 0.03 SBU +# Maintainer: Devil505 + +pkgname=tagpy +pkgver=0.94.5 +pkgrel=1 +pkgdesc="Python bindings for TagLib" +arch=('i686' 'x86_64') +url="http://mathema.tician.de/software/tagpy" +depends=('python' 'taglib' 'libboost-mt') +makedepends=('setuptools' 'boost') +groups=('lib-extra') +archs=('i686') +up2date="lynx -dump http://pypi.python.org/pypi/$pkgname | Flasttar" +source=(http://pypi.python.org/packages/source/t/$pkgname/$pkgname-$pkgver.tar.gz) +Fconfopts="${Fconfopts[@]} --taglib-lib-dir=/usr/lib/ \ + --taglib-inc-dir=/usr/include/taglib/ \ + --boost-inc-dir=/usr/include/boost/ \ + --boost-lib-dir=/usr/lib/ \ + --boost-python-libname=boost_python-mt" +sha1sums=('24d15ba08c98312b305eb589faa4cec003ec8800') + +build() { + Fcd + Fconf + python setup.py build || Fdie + python setup.py install --root=$Fdestdir || Fdie +} + +# optimization OK From devil505linux at gmail.com Sat Jun 14 18:45:42 2008 From: devil505linux at gmail.com (Devil505) Date: Sat Jun 14 18:45:43 2008 Subject: [Frugalware-git] frugalware-current: zsi-2.1_a1-1-i686 Message-ID: <20080614164542.AE6F01770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4d2987e8bb58cab292fad3d4fc6d35341f82d69d commit 4d2987e8bb58cab292fad3d4fc6d35341f82d69d Author: Devil505 Date: Sat Jun 14 18:45:14 2008 +0200 zsi-2.1_a1-1-i686 * new package diff --git a/source/devel-extra/zsi/FrugalBuild b/source/devel-extra/zsi/FrugalBuild new file mode 100644 index 0000000..539d782 --- /dev/null +++ b/source/devel-extra/zsi/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=zsi +pkgver=2.1_a1 +_pkgver=2.1-a1 +pkgrel=1 +pkgdesc="a Python package that provides an implementation of SOAP messaging" +url="http://pywebsvcs.sourceforge.net/zsi.html" +depends=('pyxml') +makedepends=('setuptools') +groups=('devel-extra') +archs=('i686') +_F_archive_name="ZSI" +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=26590 | sed 's/-a/_a/g' | Flasttar" +source=(http://downloads.sourceforge.net/pywebsvcs/$_F_archive_name-$_pkgver.tar.gz) +_F_cd_path="$_F_archive_name-$_pkgver" +sha1sums=('e0a375201396ef32e9607e6ceea5d2920950a7cb') From vmiklos at frugalware.org Sat Jun 14 19:42:45 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 14 19:42:47 2008 Subject: [Frugalware-git] pacman-g2: makepkg: add noversrc option Message-ID: <20080614174245.DD1E21770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=af7e1034a3ee52ffa4c976120479421ed7626bf3 commit af7e1034a3ee52ffa4c976120479421ed7626bf3 Author: Miklos Vajna Date: Sat Jun 14 19:42:27 2008 +0200 makepkg: add noversrc option - this is for packages without pkgver in source() like rss2email diff --git a/doc/FrugalBuild.txt b/doc/FrugalBuild.txt index 8ee5bcd..27b3424 100644 --- a/doc/FrugalBuild.txt +++ b/doc/FrugalBuild.txt @@ -333,6 +333,10 @@ options (array):: genscriptlet: Informs makepkg about not having a scriptlet is intentional. You want to use this when the scriptlet is generated during build(). + noversrc: Informs makepkg about the source tarball does not contain the + package version, so it should be always downloaded from upstream, rather + than using an rsync mirror. + NOTE: Feel free to use `nomirror` in a WIP repo but please try avoid it when pushing to a production repository. diff --git a/scripts/makepkg b/scripts/makepkg index e1cf193..6fefcae 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -887,7 +887,7 @@ if [ "`type -p fblint`" ]; then fi eval "serverlist=${TREE}_servers" -if [ "$F_makepkg_scm" = "git" ]; then +if [ "$F_makepkg_scm" = "git" -a ! "`check_option NOVERSRC`" ]; then _serverlist=`GIT_DIR=$fst_root/${TREE}/.git git config --get remote.origin.url 2>/dev/null` if [ -n "$_serverlist" ]; then serverlist=$_serverlist From vmiklos at frugalware.org Sat Jun 14 19:53:09 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 14 19:53:11 2008 Subject: [Frugalware-git] pacman-tools: syncpkgcd: download sources from genesis if possible Message-ID: <20080614175309.CA0C31770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=ad50d6b2cb28dfd0c696aa673905d2c6c8a942dc commit ad50d6b2cb28dfd0c696aa673905d2c6c8a942dc Author: Miklos Vajna Date: Sat Jun 14 19:51:47 2008 +0200 syncpkgcd: download sources from genesis if possible next makepkg will have an option to block downloads from genesis for unversioned tarballs, so now we can just ask makepkg to handle the source download. we do not check the return code, if it fails then we will still get a proper error message when downloading in chroot. diff --git a/syncpkgd/syncpkgcd.py b/syncpkgd/syncpkgcd.py index a83d04f..f2e8943 100644 --- a/syncpkgd/syncpkgcd.py +++ b/syncpkgd/syncpkgcd.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import xmlrpclib, time, os, getopt, sys, socket, glob, base64, pwd, signal -import traceback +import traceback, shutil sys.path.append("/etc/syncpkgcd") from cconfig import config @@ -153,6 +153,12 @@ class Syncpkgcd: else: makepkg_tree = tree self.system("sudo makepkg -t %s -C" % makepkg_tree) + # download sources from our mirror if possible + self.system("sudo makepkg -t %s -doeuH") + # clean up duplicated dirs + for i in ["src", "pkg"]: + if os.path.exists(i): + shutil.rmtree(i) if self.system("sudo makepkg -t %s -cu" % makepkg_tree): self.log(pkg, "makepkg failed") try: From vmiklos at frugalware.org Sat Jun 14 20:02:01 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 14 20:02:03 2008 Subject: [Frugalware-git] frugalware-current: xf86-video-mach64-6.8.0-1-i686 Message-ID: <20080614180201.55BC01770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=273e956ba09337b03bc08b1f1cc423085ca9e5b9 commit 273e956ba09337b03bc08b1f1cc423085ca9e5b9 Author: Miklos Vajna Date: Sat Jun 14 20:01:51 2008 +0200 xf86-video-mach64-6.8.0-1-i686 - new package diff --git a/source/x11/xf86-video-mach64/FrugalBuild b/source/x11/xf86-video-mach64/FrugalBuild new file mode 100644 index 0000000..8f6a400 --- /dev/null +++ b/source/x11/xf86-video-mach64/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.04 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=xf86-video-mach64 +pkgver=6.8.0 +pkgrel=1 +pkgdesc="X.Org video driver for mach64 cards" +url="http://xorg.freedesktop.org" +groups=('x11' 'xorg-core' 'xorg-drivers') +archs=('i686' 'x86_64') +depends=('xorg-server>=1.4.0.90') +makedepends=('randrproto' 'renderproto' 'xineramaproto' 'videoproto' 'xf86driproto' 'glproto') +Finclude xorg +sha1sums=('0f130aca927ede0fd3ed7876c52817a5ef9215bb') +# optimization OK From vmiklos at frugalware.org Sat Jun 14 20:49:15 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jun 14 20:49:17 2008 Subject: [Frugalware-git] frugalware-current: xf86-video-r128-6.8.0-1-i686 Message-ID: <20080614184915.9865B1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=082205283e36c43884814a1f2d9b115e2d536484 commit 082205283e36c43884814a1f2d9b115e2d536484 Author: Miklos Vajna Date: Sat Jun 14 20:49:01 2008 +0200 xf86-video-r128-6.8.0-1-i686 - new package diff --git a/source/x11/xf86-video-r128/FrugalBuild b/source/x11/xf86-video-r128/FrugalBuild new file mode 100644 index 0000000..3582783 --- /dev/null +++ b/source/x11/xf86-video-r128/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.04 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=xf86-video-r128 +pkgver=6.8.0 +pkgrel=1 +pkgdesc="X.Org video driver for r128 cards" +url="http://xorg.freedesktop.org" +groups=('x11' 'xorg-core' 'xorg-drivers') +archs=('i686' 'x86_64') +depends=('xorg-server>=1.4.0.90') +makedepends=('randrproto' 'renderproto' 'xineramaproto' 'videoproto' 'xf86driproto' 'glproto') +Finclude xorg +sha1sums=('a94f3014a139d5c469622723192aaf1626e6470b') +# optimization OK From ryuo at frugalware.org Sat Jun 14 22:51:18 2008 From: ryuo at frugalware.org (James Buren) Date: Sat Jun 14 22:51:20 2008 Subject: [Frugalware-git] frugalware-current: perl-gtk2-traymanager-0.05-1-i686 Message-ID: <20080614205118.A35251770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0cbc15ad76c659b8b4d9a5f5e7e51fef5bdc981f commit 0cbc15ad76c659b8b4d9a5f5e7e51fef5bdc981f Author: James Buren Date: Sat Jun 14 15:50:47 2008 -0500 perl-gtk2-traymanager-0.05-1-i686 * new package diff --git a/source/devel-extra/perl-gtk2-traymanager/FrugalBuild b/source/devel-extra/perl-gtk2-traymanager/FrugalBuild new file mode 100644 index 0000000..1a2ac43 --- /dev/null +++ b/source/devel-extra/perl-gtk2-traymanager/FrugalBuild @@ -0,0 +1,10 @@ +# Compiling Time: 0.1 SBU +# Maintainer: James Buren + +_F_perl_name=Gtk2-TrayManager +_F_perl_author=B/BO/BORUP +pkgver=0.05 +pkgdesc="Perl bindings for EggTrayManager" +Finclude perl +archs=('i686' 'x86_64') +sha1sums=('29adefb5981247ef7a3ef5e838b165cfd2e90148') From ryuo at frugalware.org Sat Jun 14 22:54:26 2008 From: ryuo at frugalware.org (James Buren) Date: Sat Jun 14 22:54:28 2008 Subject: [Frugalware-git] frugalware-current: perlpanel-0.9.1-1-i686 Message-ID: <20080614205426.D257E1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d2ef85c2b62c27aac7d21c5b6629f1ebabde0696 commit d2ef85c2b62c27aac7d21c5b6629f1ebabde0696 Author: James Buren Date: Sat Jun 14 15:54:27 2008 -0500 perlpanel-0.9.1-1-i686 * updated depends diff --git a/source/x11-extra/perlpanel/FrugalBuild b/source/x11-extra/perlpanel/FrugalBuild index f31fc73..cf71605 100644 --- a/source/x11-extra/perlpanel/FrugalBuild +++ b/source/x11-extra/perlpanel/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="A feature-packed panel written in perl." url="http://savannah.nongnu.org/projects/perlpanel" depends=('perl-gtk2-gladexml' 'perl-xml-simple' 'perl-gnome2-wnck' 'perl-gettext') -rodepends=('perl-date-manip' 'perl-audio-mixer' 'perl-x11-freedesktop-desktopentry') +rodepends=('perl-date-manip' 'perl-audio-mixer' 'perl-x11-freedesktop-desktopentry' 'perl-gtk2-traymanager') groups=('x11-extra') archs=('i686' 'x86_64') # no known newer version, and main website is gone. From ryuo at frugalware.org Sat Jun 14 22:58:07 2008 From: ryuo at frugalware.org (James Buren) Date: Sat Jun 14 22:58:08 2008 Subject: [Frugalware-git] frugalware-current: perl-gtk2-traymanager-0.05-1-i686 Message-ID: <20080614205807.5868F1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=546dd538d02670875fb70d61cc72682c116ddefa commit 546dd538d02670875fb70d61cc72682c116ddefa Author: James Buren Date: Sat Jun 14 15:58:10 2008 -0500 perl-gtk2-traymanager-0.05-1-i686 * depends update diff --git a/source/devel-extra/perl-gtk2-traymanager/FrugalBuild b/source/devel-extra/perl-gtk2-traymanager/FrugalBuild index 1a2ac43..665f706 100644 --- a/source/devel-extra/perl-gtk2-traymanager/FrugalBuild +++ b/source/devel-extra/perl-gtk2-traymanager/FrugalBuild @@ -5,6 +5,7 @@ _F_perl_name=Gtk2-TrayManager _F_perl_author=B/BO/BORUP pkgver=0.05 pkgdesc="Perl bindings for EggTrayManager" +depends=('perl-extutils-depends') Finclude perl archs=('i686' 'x86_64') sha1sums=('29adefb5981247ef7a3ef5e838b165cfd2e90148') From ryuo at frugalware.org Sat Jun 14 23:08:15 2008 From: ryuo at frugalware.org (James Buren) Date: Sat Jun 14 23:08:17 2008 Subject: [Frugalware-git] frugalware-current: perl-gtk2-traymanager-0.05-1-i686 Message-ID: <20080614210815.9FF151770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7653e184b7f7b2bc74831d7150f1999045d72375 commit 7653e184b7f7b2bc74831d7150f1999045d72375 Author: James Buren Date: Sat Jun 14 16:08:18 2008 -0500 perl-gtk2-traymanager-0.05-1-i686 * finally got depends right diff --git a/source/devel-extra/perl-gtk2-traymanager/FrugalBuild b/source/devel-extra/perl-gtk2-traymanager/FrugalBuild index 665f706..2954261 100644 --- a/source/devel-extra/perl-gtk2-traymanager/FrugalBuild +++ b/source/devel-extra/perl-gtk2-traymanager/FrugalBuild @@ -5,7 +5,7 @@ _F_perl_name=Gtk2-TrayManager _F_perl_author=B/BO/BORUP pkgver=0.05 pkgdesc="Perl bindings for EggTrayManager" -depends=('perl-extutils-depends') +depends=('perl-extutils-depends' 'perl-extutils-pkgconfig' 'perl-gtk2') Finclude perl archs=('i686' 'x86_64') sha1sums=('29adefb5981247ef7a3ef5e838b165cfd2e90148') From ryuo at frugalware.org Sun Jun 15 01:16:05 2008 From: ryuo at frugalware.org (James Buren) Date: Sun Jun 15 01:16:08 2008 Subject: [Frugalware-git] frugalware-current: pycawm-0.1-1-i686 Message-ID: <20080614231605.68E6D1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=53d5dbb5bffe09c358f54565d3155345aec117a6 commit 53d5dbb5bffe09c358f54565d3155345aec117a6 Author: James Buren Date: Sat Jun 14 18:16:00 2008 -0500 pycawm-0.1-1-i686 * new package diff --git a/source/x11-extra/pycawm/FrugalBuild b/source/x11-extra/pycawm/FrugalBuild new file mode 100644 index 0000000..618159e --- /dev/null +++ b/source/x11-extra/pycawm/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=pycawm +pkgver=0.1 +pkgrel=1 +pkgdesc="A window manager written in python." +url="http://pycawm.last-exile.org" +rodepends=('python-xlib' 'imaging') +depends=('python') +groups=('x11-extra') +archs=('i686' 'x86_64') +_F_archive_name=PycaWM +up2date="Flasttar $url" +source=($url/sources/$_F_archive_name-$pkgver.tar.bz2) +sha1sums=('2f81c19b8795b249ac314b91f95ecf3df6dde370') + +build() +{ + Fcd $_F_archive_name-$pkgver + sed -ie "s:\(/usr\|/etc\):$startdir/pkg\1:; s:local/::" Makefile || Fdie + Fmakeinstall + Fmkdir /etc/X11/sessions + Fmv /usr/share/xsessions/$_F_archive_name.desktop /etc/X11/sessions + Frm /usr/share/xsessions +} From vmiklos at frugalware.org Sun Jun 15 01:36:14 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 15 01:36:16 2008 Subject: [Frugalware-git] bmf: git-1.5.6.rc2.45.gdc92cc2-1-i686 Message-ID: <20080614233614.130571770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=ddcc0917d7f24ebb47ede6e12ad365d4bb0385c2 commit ddcc0917d7f24ebb47ede6e12ad365d4bb0385c2 Author: Miklos Vajna Date: Sun Jun 15 01:35:20 2008 +0200 git-1.5.6.rc2.45.gdc92cc2-1-i686 - update to newer snapshot, texinfo is back :) diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index 4ff88c7..2cc9ea7 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -9,7 +9,7 @@ USE_HTMLMAN=${USE_HTMLMAN:-"y"} pkgname=git pkgver=1.5.5.4 -Fuse $USE_DEVEL && pkgver=1.5.6.rc2 +Fuse $USE_DEVEL && pkgver=1.5.6.rc2.45.gdc92cc2 pkgrel=1 pkgdesc="A fast, scalable, distributed revision control system." url="http://www.kernel.org/pub/software/scm/git/" @@ -37,7 +37,7 @@ subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') if Fuse $USE_DEVEL; then _F_scm_type="git" _F_scm_url="git://git.kernel.org/pub/scm/git/git.git" - _F_scm_tag="v${pkgver/.rc/-rc}" + _F_scm_tag="v${pkgver//./-}" Finclude scm fi @@ -62,11 +62,8 @@ build() Fconf build_settings="V=1 ETC_GITCONFIG=/etc/gitconfig htmldir=/usr/share/doc/$pkgname-$pkgver mandir=/usr/share/man" - # 'info' is currently broken, see - # http://mid.gmane.org/20080605234016.GO29404@genesis.frugalware.org - make $build_settings DOCBOOK2X_TEXI=docbook2texi all doc || return 1 - # likewise, install-info is currently disabled - Fmakeinstall $build_settings install-doc + make $build_settings DOCBOOK2X_TEXI=docbook2texi all doc info || return 1 + Fmakeinstall $build_settings install-doc install-info Ffilerel perl/private-Error.pm /usr/lib/perl5/site_perl/current/Error.pm make -C Documentation WEBDOC_DEST=$Fdestdir/usr/share/doc/$pkgname-$pkgver install-webdoc || return 1 # broken symlink From vmiklos at frugalware.org Sun Jun 15 14:58:48 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 15 14:58:50 2008 Subject: [Frugalware-git] frugalware-current: aircrack-ng-0.9.3-1-i686 Message-ID: <20080615125848.15C1E1788036@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7dfab6db2f53694ce576ea0115ce8a3db46e43ce commit 7dfab6db2f53694ce576ea0115ce8a3db46e43ce Author: Miklos Vajna Date: Sun Jun 15 14:37:20 2008 +0200 aircrack-ng-0.9.3-1-i686 - up2date fix diff --git a/source/network-extra/aircrack-ng/FrugalBuild b/source/network-extra/aircrack-ng/FrugalBuild index 8e1f256..528007d 100644 --- a/source/network-extra/aircrack-ng/FrugalBuild +++ b/source/network-extra/aircrack-ng/FrugalBuild @@ -9,9 +9,7 @@ url="http://www.aircrack-ng.org/" depends=('libpcap') groups=('network-extra') archs=('i686' 'x86_64') -# this is not buggy but lists betas.. -#up2date="lynx -dump $url|grep Latest|sed 's/.*: //;q'" -up2date="lynx -dump $url|grep 'is now released'|sed 's/.* \(.*\) is now.*/\1/;q'" +up2date="lynx -dump http://www.aircrack-ng.org/doku.php?id=downloads|grep -v -- -rc|Flasttar" source=(http://download.aircrack-ng.org/$pkgname-$pkgver.tar.gz) sha1sums=('b2f671324d056408b83d32eb1ab6061b7fa87ac5') From vmiklos at frugalware.org Sun Jun 15 14:58:48 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 15 14:58:53 2008 Subject: [Frugalware-git] frugalware-current: firefox-greasemonkey-0.8.20080609.0-1-i686 Message-ID: <20080615125848.2271217880AB@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=210026b903b9294491848d0a911e407fc6ce83f3 commit 210026b903b9294491848d0a911e407fc6ce83f3 Author: Miklos Vajna Date: Sun Jun 15 14:39:55 2008 +0200 firefox-greasemonkey-0.8.20080609.0-1-i686 - version bump - cleanup diff --git a/source/xapps-extra/firefox-greasemonkey/FrugalBuild b/source/xapps-extra/firefox-greasemonkey/FrugalBuild index 6d5d0fb..9b349d3 100644 --- a/source/xapps-extra/firefox-greasemonkey/FrugalBuild +++ b/source/xapps-extra/firefox-greasemonkey/FrugalBuild @@ -1,13 +1,10 @@ # Compiling Time: 0.01 SBU # Maintainer: VMiklos -pkgver=0.7.20080121.0 +pkgver=0.8.20080609.0 pkgrel=1 pkgdesc="A User Script Manager for Firefox" url="https://addons.mozilla.org/en-US/firefox/addon/748" -rodepends=('firefox>=1.5') -groups=('xapps-extra' 'firefox-extensions') -archs=('i686' 'x86_64') up2date="elinks -dump $url |grep xpi$|sed 's/.*-\(.*\)-.*/\1/;q'" # some special case? chrome.manifest from the xpi works for this version :) source=(http://releases.mozilla.org/pub/mozilla.org/addons/748/greasemonkey-$pkgver-fx.xpi \ @@ -16,5 +13,5 @@ _F_firefox_ext=greasemonkey _F_firefox_id="e4a8a97b-f2ed-450b-b12d-ee082ba24781" _F_firefox_name="$_F_firefox_ext-$pkgver-fx.xpi" Finclude firefox-extension -sha1sums=('0e4cfb8d0eeb539428a617c5398a65cd752cf350' \ +sha1sums=('c0af8e616c2ee0e106246feb03de7a8c7565bd1f' \ '33891f9764df610a52a61fefb47ddf8ca18f0011') From vmiklos at frugalware.org Sun Jun 15 14:58:48 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 15 14:58:54 2008 Subject: [Frugalware-git] frugalware-current: apache-2.2.9-1-i686 Message-ID: <20080615125848.2CB3417880AD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7575d84a225353c63b82b862c103df0cd4ccb2ac commit 7575d84a225353c63b82b862c103df0cd4ccb2ac Author: Miklos Vajna Date: Sun Jun 15 14:43:30 2008 +0200 apache-2.2.9-1-i686 - version bump diff --git a/source/network/apache/FrugalBuild b/source/network/apache/FrugalBuild index e2abc7f..9a3f499 100644 --- a/source/network/apache/FrugalBuild +++ b/source/network/apache/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: Zsolt Szalai pkgname=apache -pkgver=2.2.8 +pkgver=2.2.9 pkgrel=1 pkgdesc="A high performance Unix-based HTTP server (with SSL)" url="http://httpd.apache.org/" From vmiklos at frugalware.org Sun Jun 15 14:58:47 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 15 14:58:55 2008 Subject: [Frugalware-git] frugalware-current: wlan-ng-0.2.9-1-i686 Message-ID: <20080615125847.EEAB91770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8c7fd7be721dca26930a9509c968d0f9c2b8f0ab commit 8c7fd7be721dca26930a9509c968d0f9c2b8f0ab Author: Miklos Vajna Date: Sun Jun 15 14:34:47 2008 +0200 wlan-ng-0.2.9-1-i686 - version bump diff --git a/source/network-extra/wlan-ng/FrugalBuild b/source/network-extra/wlan-ng/FrugalBuild index c57c5bb..f51e9ab 100644 --- a/source/network-extra/wlan-ng/FrugalBuild +++ b/source/network-extra/wlan-ng/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=wlan-ng -pkgver=0.2.8 -pkgrel=25 +pkgver=0.2.9 +pkgrel=1 pkgdesc="Wireless Lan modules" url="http://www.linux-wlan.org/" Finclude kernel-module @@ -13,11 +13,9 @@ archs=('i686' 'x86_64') backup=(etc/wlan/wlan.conf) up2date="lynx -dump ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/|grep tar.bz2$|sed -n 's/.*g-\(.*\)\.t.*/\1/;s/-//;$ p'" source=(ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-$pkgname-$pkgver.tar.bz2 \ - rc.wlan wlan-ng-0.2.8-kernel26{23,24}.diff) -sha1sums=('a98cd5c7327f5392730ebe1a5b7f289fc88d00de' \ - 'b5b76089293cf11ab5c5f634f1c3b8dd7f4c34a7' \ - 'dd46ef1066debf1596902c9d8bb7c3988e98e184' \ - '1987d4137a82cfbb4a390228e5d33155f52e1fbc') + rc.wlan) +sha1sums=('e6b8e37bbe3b6d2d17dea5d8db782cad7f84a64e' \ + 'b5b76089293cf11ab5c5f634f1c3b8dd7f4c34a7') build() { diff --git a/source/network-extra/wlan-ng/wlan-ng-0.2.8-kernel2623.diff b/source/network-extra/wlan-ng/wlan-ng-0.2.8-kernel2623.diff deleted file mode 100644 index 5e7d9a7..0000000 --- a/source/network-extra/wlan-ng/wlan-ng-0.2.8-kernel2623.diff +++ /dev/null @@ -1,193 +0,0 @@ -diff -Naur linux-wlan-ng-0.2.8/CHANGES linux-wlan-ng-export/CHANGES ---- linux-wlan-ng-0.2.8/CHANGES 2007-05-04 14:29:27.000000000 +0200 -+++ linux-wlan-ng-export/CHANGES 2007-10-16 16:07:27.000000000 +0200 -@@ -41,6 +41,11 @@ - * Intersil Corporation as part of PRISM(R) chipset product development. - * - * -------------------------------------------------------------------- -+ - Support 2.6.23 kernels. (With apologies to Martin Dauskardt for a -+ misapplied patch) -+ - Support "Intersil Americas USB 802.11b WLAN DEVICE" (Peter Levart) -+ - Tweaks to support Fedora 7 (Dan Williams) -+ - Support 2.6.22 kernels - 0.2.8 - - Fix up a pile of sparse warnings (Pavel Roskin) - - Support 2.6.20 kernels (Pavel Roskin) -diff -Naur linux-wlan-ng-0.2.8/Configure linux-wlan-ng-export/Configure ---- linux-wlan-ng-0.2.8/Configure 2007-05-08 00:00:22.000000000 +0200 -+++ linux-wlan-ng-export/Configure 2007-10-16 16:43:56.000000000 +0200 -@@ -277,9 +277,9 @@ - fi - write_bool KERN_2_6_17 - --if [ $VERSION_CODE -gt `version 2 6 21` ] ; then -+if [ $VERSION_CODE -gt `version 2 6 22` ] ; then - $ECHO "******* WARNING WARNING WARNING *******" -- $ECHO "Kernels newer than 2.6.21.x are not supported." -+ $ECHO "Kernels newer than 2.6.23.x are not supported." - $ECHO "******* WARNING WARNING WARNING *******" - fi - -diff -Naur linux-wlan-ng-0.2.8/etc/udev/rules.d/40-prism2.rules linux-wlan-ng-export/etc/udev/rules.d/40-prism2.rules ---- linux-wlan-ng-0.2.8/etc/udev/rules.d/40-prism2.rules 2006-06-26 17:03:27.000000000 +0200 -+++ linux-wlan-ng-export/etc/udev/rules.d/40-prism2.rules 2007-06-20 16:53:45.000000000 +0200 -@@ -1 +1,2 @@ --ACTION=="add",BUS=="usb",DRIVER=="prism2_usb" ,RUN+="/etc/wlan/wlan-udev.sh %k" -+#ACTION=="add",BUS=="usb",DRIVER=="prism2_usb" ,RUN+="/etc/wlan/wlan-udev.sh %k" -+KERNEL="wlan*",ACTION=="add",DRIVERS=="prism2_usb" ,RUN+="/etc/wlan/wlan-udev.sh %k" -diff -Naur linux-wlan-ng-0.2.8/Makefile linux-wlan-ng-export/Makefile ---- linux-wlan-ng-0.2.8/Makefile 2005-02-24 18:59:10.000000000 +0100 -+++ linux-wlan-ng-export/Makefile 2007-10-16 16:43:56.000000000 +0200 -@@ -76,6 +76,8 @@ - all: config.mk - set -e; for d in $(DIRS); do $(MAKE) -C $$d ; done - -+distclean: mrproper -+ - mrproper: clean - rm -f config.out - rm -f tags.linux tags TAGS -diff -Naur linux-wlan-ng-0.2.8/src/include/wlan/wlan_compat.h linux-wlan-ng-export/src/include/wlan/wlan_compat.h ---- linux-wlan-ng-0.2.8/src/include/wlan/wlan_compat.h 2007-02-28 16:44:02.000000000 +0100 -+++ linux-wlan-ng-export/src/include/wlan/wlan_compat.h 2007-09-18 18:51:48.000000000 +0200 -@@ -479,6 +479,18 @@ - #endif - #endif /* _LINUX_PROC_FS_H */ - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) -+#define skb_reset_mac_header(__a) (__a)->mac.raw = (__a)->data -+#define SKB_MAC_HEADER(__a) (__a)->mac.raw -+#else -+#define SKB_MAC_HEADER(__a) (__a)->mac_header -+#endif -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) -+#define IRQF_DISABLED SA_INTERRUPT -+#define IRQF_SHARED SA_SHIRQ -+#endif -+ - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) - #ifndef INIT_TQUEUE - #define PREPARE_TQUEUE(_tq, _routine, _data) \ -diff -Naur linux-wlan-ng-0.2.8/src/p80211/p80211conv.c linux-wlan-ng-export/src/p80211/p80211conv.c ---- linux-wlan-ng-0.2.8/src/p80211/p80211conv.c 2007-03-19 16:37:00.000000000 +0100 -+++ linux-wlan-ng-export/src/p80211/p80211conv.c 2007-10-16 16:44:37.000000000 +0200 -@@ -497,8 +497,16 @@ - - } - -+ /* -+ * Note that eth_type_trans() expects an skb w/ skb->data pointing -+ * at the MAC header, it then sets the following skb members: -+ * skb->mac_header, -+ * skb->data, and -+ * skb->pkt_type. -+ * It then _returns_ the value that _we're_ supposed to stuff in -+ * skb->protocol. This is nuts. -+ */ - skb->protocol = eth_type_trans(skb, netdev); -- skb->mac.raw = (unsigned char *) e_hdr; /* new MAC header */ - - /* jkriegl: process signal and noise as set in hfa384x_int_rx() */ - /* jkriegl: only process signal/noise if requested by iwspy */ -diff -Naur linux-wlan-ng-0.2.8/src/p80211/p80211netdev.c linux-wlan-ng-export/src/p80211/p80211netdev.c ---- linux-wlan-ng-0.2.8/src/p80211/p80211netdev.c 2007-03-19 16:37:00.000000000 +0100 -+++ linux-wlan-ng-export/src/p80211/p80211netdev.c 2007-09-18 18:39:19.000000000 +0200 -@@ -389,7 +389,8 @@ - - /* set up various data fields */ - skb->dev = dev; -- skb->mac.raw = skb->data ; -+ skb_reset_mac_header(skb); -+ - skb->ip_summed = CHECKSUM_NONE; - skb->pkt_type = PACKET_OTHERHOST; - skb->protocol = htons(ETH_P_80211_RAW); -@@ -929,8 +930,8 @@ - dev->open = p80211knetdev_open; - dev->stop = p80211knetdev_stop; - --#ifdef CONFIG_NET_WIRELESS --#if ((WIRELESS_EXT < 17) && (WIRELESS_EXT < 21)) -+#if defined(CONFIG_NET_WIRELESS) || defined(WIRELESS_EXT) -+#if (WIRELESS_EXT < 17) - dev->get_wireless_stats = p80211wext_get_wireless_stats; - #endif - #if WIRELESS_EXT > 12 -diff -Naur linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x.c linux-wlan-ng-export/src/prism2/driver/hfa384x.c ---- linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x.c 2007-03-19 16:37:00.000000000 +0100 -+++ linux-wlan-ng-export/src/prism2/driver/hfa384x.c 2007-06-20 16:45:49.000000000 +0200 -@@ -3645,7 +3645,7 @@ - /* the prism2 cards don't return the FCS */ - datap = skb_put(skb, WLAN_CRC_LEN); - memset (datap, 0xff, WLAN_CRC_LEN); -- skb->mac.raw = skb->data; -+ skb_reset_mac_header(skb); - - /* Attach the rxmeta, set some stuff */ - p80211skb_rxmeta_attach(wlandev, skb); -diff -Naur linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x_usb.c linux-wlan-ng-export/src/prism2/driver/hfa384x_usb.c ---- linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x_usb.c 2007-03-19 16:37:00.000000000 +0100 -+++ linux-wlan-ng-export/src/prism2/driver/hfa384x_usb.c 2007-06-20 16:45:49.000000000 +0200 -@@ -4255,7 +4255,7 @@ - /* The prism2 series does not return the CRC */ - memset(skb_put(skb, WLAN_CRC_LEN), 0xff, WLAN_CRC_LEN); - -- skb->mac.raw = skb->data; -+ skb_reset_mac_header(skb); - - /* Attach the rxmeta, set some stuff */ - p80211skb_rxmeta_attach(wlandev, skb); -diff -Naur linux-wlan-ng-0.2.8/src/prism2/driver/prism2_pci.c linux-wlan-ng-export/src/prism2/driver/prism2_pci.c ---- linux-wlan-ng-0.2.8/src/prism2/driver/prism2_pci.c 2007-03-19 16:37:00.000000000 +0100 -+++ linux-wlan-ng-export/src/prism2/driver/prism2_pci.c 2007-10-16 16:07:27.000000000 +0200 -@@ -163,7 +163,7 @@ - * _know_ things are alright. A test routine would help. - */ - request_irq(wlandev->netdev->irq, hfa384x_interrupt, -- SA_SHIRQ, wlandev->name, wlandev); -+ IRQF_SHARED, wlandev->name, wlandev); - - wlandev->msdstate = WLAN_MSD_HWPRESENT; - -@@ -275,7 +275,7 @@ - static int __init prism2pci_init(void) - { - WLAN_LOG_NOTICE("%s Loaded\n", version); -- return pci_module_init(&prism2_pci_drv_id); -+ return pci_register_driver(&prism2_pci_drv_id); - }; - - static void __exit prism2pci_cleanup(void) -diff -Naur linux-wlan-ng-0.2.8/src/prism2/driver/prism2_plx.c linux-wlan-ng-export/src/prism2/driver/prism2_plx.c ---- linux-wlan-ng-0.2.8/src/prism2/driver/prism2_plx.c 2007-03-19 16:37:00.000000000 +0100 -+++ linux-wlan-ng-export/src/prism2/driver/prism2_plx.c 2007-10-16 16:07:27.000000000 +0200 -@@ -272,7 +272,7 @@ - * _know_ things are alright. A test routine would help. - */ - request_irq(wlandev->netdev->irq, hfa384x_interrupt, -- SA_SHIRQ, wlandev->name, wlandev); -+ IRQF_SHARED, wlandev->name, wlandev); - - wlandev->msdstate = WLAN_MSD_HWPRESENT; - -@@ -420,7 +420,7 @@ - static int __init prism2plx_init(void) - { - WLAN_LOG_NOTICE("%s Loaded\n", version); -- return pci_module_init(&prism2_plx_drv_id); -+ return pci_register_driver(&prism2_plx_drv_id); - }; - - static void __exit prism2plx_cleanup(void) -diff -Naur linux-wlan-ng-0.2.8/src/prism2/driver/prism2_usb.c linux-wlan-ng-export/src/prism2/driver/prism2_usb.c ---- linux-wlan-ng-0.2.8/src/prism2/driver/prism2_usb.c 2007-03-19 16:37:00.000000000 +0100 -+++ linux-wlan-ng-export/src/prism2/driver/prism2_usb.c 2007-09-18 18:35:12.000000000 +0200 -@@ -13,6 +13,7 @@ - .driver_info = (unsigned long) name - - static struct usb_device_id usb_prism_tbl[] = { -+ {PRISM_USB_DEVICE(0x0707, 0xee04, "Intersil Americas USB 802.11b WLAN DEVICE")}, - {PRISM_USB_DEVICE(0x04bb, 0x0922, "IOData AirPort WN-B11/USBS")}, - {PRISM_USB_DEVICE(0x07aa, 0x0012, "Corega Wireless LAN USB Stick-11")}, - {PRISM_USB_DEVICE(0x09aa, 0x3642, "Prism2.x 11Mbps WLAN USB Adapter")}, diff --git a/source/network-extra/wlan-ng/wlan-ng-0.2.8-kernel2624.diff b/source/network-extra/wlan-ng/wlan-ng-0.2.8-kernel2624.diff deleted file mode 100644 index 6144045..0000000 --- a/source/network-extra/wlan-ng/wlan-ng-0.2.8-kernel2624.diff +++ /dev/null @@ -1,82 +0,0 @@ ---- src/p80211/p80211netdev.c -+++ src/p80211/p80211netdev.c -@@ -82,6 +82,8 @@ - #if WIRELESS_EXT > 12 - #include - #endif -+#include -+ - - /*================================================================*/ - /* Project Includes */ -@@ -167,11 +169,11 @@ - DBFENTER; - - #ifdef CONFIG_PROC_FS -- if (proc_net != NULL) { -+ if (init_net.proc_net != NULL) { - proc_p80211 = create_proc_entry( - "p80211", - (S_IFDIR|S_IRUGO|S_IXUGO), -- proc_net); -+ init_net.proc_net); - } - #endif - DBFEXIT; -@@ -196,7 +198,7 @@ - DBFENTER; - #ifdef CONFIG_PROC_FS - if (proc_p80211 != NULL) { -- remove_proc_entry("p80211", proc_net); -+ remove_proc_entry("p80211", init_net.proc_net); - } - #endif - DBFEXIT; ---- src/prism2/driver/prism2_cs.c -+++ src/prism2/driver/prism2_cs.c -@@ -517,7 +517,6 @@ - #endif - - /* Register the network device and get assigned a name */ -- SET_MODULE_OWNER(wlandev->netdev); - SET_NETDEV_DEV(wlandev->netdev, &handle_to_dev(pdev)); - if (register_wlandev(wlandev) != 0) { - WLAN_LOG_NOTICE("prism2sta_cs: register_wlandev() failed.\n"); -@@ -1080,7 +1079,6 @@ - link->dev = &hw->node; - - /* Register the network device and get assigned a name */ -- SET_MODULE_OWNER(wlandev->netdev); - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11) ) - SET_NETDEV_DEV(wlandev->netdev, &handle_to_dev(link->handle)); - #endif ---- src/prism2/driver/prism2_pci.c -+++ src/prism2/driver/prism2_pci.c -@@ -119,7 +119,6 @@ - /* Register the wlandev, this gets us a name and registers the - * linux netdevice. - */ -- SET_MODULE_OWNER(wlandev->netdev); - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) - SET_NETDEV_DEV(wlandev->netdev, &(pdev->dev)); - #endif ---- src/prism2/driver/prism2_plx.c -+++ src/prism2/driver/prism2_plx.c -@@ -228,7 +228,6 @@ - /* Register the wlandev, this gets us a name and registers the - * linux netdevice. - */ -- SET_MODULE_OWNER(wlandev->netdev); - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) - SET_NETDEV_DEV(wlandev->netdev, &(pdev->dev)); - #endif ---- src/prism2/driver/prism2_usb.c -+++ src/prism2/driver/prism2_usb.c -@@ -131,7 +131,6 @@ - /* Register the wlandev, this gets us a name and registers the - * linux netdevice. - */ -- SET_MODULE_OWNER(wlandev->netdev); - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) - SET_NETDEV_DEV(wlandev->netdev, &(interface->dev)); - #endif From vmiklos at frugalware.org Sun Jun 15 14:58:48 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 15 14:58:56 2008 Subject: [Frugalware-git] frugalware-current: iptables-1.4.1-1-i686 Message-ID: <20080615125848.3B08A17880AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=192a3542f9cd50d6b1948af93886c2d5fb951c68 commit 192a3542f9cd50d6b1948af93886c2d5fb951c68 Author: Miklos Vajna Date: Sun Jun 15 14:56:03 2008 +0200 iptables-1.4.1-1-i686 - version bump - upstream switched to autoconf \o/ diff --git a/source/network/iptables/FrugalBuild b/source/network/iptables/FrugalBuild index 6badda8..53493ad 100644 --- a/source/network/iptables/FrugalBuild +++ b/source/network/iptables/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: Zsolt Szalai pkgname=iptables -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=1 pkgdesc="IP packet filter administration" url="http://www.iptables.org/" @@ -12,14 +12,9 @@ groups=('network') archs=('i686' 'x86_64') backup=(etc/sysconfig/{firewall,iptables}) up2date="lynx -dump http://www.iptables.org/projects/iptables/downloads.html|grep bz2$|sed 's/.*-\(.*\)\.t.*/\1/;q'" -source=(http://www.iptables.org/projects/iptables/files/iptables-$pkgver.tar.bz2 \ - rc.firewall rc.firewall-hu.po iptables firewall headers.diff) -sha1sums=('b61064885ab20b62d6ac2a590ea429117248d9d7' \ - '8d817150509f677370561bd412f49d2868f1eeef' \ - '0f8f613fe2daac570bece0df8711b4b6546a9e34' \ - '57af04722d7b42f128b96119ffa97fd3924f80b1' \ - '56ff89ba4ef72b0a203a1210e4fe9ea869e89ff5' \ - 'f4c25b57850187988562134a6c51956a61c79c6d') +source=(ftp://ftp.netfilter.org/pub/iptables/iptables-$pkgver.tar.bz2 \ + rc.firewall rc.firewall-hu.po iptables firewall) +signatures=($source.sig '' '' '' '') # As you can see, the /etc/sysconfig/firewall file was generated by # iptables-save. I used the following commands before using iptables-save: @@ -31,13 +26,7 @@ sha1sums=('b61064885ab20b62d6ac2a590ea429117248d9d7' \ build() { - Fpatchall - Fsed '/usr/local' '/usr' Makefile - Fsed '^\(COPT_FLAGS:=\)-O2$' "\1$CFLAGS" Makefile - - make KERNEL_DIR=/usr || return 1 - - make PREFIX=$Fdestdir/usr KERNEL_DIR=/usr install install-devel + Fbuild --with-kernel=/usr --enable-devel --enable-libipq Ffile /etc/sysconfig/iptables Finstall 600 /etc/sysconfig/firewall Frcd2 firewall diff --git a/source/network/iptables/headers.diff b/source/network/iptables/headers.diff deleted file mode 100644 index 54f0761..0000000 --- a/source/network/iptables/headers.diff +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur iptables-1.4.0.orig/include/linux/netfilter_ipv4/ip_tables.h iptables-1.4.0/include/linux/netfilter_ipv4/ip_tables.h ---- iptables-1.4.0.orig/include/linux/netfilter_ipv4/ip_tables.h 2007-12-22 13:44:17.000000000 +0100 -+++ iptables-1.4.0/include/linux/netfilter_ipv4/ip_tables.h 2008-01-03 23:39:55.000000000 +0100 -@@ -15,7 +15,6 @@ - #ifndef _IPTABLES_H - #define _IPTABLES_H - --#include - #include - - #include -@@ -187,7 +186,7 @@ - /* Number of counters (must be equal to current number of entries). */ - unsigned int num_counters; - /* The old entries' counters. */ -- struct xt_counters __user *counters; -+ struct xt_counters *counters; - - /* The entries (hang off end: not really an array). */ - struct ipt_entry entries[0]; -diff -Naur iptables-1.4.0.orig/include/linux/netfilter_ipv6/ip6_tables.h iptables-1.4.0/include/linux/netfilter_ipv6/ip6_tables.h ---- iptables-1.4.0.orig/include/linux/netfilter_ipv6/ip6_tables.h 2007-12-22 13:44:17.000000000 +0100 -+++ iptables-1.4.0/include/linux/netfilter_ipv6/ip6_tables.h 2008-01-03 23:39:46.000000000 +0100 -@@ -15,7 +15,6 @@ - #ifndef _IP6_TABLES_H - #define _IP6_TABLES_H - --#include - #include - - #include -@@ -247,7 +246,7 @@ - /* Number of counters (must be equal to current number of entries). */ - unsigned int num_counters; - /* The old entries' counters. */ -- struct xt_counters __user *counters; -+ struct xt_counters *counters; - - /* The entries (hang off end: not really an array). */ - struct ip6t_entry entries[0]; From vmiklos at frugalware.org Sun Jun 15 14:58:48 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 15 14:58:57 2008 Subject: [Frugalware-git] frugalware-current: perl-dbd-pg-2.8.1-1-i686 Message-ID: <20080615125848.45A2117880AF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9f1f5338dbf69a56516681a50d960ab5f1f89aa3 commit 9f1f5338dbf69a56516681a50d960ab5f1f89aa3 Author: Miklos Vajna Date: Sun Jun 15 14:56:54 2008 +0200 perl-dbd-pg-2.8.1-1-i686 - version bump diff --git a/source/devel-extra/perl-dbd-pg/FrugalBuild b/source/devel-extra/perl-dbd-pg/FrugalBuild index 757d74f..f76500e 100644 --- a/source/devel-extra/perl-dbd-pg/FrugalBuild +++ b/source/devel-extra/perl-dbd-pg/FrugalBuild @@ -3,11 +3,11 @@ _F_perl_name=DBD-Pg _F_perl_author=T/TU/TURNSTEP -pkgver=2.7.2 +pkgver=2.8.1 pkgrel=1 pkgdesc="PostgreSQL database driver for the DBI module" depends=('perl-dbi>=1.45' 'postgresql>=8.2') Finclude perl archs=(${archs[@]} 'x86_64') -sha1sums=('a3a78158a340c5abb1761933ffd79c95b649b8d0') +sha1sums=('912288e530a58c8353bb11a3fd7b0fb64c603f83') # optimization OK From janny at frugalware.org Sun Jun 15 15:59:46 2008 From: janny at frugalware.org (Janos Kovacs) Date: Sun Jun 15 15:59:48 2008 Subject: [Frugalware-git] frugalware-current: clamtk-3.10-1-i686 Message-ID: <20080615135946.E953A1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3075833675fc9f62cd7a84f95f5f5baba5c69323 commit 3075833675fc9f62cd7a84f95f5f5baba5c69323 Author: Janos Kovacs Date: Sun Jun 15 15:56:27 2008 +0200 clamtk-3.10-1-i686 * version bump diff --git a/source/xapps-extra/clamtk/FrugalBuild b/source/xapps-extra/clamtk/FrugalBuild index 8654715..1db15da 100644 --- a/source/xapps-extra/clamtk/FrugalBuild +++ b/source/xapps-extra/clamtk/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Janos Kovacs pkgname=clamtk -pkgver=3.09 +pkgver=3.10 pkgrel=1 pkgdesc="ClamTk is a GUI front-end for ClamAV using gtk2-perl" rodepends=('perl-gtk2' 'clamav' 'perl-date-calc' 'perl-file-find-rule' 'perl-gettext') @@ -10,7 +10,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') Finclude sourceforge url="http://clamtk.sourceforge.net/" -sha1sums=('765fcafb4f6e70647853fc75355bb6a25861a1d3') +sha1sums=('999b96a022e47766fcddf6632c2f18100411fb40') build() { Fcd From crazy at frugalware.org Sun Jun 15 16:14:16 2008 From: crazy at frugalware.org (crazy) Date: Sun Jun 15 16:14:18 2008 Subject: [Frugalware-git] frugalware-current: sourceforge.sh Message-ID: <20080615141416.7418E1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=43c2c520f222e3fa9df9263187bedf09fa2c657f commit 43c2c520f222e3fa9df9263187bedf09fa2c657f Author: crazy Date: Sun Jun 15 16:13:21 2008 +0200 sourceforge.sh * I said I was to tired but still pushed that stuff =) * fix breakage introduced by 487fbc4 , -z check is buggy since always true * compare to $pkgver to see if we use a custom _F_sourceforge_pkgver or not diff --git a/source/include/sourceforge.sh b/source/include/sourceforge.sh index ea8119f..8de616f 100644 --- a/source/include/sourceforge.sh +++ b/source/include/sourceforge.sh @@ -97,7 +97,7 @@ else fi ## we have now regular $pkgver so use s/_/-/ but in case we have a custom _F_sourceforge_pkgver ## which is for 'source only' we don't need that since $pkgver is right already -if [ -z $_F_sourceforge_pkgver ]; then +if [ "$_F_sourceforge_pkgver" == "$pkgver" ]; then source=(http://${_F_sourceforge_mirror}.dl.sourceforge.net/sourceforge/${_F_sourceforge_dirname}/${_F_sourceforge_name}${_F_sourceforge_sep}${_F_sourceforge_pkgver//_/-}${_F_sourceforge_ext}) else source=(http://${_F_sourceforge_mirror}.dl.sourceforge.net/sourceforge/${_F_sourceforge_dirname}/${_F_sourceforge_name}${_F_sourceforge_sep}${_F_sourceforge_pkgver}${_F_sourceforge_ext}) From vmiklos at frugalware.org Sun Jun 15 20:40:29 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 15 20:40:31 2008 Subject: [Frugalware-git] frugalware-current: ultrastar-ng-0.2.1-1-i686 Message-ID: <20080615184029.68D871788036@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a1564a247898d42bf23e14eb3c4f056fd5ce2f86 commit a1564a247898d42bf23e14eb3c4f056fd5ce2f86 Author: Miklos Vajna Date: Sun Jun 15 20:40:16 2008 +0200 ultrastar-ng-0.2.1-1-i686 - version bump diff --git a/source/games-extra/ultrastar-ng/FrugalBuild b/source/games-extra/ultrastar-ng/FrugalBuild index c089c6d..0a10e18 100644 --- a/source/games-extra/ultrastar-ng/FrugalBuild +++ b/source/games-extra/ultrastar-ng/FrugalBuild @@ -3,17 +3,27 @@ # Contributor: devil505 pkgname=ultrastar-ng -pkgver=0.1.4 -pkgrel=2 +pkgver=0.2.1 +pkgrel=1 pkgdesc="UltraStar-ng : The free Linux karaoke game" _F_sourceforge_dirname="$pkgname" _F_sourceforge_name="UltraStar-ng" Finclude sourceforge -depends=('fftw' 'smpeg' 'librsvg' 'xine-lib' 'sdl_gfx>=2.0.16' 'sdlimage' 'libgcc' 'sdl' 'gstreamer' 'alsa-lib') +depends=('fftw' 'smpeg' 'librsvg' 'xine-lib' 'sdl_gfx>=2.0.16' \ + 'sdlimage' 'libgcc' 'sdl' 'gstreamer' 'alsa-lib' 'libboost-mt') +makedepends=('boost') groups=('games-extra') archs=('i686') _F_cd_path="UltraStar-ng-$pkgver" Fconfopts="${Fconfopts[@]} --with-video=xine" -sha1sums=('e0667ee1434fd0dd02620d484c3719d49a708b36') +sha1sums=('d0a2bfd8622825ea9f0f7694cdaf1d5f78c50dae') +build() +{ + Fsed '-lboost_thread' '-lboost_thread-mt' audio/Makefile.am + Fsed '-lboost_program_options' '-lboost_program_options-mt' src/Makefile.am + Fsed '-lboost_regex' '-lboost_regex-mt' src/Makefile.am + Fautoreconf + Fbuild +} # optimization OK From vmiklos at frugalware.org Sun Jun 15 20:40:29 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 15 20:40:33 2008 Subject: [Frugalware-git] frugalware-current: gcc-4.3.1-1-i686 Message-ID: <20080615184029.4402F1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=56348cd9d2778190cc9a70744d0af2793010ce8f commit 56348cd9d2778190cc9a70744d0af2793010ce8f Author: Miklos Vajna Date: Sun Jun 15 20:26:42 2008 +0200 gcc-4.3.1-1-i686 - add libgfortran to gcc-gfortran's depends diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index 4581700..56b2779 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -39,7 +39,7 @@ subdepends=('glibc' \ 'libgcc' \ "glibc mpfr" \ 'glibc' \ - "glibc mpfr" \ + "glibc mpfr libgfortran" \ 'libgcc zlib alsa-lib' \ 'libgcj libart_lgpl gtk+2 libxml2 freetype2 libice libxtst libxau libxdmcp libxdamage libstdc++' \ "libgcj zlib ecj mpfr" \ From vmiklos at frugalware.org Sun Jun 15 20:46:23 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jun 15 20:46:24 2008 Subject: [Frugalware-git] frugalware-current: icon-naming-utils-0.8.7-1-i686 Message-ID: <20080615184623.064681770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c52316a4b5892b4c4b50512bcbbaa216e62024d4 commit c52316a4b5892b4c4b50512bcbbaa216e62024d4 Author: Miklos Vajna Date: Sun Jun 15 20:46:13 2008 +0200 icon-naming-utils-0.8.7-1-i686 - version bump diff --git a/source/xapps/icon-naming-utils/FrugalBuild b/source/xapps/icon-naming-utils/FrugalBuild index cb553d3..4542624 100644 --- a/source/xapps/icon-naming-utils/FrugalBuild +++ b/source/xapps/icon-naming-utils/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=icon-naming-utils -pkgver=0.8.6 +pkgver=0.8.7 pkgrel=1 pkgdesc="Maps the new names of icons for Tango to the legacy names used by the GNOME and KDE desktops." url="http://tango.freedesktop.org/" @@ -10,5 +10,5 @@ depends=('perl-xml-simple') groups=('xapps') archs=('i686' 'x86_64') up2date="lynx -dump http://tango.freedesktop.org/releases/ | grep icon-naming-utils|Flasttar" -source=(http://tango-project.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('b5cbe5e8d468132da8d3a038c43086cdefd24756') +source=(http://tango.freedesktop.org/releases/icon-naming-utils-$pkgver.tar.gz) +sha1sums=('5dbdd875b091fddad073c81fd9d62db378beeafc') From devil505linux at gmail.com Sun Jun 15 21:09:31 2008 From: devil505linux at gmail.com (Devil505) Date: Sun Jun 15 21:09:33 2008 Subject: [Frugalware-git] frugalware-current: playonlinux-3.0.3-1-i686 Message-ID: <20080615190931.D4E9F1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a98dda16ca4cf5d9d04f75d100f52750489152bb commit a98dda16ca4cf5d9d04f75d100f52750489152bb Author: Devil505 Date: Sun Jun 15 21:04:21 2008 +0200 playonlinux-3.0.3-1-i686 * version bump diff --git a/source/xapps-extra/playonlinux/FrugalBuild b/source/xapps-extra/playonlinux/FrugalBuild index 666c75d..2bc5f9c 100644 --- a/source/xapps-extra/playonlinux/FrugalBuild +++ b/source/xapps-extra/playonlinux/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=playonlinux -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1 pkgdesc="GUI for managing Windows and DOS programs under linux" url="http://www.playonlinux.com" @@ -15,7 +15,7 @@ Fpkgversep="_" _F_cd_path="$pkgname" up2date="lynx -dump $url/en/download-generic.html | Flasttar" source=(http://www.playonlinux.com/script_files/$_F_archive_name/$pkgver/PlayOnLinux_$pkgver.tar.gz) -sha1sums=('98b304436ad3bbb56a04f6c815c5c8f790859318') +sha1sums=('9222db93bcfbf8405d5f42006a4bb75ecf2e19c0') build() { From bouleetbil at frogdev.info Sun Jun 15 23:15:34 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jun 15 23:15:36 2008 Subject: [Frugalware-git] frugalware-current: laf-widget-3.4-1-i686 Message-ID: <20080615211534.4256F1788036@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=638875fa66d08dc19dd5681ee5b6852b73c4eca6 commit 638875fa66d08dc19dd5681ee5b6852b73c4eca6 Author: bouleetbil Date: Sun Jun 15 23:04:09 2008 +0200 laf-widget-3.4-1-i686 *new package diff --git a/source/devel-extra/laf-widget/FrugalBuild b/source/devel-extra/laf-widget/FrugalBuild new file mode 100644 index 0000000..53c16fc --- /dev/null +++ b/source/devel-extra/laf-widget/FrugalBuild @@ -0,0 +1,28 @@ +# Compiling Time: 0.08 SBU +# Maintainer: bouleetbil + +pkgname=laf-widget +pkgver=3.4 +pkgrel=1 +pkgdesc="Support for common feel widgets in look-and-feel libraries" +Finclude java +depends=(${depends[@]} 'j2re') +makedepends=(${makedepends[@]} 'j2sdk') +groups=('devel-extra') +archs=('i686') +url="http://laf-widget.dev.java.net/" +up2date="elinks -dump $url | grep 'Release candidate for version'| tr -s ' ' | cut -d ' ' -f6" +source=(https://$pkgname.dev.java.net/files/documents/5097/89670/$pkgname-all.zip) +sha1sums=('7b2b3b36decac4dc9e24be3657a6494559f1c9d1') +_F_cd_path="./" + +build() { + Fcd + Fjavacleanup + #For use Java sun (don't build and don't work without) + export JAVA_HOME=/usr/lib/java + antflags="-Djdk.home.java_version_1.5.0=/usr/lib/java" + Fant ${antflags} + #install + Fjar drop/$pkgname.jar +} From janny at frugalware.org Sun Jun 15 23:34:36 2008 From: janny at frugalware.org (Janos Kovacs) Date: Sun Jun 15 23:34:37 2008 Subject: [Frugalware-git] frugalware-current: postgresql-8.2.9-1-i686 Message-ID: <20080615213436.38AC31770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a71a4edec02aa3f530968be6774605fe1dc5bbf2 commit a71a4edec02aa3f530968be6774605fe1dc5bbf2 Author: Janos Kovacs Date: Sun Jun 15 23:33:02 2008 +0200 postgresql-8.2.9-1-i686 * version bump diff --git a/source/apps-extra/postgresql/FrugalBuild b/source/apps-extra/postgresql/FrugalBuild index cf3fbca..76cbac4 100644 --- a/source/apps-extra/postgresql/FrugalBuild +++ b/source/apps-extra/postgresql/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=postgresql -pkgver=8.2.6 +pkgver=8.2.9 pkgrel=1 pkgdesc="An advanced Object-Relational database management system (DBMS)" url="http://www.postgresql.org/" @@ -66,6 +66,6 @@ build() Fsplit $pkgname-tcl usr/lib/$pkgname/pltcl.so } -sha1sums=('8934dfbd4c1d8c4f2945cb80f02072611681f967' \ +sha1sums=('aeaf0487d031c56518af002f76f779c23baf6391' \ 'faa7229726d07a3af32cff8abf8bbb9b46900763') # optimization OK From vmiklos at frugalware.org Mon Jun 16 00:58:16 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 00:58:19 2008 Subject: [Frugalware-git] pacman-tools: dg push: remove "Everything up-to-date" after an avarage push Message-ID: <20080615225816.DF05E1770022@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=c92508df10d8b2eac8554a19e1c9edf44716708f commit c92508df10d8b2eac8554a19e1c9edf44716708f Author: Miklos Vajna Date: Mon Jun 16 00:57:37 2008 +0200 dg push: remove "Everything up-to-date" after an avarage push that message is there because there are no tags to push, but it's just spam. now we do a --dry-run, and we don't print anything if nothing to do diff --git a/darcs-git.py b/darcs-git.py index e7e120c..09a2206 100755 --- a/darcs-git.py +++ b/darcs-git.py @@ -630,7 +630,11 @@ Options: ret = os.system("git push %s" % options.gitopts) if ret: return(1) - os.system("git push --tags %s" % options.gitopts) + sock = os.popen("git push --tags --dry-run 2>&1") + buf = sock.read() + sock.close() + if buf.strip() != "Everything up-to-date": + os.system("git push --tags %s" % options.gitopts) else: os.system("git svn dcommit") return(0) From vmiklos at frugalware.org Mon Jun 16 04:23:54 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 04:23:56 2008 Subject: [Frugalware-git] pacman-tools: add github repoman mirrors Message-ID: <20080616022354.C9AA311901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=5c0d1bd9bdfc1693f27f9b8d9f89fbd441297a6f commit 5c0d1bd9bdfc1693f27f9b8d9f89fbd441297a6f Author: Miklos Vajna Date: Mon Jun 16 04:23:52 2008 +0200 add github repoman mirrors diff --git a/repoman.d/current b/repoman.d/current index f24a217..672100d 100644 --- a/repoman.d/current +++ b/repoman.d/current @@ -6,6 +6,7 @@ repos=(${repos[@]} 'current') current_servers=( "git://repo.or.cz/frugalware-current.git" +"git://github.com/frugalware/frugalware-current.git" "git://git.frugalware.org/pub/frugalware/frugalware-current" ) diff --git a/repoman.d/stable b/repoman.d/stable index 1e55cc8..669acc0 100644 --- a/repoman.d/stable +++ b/repoman.d/stable @@ -6,6 +6,7 @@ repos=(${repos[@]} 'stable') stable_servers=( "git://repo.or.cz/frugalware-stable.git" +"git://github.com/frugalware/frugalware-stable.git" "git://git.frugalware.org/pub/frugalware/frugalware-stable" ) From janny at frugalware.org Mon Jun 16 09:51:57 2008 From: janny at frugalware.org (Janos Kovacs) Date: Mon Jun 16 09:51:58 2008 Subject: [Frugalware-git] frugalware-current: phppgadmin-4.2-1-i686 Message-ID: <20080616075157.812AF11901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dfc96de7e287eb22f8ec0d37281314c81f2c225f commit dfc96de7e287eb22f8ec0d37281314c81f2c225f Author: Janos Kovacs Date: Mon Jun 16 09:51:19 2008 +0200 phppgadmin-4.2-1-i686 * new package diff --git a/source/network-extra/phppgadmin/FrugalBuild b/source/network-extra/phppgadmin/FrugalBuild new file mode 100644 index 0000000..2c31230 --- /dev/null +++ b/source/network-extra/phppgadmin/FrugalBuild @@ -0,0 +1,23 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Janos Kovacs + +pkgname=phppgadmin +pkgver=4.2 +pkgrel=1 +pkgdesc="Set of PHP-scripts to administrate PostgreSQL over the WWW." +_F_sourceforge_name="phpPgAdmin" +Finclude sourceforge +rodepends=('php') +backup=(var/www/html/phppgadmin/conf/config.inc.php) +groups=('network-extra') +archs=('i686' 'x86_64') +sha1sums=('6476c3ff74c228a6ca4da2e605515b45ecf0df27') + +build() +{ + Fcd ${_F_sourceforge_name}-${pkgver} + Fmkdir /var/www/html/${pkgname}-${pkgver} + Fcpr ${_F_sourceforge_name}-${pkgver}/* var/www/html/${pkgname}-${pkgver} + Fln ${pkgname}-${pkgver} /var/www/html/${pkgname} +} + From bouleetbil at frogdev.info Mon Jun 16 11:55:27 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jun 16 11:55:29 2008 Subject: [Frugalware-git] frugalware-current: babl-0.0.22-1-i686 Message-ID: <20080616095527.50EE011901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ce9571ad4de3e2c2368334e088d3d8fc3bd0161d commit ce9571ad4de3e2c2368334e088d3d8fc3bd0161d Author: bouleetbil Date: Mon Jun 16 11:47:25 2008 +0200 babl-0.0.22-1-i686 *version bump diff --git a/source/lib-extra/babl/FrugalBuild b/source/lib-extra/babl/FrugalBuild index 3afda0b..1066af5 100644 --- a/source/lib-extra/babl/FrugalBuild +++ b/source/lib-extra/babl/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=babl -pkgver=0.0.20 +pkgver=0.0.22 pkgrel=1 pkgdesc="Babl is a dynamic, any to any, pixel format conversion library." archs=('i686' 'x86_64') @@ -13,6 +13,6 @@ options=('scriptlet') urldl="ftp://ftp.gtk.org/pub/$pkgname/0.0" up2date="lynx -dump $urldl | Flasttarbz2" source=($urldl/$pkgname-$pkgver.tar.bz2) -sha1sums=('ac3ac25c3d77bc1c812b64e843cac74287a50688') +sha1sums=('9de50fb5833f41691f50f6e735d6422aad52ea94') # optimization OK From bouleetbil at frogdev.info Mon Jun 16 12:09:36 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jun 16 12:09:38 2008 Subject: [Frugalware-git] frugalware-current: gegl-0.0.18-1-i686 Message-ID: <20080616100936.5614E11901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=966edd148e6cdb2591359b56a3397217484326b6 commit 966edd148e6cdb2591359b56a3397217484326b6 Author: bouleetbil Date: Mon Jun 16 12:03:20 2008 +0200 gegl-0.0.18-1-i686 *version bump diff --git a/source/xlib-extra/gegl/FrugalBuild b/source/xlib-extra/gegl/FrugalBuild index cca1074..5f25e40 100644 --- a/source/xlib-extra/gegl/FrugalBuild +++ b/source/xlib-extra/gegl/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=gegl -pkgver=0.0.16 +pkgver=0.0.18 pkgrel=1 pkgdesc="GEGL is a graph based image processing framework." url="http://www.gegl.org/" @@ -14,6 +14,6 @@ options=('scriptlet') urldl="ftp://ftp.gimp.org/pub/$pkgname/0.0" up2date="lynx -dump $urldl | Flasttarbz2" source=($urldl/$pkgname-$pkgver.tar.bz2) -sha1sums=('de262a29fc3c6c5fc1a436828044cf22756fb54b') +sha1sums=('f8113ad33161337eb107ad84c0ac968dca1d02d2') # optimization OK From iron at frugalware.org Mon Jun 16 12:53:31 2008 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Jun 16 12:53:33 2008 Subject: [Frugalware-git] homepage-ng: added 0.8 news id to roadmap.xml Message-ID: <20080616105331.0BA4A11901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=f5c2e03eb37251aa21e0cc91f067e9eb58611f53 commit f5c2e03eb37251aa21e0cc91f067e9eb58611f53 Author: Krisztian VASAS Date: Mon Jun 16 12:53:26 2008 +0200 added 0.8 news id to roadmap.xml diff --git a/frugalware/xml/roadmap.xml b/frugalware/xml/roadmap.xml index 37141fd..ecca028 100644 --- a/frugalware/xml/roadmap.xml +++ b/frugalware/xml/roadmap.xml @@ -54,7 +54,7 @@ 0.8 Mar 11, 2008 1 - + 91 rc2 Feb 17, 2008 From vmiklos at frugalware.org Mon Jun 16 12:57:54 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 12:57:55 2008 Subject: [Frugalware-git] pacman-g2: libpacman: log warnings in the logfile Message-ID: <20080616105754.2D63D11901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=50601758953450cdc4a349b1b19f0629e6fc29e1 commit 50601758953450cdc4a349b1b19f0629e6fc29e1 Author: Miklos Vajna Date: Mon Jun 16 12:56:47 2008 +0200 libpacman: log warnings in the logfile this allows us to track failed downloads when there are lot of targets, for example. say there are 100 targets and the first one fails, then the user may or may not page up to see what the problem was but we can check the log file anytime later. diff --git a/lib/libpacman/log.c b/lib/libpacman/log.c index a3867d3..865fc75 100644 --- a/lib/libpacman/log.c +++ b/lib/libpacman/log.c @@ -46,6 +46,7 @@ void _pacman_log(unsigned char flag, char *fmt, ...) va_end(args); pm_logcb(flag, str); + pacman_logaction(str); } } diff --git a/lib/libpacman/util.c b/lib/libpacman/util.c index 0dd9b05..90637fa 100644 --- a/lib/libpacman/util.c +++ b/lib/libpacman/util.c @@ -363,7 +363,7 @@ int _pacman_logaction(unsigned char usesyslog, FILE *f, char *fmt, ...) fprintf(f, "[%02d/%02d/%02d %02d:%02d] %s\n", tm->tm_mon+1, tm->tm_mday, tm->tm_year-100, tm->tm_hour, tm->tm_min, - msg); + _pacman_strtrim(msg)); fflush(f); } From vmiklos at frugalware.org Mon Jun 16 13:06:54 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 13:06:55 2008 Subject: [Frugalware-git] frugalware-current: obexftp-0.22-1-i686 Message-ID: <20080616110654.CDAB311901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d7dda1db9af00cb10a71d0ec22e186bfd6ea40a4 commit d7dda1db9af00cb10a71d0ec22e186bfd6ea40a4 Author: Miklos Vajna Date: Mon Jun 16 13:06:22 2008 +0200 obexftp-0.22-1-i686 - version bump diff --git a/source/apps-extra/obexftp/FrugalBuild b/source/apps-extra/obexftp/FrugalBuild index e772c92..5d32edb 100644 --- a/source/apps-extra/obexftp/FrugalBuild +++ b/source/apps-extra/obexftp/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Szabo Peter Laszlo pkgname=obexftp -pkgver=0.20 -pkgrel=5 +pkgver=0.22 +pkgrel=1 pkgdesc="Free open source application for file copying over the Object Exchange (OBEX) protocol" depends=('openobex>=1.3-9') groups=('apps-extra') @@ -13,6 +13,6 @@ _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://openobex.triq.net/" up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=8960|grep -m1 'obexftp-\(.*\).tar.bz2'|sed 's/.*-\(.*\).t.*/\1/'" -sha1sums=('0b3a7d2aeb0dbd24d75761a7e59f42f46ea5ef82') +sha1sums=('8753ae1053653b01eb0deee3b7d31c02aca4974d') # optimization OK From vmiklos at frugalware.org Mon Jun 16 13:09:32 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 13:09:33 2008 Subject: [Frugalware-git] frugalware-current: obexfs-0.11-1-i686 Message-ID: <20080616110932.9861211901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0be2a72175d4eb758388808b2ca55a9cc4eafc32 commit 0be2a72175d4eb758388808b2ca55a9cc4eafc32 Author: Miklos Vajna Date: Mon Jun 16 13:09:10 2008 +0200 obexfs-0.11-1-i686 - version bump diff --git a/source/apps-extra/obexfs/FrugalBuild b/source/apps-extra/obexfs/FrugalBuild index b18b6c7..c8d76ed 100644 --- a/source/apps-extra/obexfs/FrugalBuild +++ b/source/apps-extra/obexfs/FrugalBuild @@ -2,16 +2,18 @@ # Maintainer: VMiklos pkgname=obexfs -pkgver=0.8 +pkgver=0.11 pkgrel=1 pkgdesc="FUSE based filesystem using ObexFTP." _F_sourceforge_dirname=openobex Finclude sourceforge url="http://dev.zuckschwerdt.org/openobex/wiki/ObexFs" -depends=('openobex' 'fuse' 'obexftp') +depends=('openobex' 'fuse' 'obexftp>=0.22') groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=8960&package_id=178407'|Flasttar" -sha1sums=('99c0c54212a2fc874107efbc9ad2ba7ad2b7ab37') +sha1sums=('ab12400dfbe9a9b118a0f3a57c742d5ea9ed4cb3') # testing: obexfs -b 00:1C:9A:E5:08:F8 -B 10 ~/mnt/phone + +# optimization OK From vmiklos at frugalware.org Mon Jun 16 13:15:42 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 13:15:42 2008 Subject: [Frugalware-git] frugalware-current: libotr-3.2.0-1-i686 Message-ID: <20080616111542.695EA11901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1e6e24c3f07cc7c8d4aff5b6f734f4735dc02912 commit 1e6e24c3f07cc7c8d4aff5b6f734f4735dc02912 Author: Miklos Vajna Date: Mon Jun 16 13:12:55 2008 +0200 libotr-3.2.0-1-i686 - version bump diff --git a/source/network-extra/libotr/FrugalBuild b/source/network-extra/libotr/FrugalBuild index 421376c..d6ef18c 100644 --- a/source/network-extra/libotr/FrugalBuild +++ b/source/network-extra/libotr/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=libotr -pkgver=3.1.0 +pkgver=3.2.0 pkgrel=1 pkgdesc="Off-the-Record (OTR) Messaging Library." url="http://www.cypherpunks.ca/otr/" From vmiklos at frugalware.org Mon Jun 16 13:59:31 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 13:59:33 2008 Subject: [Frugalware-git] frugalware-current: kernel-2.6.25-6-i686 Message-ID: <20080616115931.F003311901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=615a48c71dfa5a3d0d8cea3f2b4b8c525daca6b4 commit 615a48c71dfa5a3d0d8cea3f2b4b8c525daca6b4 Author: Miklos Vajna Date: Mon Jun 16 13:58:56 2008 +0200 kernel-2.6.25-6-i686 - bump to patchlevel '6' - closes #3140 diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index 87d8010..c0fa674 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -1,4 +1,4 @@ -# Compiling Time: 14.33 SBU +# Compiling Time: 8.92 SBU # Maintainer: VMiklos _F_kernel_patches=(iTCO_wdt_ICH9DO.patch) diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index 204ffdb..72c8f97 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -16,5 +16,5 @@ # * _F_kernelver_stable: the number of the -stable patch to use (if any) ### _F_kernelver_ver=2.6.25 -_F_kernelver_rel=5 -_F_kernelver_stable=4 +_F_kernelver_rel=6 +_F_kernelver_stable=6 From bouleetbil at frogdev.info Mon Jun 16 14:16:48 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jun 16 14:16:50 2008 Subject: [Frugalware-git] frugalware-current: sbackup-1.0-2-i686 Message-ID: <20080616121648.AE44411901DD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=144721034ebd94c231cb6d2dab5f8a00caf22413 commit 144721034ebd94c231cb6d2dab5f8a00caf22413 Author: bouleetbil Date: Mon Jun 16 14:01:36 2008 +0200 sbackup-1.0-2-i686 *fixed up2date diff --git a/source/xapps-extra/sbackup/FrugalBuild b/source/xapps-extra/sbackup/FrugalBuild index 4f94ab0..d35f260 100644 --- a/source/xapps-extra/sbackup/FrugalBuild +++ b/source/xapps-extra/sbackup/FrugalBuild @@ -11,7 +11,6 @@ makedepends=('gettext' 'intltool' 'gnome-doc-utils') options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') -_F_sourceforge_ext="-ppa1.tar.gz" _F_sourceforge_sep="_" _F_sourceforge_broken_up2date="1" Finclude sourceforge From vmiklos at frugalware.org Mon Jun 16 16:37:59 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 16:38:09 2008 Subject: [Frugalware-git] frugalware-current: kqemu-1.3.0pre11-32-i686 Message-ID: <20080616143759.1E8F611901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5e5f0809e7ccdd317ea416bf1c708e89f74aa02f commit 5e5f0809e7ccdd317ea416bf1c708e89f74aa02f Author: Miklos Vajna Date: Mon Jun 16 16:37:08 2008 +0200 kqemu-1.3.0pre11-32-i686 rebuilt with kernel-2.6.25-6 diff --git a/source/xapps-extra/kqemu/FrugalBuild b/source/xapps-extra/kqemu/FrugalBuild index 07dc607..58caae0 100644 --- a/source/xapps-extra/kqemu/FrugalBuild +++ b/source/xapps-extra/kqemu/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kqemu pkgver=1.3.0pre11 -pkgrel=31 +pkgrel=32 pkgdesc="QEMU Accelerator Module" url="http://bellard.org/qemu/" depends=('qemu') From vmiklos at frugalware.org Mon Jun 16 16:37:59 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 16:38:11 2008 Subject: [Frugalware-git] frugalware-current: acerhk-0.5.35-17-i686 Message-ID: <20080616143759.3B38417780AD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=01d2d0282979a466ad907e084574085aa46d4475 commit 01d2d0282979a466ad907e084574085aa46d4475 Author: Miklos Vajna Date: Mon Jun 16 16:37:08 2008 +0200 acerhk-0.5.35-17-i686 rebuilt with kernel-2.6.25-6 diff --git a/source/apps-extra/acerhk/FrugalBuild b/source/apps-extra/acerhk/FrugalBuild index 0d21b25..aefc218 100644 --- a/source/apps-extra/acerhk/FrugalBuild +++ b/source/apps-extra/acerhk/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acerhk pkgver=0.5.35 -pkgrel=16 +pkgrel=17 pkgdesc="Acer Hotkey driver for Linux" url="http://www.cakey.de/acerhk/" Finclude kernel-module From vmiklos at frugalware.org Mon Jun 16 16:37:59 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 16:38:14 2008 Subject: [Frugalware-git] frugalware-current: acx100-20080210-6-i686 Message-ID: <20080616143759.5040717780AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3d182ee358ac165123b577c10f05ce94b2f00317 commit 3d182ee358ac165123b577c10f05ce94b2f00317 Author: Miklos Vajna Date: Mon Jun 16 16:37:09 2008 +0200 acx100-20080210-6-i686 rebuilt with kernel-2.6.25-6 diff --git a/source/network-extra/acx100/FrugalBuild b/source/network-extra/acx100/FrugalBuild index a7f0679..93ebdcc 100644 --- a/source/network-extra/acx100/FrugalBuild +++ b/source/network-extra/acx100/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acx100 origname=acx-mac80211 pkgver=20080210 -pkgrel=5 +pkgrel=6 pkgdesc="The ACX100/ACX111 wireless network driver." _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname=${pkgname} From vmiklos at frugalware.org Mon Jun 16 16:37:59 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 16:38:16 2008 Subject: [Frugalware-git] frugalware-current: madwifi-0.9.4-10-i686 Message-ID: <20080616143759.7036F11901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a6f4363986dea00a31d7ec7101d50da3e52d8af3 commit a6f4363986dea00a31d7ec7101d50da3e52d8af3 Author: Miklos Vajna Date: Mon Jun 16 16:37:09 2008 +0200 madwifi-0.9.4-10-i686 rebuilt with kernel-2.6.25-6 diff --git a/source/network/madwifi/FrugalBuild b/source/network/madwifi/FrugalBuild index 85cee4f..bd0d134 100644 --- a/source/network/madwifi/FrugalBuild +++ b/source/network/madwifi/FrugalBuild @@ -3,7 +3,7 @@ pkgname=madwifi pkgver=0.9.4 -pkgrel=9 +pkgrel=10 pkgdesc="Madwifi drivers for Atheros wireless chipsets" Finclude kernel-module depends=(${depends[@]} 'wireless_tools') From vmiklos at frugalware.org Mon Jun 16 16:37:59 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 16:38:19 2008 Subject: [Frugalware-git] frugalware-current: gspcav1-1.00.20-14-i686 Message-ID: <20080616143759.7EE7D17780AF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9e9e759c8d20f553a92c3d815ebb9fe122699cec commit 9e9e759c8d20f553a92c3d815ebb9fe122699cec Author: Miklos Vajna Date: Mon Jun 16 16:37:10 2008 +0200 gspcav1-1.00.20-14-i686 rebuilt with kernel-2.6.25-6 diff --git a/source/multimedia-extra/gspcav1/FrugalBuild b/source/multimedia-extra/gspcav1/FrugalBuild index 4c255aa..e70620f 100644 --- a/source/multimedia-extra/gspcav1/FrugalBuild +++ b/source/multimedia-extra/gspcav1/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gspcav1 pkgver=1.00.20 -pkgrel=13 +pkgrel=14 pkgdate=20071224 pkgdesc="One driver Upto 220 Webcams supported" url="http://mxhaard.free.fr" From vmiklos at frugalware.org Mon Jun 16 16:37:59 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 16:38:20 2008 Subject: [Frugalware-git] frugalware-current: qc-usb-0.6.6-39-i686 Message-ID: <20080616143759.9528E17780AD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e7e4fcc4c6e23670eb2a626cbd9ab1dd83f06063 commit e7e4fcc4c6e23670eb2a626cbd9ab1dd83f06063 Author: Miklos Vajna Date: Mon Jun 16 16:37:10 2008 +0200 qc-usb-0.6.6-39-i686 rebuilt with kernel-2.6.25-6 diff --git a/source/multimedia-extra/qc-usb/FrugalBuild b/source/multimedia-extra/qc-usb/FrugalBuild index 49cacf7..7e03bfd 100644 --- a/source/multimedia-extra/qc-usb/FrugalBuild +++ b/source/multimedia-extra/qc-usb/FrugalBuild @@ -3,7 +3,7 @@ pkgname=qc-usb pkgver=0.6.6 -pkgrel=38 +pkgrel=39 pkgdesc="Quickcam kernel driver." groups=('multimedia-extra') archs=('i686' 'x86_64') From vmiklos at frugalware.org Mon Jun 16 16:37:59 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 16:38:22 2008 Subject: [Frugalware-git] frugalware-current: lirc-0.8.3-3-i686 Message-ID: <20080616143759.B569117780B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6d555d3fea70e9bd4858cba3ed238b3895966b00 commit 6d555d3fea70e9bd4858cba3ed238b3895966b00 Author: Miklos Vajna Date: Mon Jun 16 16:37:11 2008 +0200 lirc-0.8.3-3-i686 rebuilt with kernel-2.6.25-6 diff --git a/source/apps-extra/lirc/FrugalBuild b/source/apps-extra/lirc/FrugalBuild index 2f3d938..3ea5cce 100644 --- a/source/apps-extra/lirc/FrugalBuild +++ b/source/apps-extra/lirc/FrugalBuild @@ -3,7 +3,7 @@ pkgname=lirc pkgver=0.8.3 -pkgrel=2 +pkgrel=3 pkgdesc="LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls." url="http://www.lirc.org/" Finclude kernel-module sourceforge From vmiklos at frugalware.org Mon Jun 16 16:37:59 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 16:38:23 2008 Subject: [Frugalware-git] frugalware-current: wlan-ng-0.2.9-2-i686 Message-ID: <20080616143759.A6B5717780B0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5cdf1dcbb208e08b8d74e63d546e6ec1c7153f39 commit 5cdf1dcbb208e08b8d74e63d546e6ec1c7153f39 Author: Miklos Vajna Date: Mon Jun 16 16:37:10 2008 +0200 wlan-ng-0.2.9-2-i686 rebuilt with kernel-2.6.25-6 diff --git a/source/network-extra/wlan-ng/FrugalBuild b/source/network-extra/wlan-ng/FrugalBuild index f51e9ab..988237c 100644 --- a/source/network-extra/wlan-ng/FrugalBuild +++ b/source/network-extra/wlan-ng/FrugalBuild @@ -3,7 +3,7 @@ pkgname=wlan-ng pkgver=0.2.9 -pkgrel=1 +pkgrel=2 pkgdesc="Wireless Lan modules" url="http://www.linux-wlan.org/" Finclude kernel-module From vmiklos at frugalware.org Mon Jun 16 16:37:59 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 16:38:24 2008 Subject: [Frugalware-git] frugalware-current: ndiswrapper-1.53-2-i686 Message-ID: <20080616143759.C4FC917780AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0a726c23373868547d2450d70053af87abc2993c commit 0a726c23373868547d2450d70053af87abc2993c Author: Miklos Vajna Date: Mon Jun 16 16:37:11 2008 +0200 ndiswrapper-1.53-2-i686 rebuilt with kernel-2.6.25-6 diff --git a/source/network-extra/ndiswrapper/FrugalBuild b/source/network-extra/ndiswrapper/FrugalBuild index 550bec2..af70553 100644 --- a/source/network-extra/ndiswrapper/FrugalBuild +++ b/source/network-extra/ndiswrapper/FrugalBuild @@ -4,7 +4,7 @@ pkgname=ndiswrapper pkgver=1.53 -pkgrel=1 +pkgrel=2 pkgdesc="Wrapper for using Windows drivers for some wireless cards" _F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module sourceforge From vmiklos at frugalware.org Mon Jun 16 16:37:59 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 16:38:25 2008 Subject: [Frugalware-git] frugalware-current: r8169-6.006.00-5-i686 Message-ID: <20080616143759.E17C011901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a82eaa4ca90d65b2e6227c86f4ecc4337693014c commit a82eaa4ca90d65b2e6227c86f4ecc4337693014c Author: Miklos Vajna Date: Mon Jun 16 16:37:12 2008 +0200 r8169-6.006.00-5-i686 rebuilt with kernel-2.6.25-6 diff --git a/source/network-extra/r8169/FrugalBuild b/source/network-extra/r8169/FrugalBuild index a0cceca..7ce8db8 100644 --- a/source/network-extra/r8169/FrugalBuild +++ b/source/network-extra/r8169/FrugalBuild @@ -3,7 +3,7 @@ pkgname=r8169 pkgver=6.006.00 -pkgrel=4 +pkgrel=5 Finclude sourceforge kernel-module pkgdesc="Realtek driver for RTL8169/8110 cards." url="http://www.realtek.com.tw" From vmiklos at frugalware.org Mon Jun 16 16:38:00 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 16:38:26 2008 Subject: [Frugalware-git] frugalware-current: virtualbox-1.6.2-3-i686 Message-ID: <20080616143800.0E73911901F0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c00a33eb017b3ca65e374a7da3787351df1fc464 commit c00a33eb017b3ca65e374a7da3787351df1fc464 Author: Miklos Vajna Date: Mon Jun 16 16:37:12 2008 +0200 virtualbox-1.6.2-3-i686 rebuilt with kernel-2.6.25-6 diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index 9bc27d9..894aa69 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -5,7 +5,7 @@ pkgname=virtualbox realname=VirtualBox pkgver=1.6.2 -pkgrel=2 +pkgrel=3 pkgdesc="InnoTek VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use." url="http://www.virtualbox.org" Finclude kernel-module From vmiklos at frugalware.org Mon Jun 16 16:38:00 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 16:38:27 2008 Subject: [Frugalware-git] frugalware-current: nvidia-173.14.05-3-i686 Message-ID: <20080616143800.22B8817780AD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ea3d123fb6963afd9cbded8135b56cf3aacf93cc commit ea3d123fb6963afd9cbded8135b56cf3aacf93cc Author: Miklos Vajna Date: Mon Jun 16 16:37:13 2008 +0200 nvidia-173.14.05-3-i686 rebuilt with kernel-2.6.25-6 diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild index 438a77a..7f594ac 100644 --- a/source/x11-extra/nvidia/FrugalBuild +++ b/source/x11-extra/nvidia/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia pkgver=173.14.05 -pkgrel=2 +pkgrel=3 pkgdesc="3D accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx') From vmiklos at frugalware.org Mon Jun 16 16:38:00 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 16:38:28 2008 Subject: [Frugalware-git] frugalware-current: fglrx-8.493-4-i686 Message-ID: <20080616143800.49A0F17780B2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bab2fedf9a9e48e1ce4021bbd4ad683278637a3f commit bab2fedf9a9e48e1ce4021bbd4ad683278637a3f Author: Miklos Vajna Date: Mon Jun 16 16:37:14 2008 +0200 fglrx-8.493-4-i686 rebuilt with kernel-2.6.25-6 diff --git a/source/x11-extra/fglrx/FrugalBuild b/source/x11-extra/fglrx/FrugalBuild index afe3652..3720dfe 100644 --- a/source/x11-extra/fglrx/FrugalBuild +++ b/source/x11-extra/fglrx/FrugalBuild @@ -5,7 +5,7 @@ pkgname=fglrx pkgver=8.493 _shortver=8-5 -pkgrel=3 +pkgrel=4 pkgdesc="Hardware Accelerated ATi driver for xorg" url="http://www.ati.com/" # libstdc++5: no hardware acceleration without it From vmiklos at frugalware.org Mon Jun 16 16:38:00 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 16:38:29 2008 Subject: [Frugalware-git] frugalware-current: nvidia-96xx-96.43.05-12-i686 Message-ID: <20080616143800.31E4717780AF@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d17657cd1f99c2068d1c35ae4a8e8805f170669b commit d17657cd1f99c2068d1c35ae4a8e8805f170669b Author: Miklos Vajna Date: Mon Jun 16 16:37:13 2008 +0200 nvidia-96xx-96.43.05-12-i686 rebuilt with kernel-2.6.25-6 diff --git a/source/x11-extra/nvidia-96xx/FrugalBuild b/source/x11-extra/nvidia-96xx/FrugalBuild index c28da27..aaaa2d7 100644 --- a/source/x11-extra/nvidia-96xx/FrugalBuild +++ b/source/x11-extra/nvidia-96xx/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia-96xx pkgver=96.43.05 -pkgrel=11 +pkgrel=12 pkgdesc="3d accelerated display driver for Nvidia cards" url="http://www.nvidia.com/object/linux_display_archive.html" conflicts=('libgl' 'libglx' 'nvidia') From vmiklos at frugalware.org Mon Jun 16 16:38:00 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 16:38:30 2008 Subject: [Frugalware-git] frugalware-current: redirfs-0.2-11-i686 Message-ID: <20080616143800.6EFC917780B1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0e1d747c70845053b56d27f8c2f18331383c8ffa commit 0e1d747c70845053b56d27f8c2f18331383c8ffa Author: Miklos Vajna Date: Mon Jun 16 16:37:14 2008 +0200 redirfs-0.2-11-i686 rebuilt with kernel-2.6.25-6 diff --git a/source/apps-extra/redirfs/FrugalBuild b/source/apps-extra/redirfs/FrugalBuild index 00f7212..6fe3ae1 100644 --- a/source/apps-extra/redirfs/FrugalBuild +++ b/source/apps-extra/redirfs/FrugalBuild @@ -3,7 +3,7 @@ pkgname=redirfs pkgver=0.2 -pkgrel=10 +pkgrel=11 pkgdesc="Redirecting FileSystem" url="http://www.redirfs.org/tiki-index.php" _F_kernelmod_scriptlet=$pkgname.install From vmiklos at frugalware.org Mon Jun 16 16:38:00 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 16:38:31 2008 Subject: [Frugalware-git] frugalware-current: dazuko-2.3.4-18-i686 Message-ID: <20080616143800.8839417780B0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ecca77ab3ae7b269341e1c72a0c558d9e7e50582 commit ecca77ab3ae7b269341e1c72a0c558d9e7e50582 Author: Miklos Vajna Date: Mon Jun 16 16:37:14 2008 +0200 dazuko-2.3.4-18-i686 rebuilt with kernel-2.6.25-6 diff --git a/source/apps-extra/dazuko/FrugalBuild b/source/apps-extra/dazuko/FrugalBuild index 49c1289..9a81439 100644 --- a/source/apps-extra/dazuko/FrugalBuild +++ b/source/apps-extra/dazuko/FrugalBuild @@ -4,7 +4,7 @@ pkgname=dazuko pkgver=2.3.4 redirver=0.2 -pkgrel=17 +pkgrel=18 pkgdesc="On-access virus scanning kernel interface" url="http://www.dazuko.org" license="GPL-2 BSD" From vmiklos at frugalware.org Mon Jun 16 16:38:00 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jun 16 16:38:32 2008 Subject: [Frugalware-git] frugalware-current: atl2-2.0.4-8-i686 Message-ID: <20080616143800.B858A17780AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=79e9d593f5fe2e776bd811c03e5e07250777c47e commit 79e9d593f5fe2e776bd811c03e5e07250777c47e Author: Miklos Vajna Date: Mon Jun 16 16:37:15 2008 +0200 atl2-2.0.4-8-i686 rebuilt with kernel-2.6.25-6 diff --git a/source/network-extra/atl2/FrugalBuild b/source/network-extra/atl2/FrugalBuild index f342b10..7161bc0 100644 --- a/source/network-extra/atl2/FrugalBuild +++ b/source/network-extra/atl2/FrugalBuild @@ -3,7 +3,7 @@ pkgname=atl2 pkgver=2.0.4 -pkgrel=7 +pkgrel=8 pkgdesc="Driver for the Attansic/Atheros L2 Fast Ethernet Adapter" url="http://people.redhat.com/csnook/${pkgname}" license="GPL" From priyank at frugalware.org Mon Jun 16 18:34:51 2008 From: priyank at frugalware.org (Priyank) Date: Mon Jun 16 18:34:53 2008 Subject: [Frugalware-git] frugalware-current: brasero-0.7.90-1-i686 Message-ID: <20080616163451.B4DB711901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=73350e5780b2a78c90c88b4b4f0cf333d0c4b896 commit 73350e5780b2a78c90c88b4b4f0cf333d0c4b896 Author: Priyank Date: Mon Jun 16 22:02:05 2008 +0530 brasero-0.7.90-1-i686 * Version bump diff --git a/source/gnome-extra/brasero/FrugalBuild b/source/gnome-extra/brasero/FrugalBuild index 5a27eed..396d607 100644 --- a/source/gnome-extra/brasero/FrugalBuild +++ b/source/gnome-extra/brasero/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Priyank Gosalia pkgname=brasero -pkgver=0.7.1 -pkgrel=4 +pkgver=0.7.90 +pkgrel=1 pkgdesc="A CD/DVD Burning application for the GNOME desktop." url="http://www.gnome.org/projects/brasero/" -makedepends=('intltool') +makedepends=('intltool' 'gnome-doc-utils') depends=('gnome-vfs>=2.22.0' 'libgnome>=2.22.0' 'libgnomeui>=2.22.1' 'cdrtools' 'dvd+rw-tools' \ 'nautilus-cd-burner>=2.22.1' 'gstreamer' 'gst-plugins-base' 'gst-plugins-good' \ 'hal' 'libxml2' 'totem>=2.22.1' 'perl-xml-parser' 'libnotify' 'dbus-glib>=0.71-2' \ @@ -22,7 +22,7 @@ _F_gnome_iconcache="y" _F_gnome_devel="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-search --enable-playlist --enable-preview --enable-inotify --enable-libnotify --disable-schemas-install --enable-caches=no" -sha1sums=('e1533547eb4f8ce4f0df2447ada99bab7c9ec7f7') +sha1sums=('18db56ca467872cb89862948d028b252a304bdca') # optimization OK From devil505linux at gmail.com Mon Jun 16 18:40:54 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 16 18:40:56 2008 Subject: [Frugalware-git] frugalware-current: dclib-0.3.16-1-i686 Message-ID: <20080616164054.39D9511901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6b42c0f18f295996affe20075f1c4bdc4ba6d15b commit 6b42c0f18f295996affe20075f1c4bdc4ba6d15b Author: Devil505 Date: Mon Jun 16 18:36:23 2008 +0200 dclib-0.3.16-1-i686 * version bump diff --git a/source/xlib-extra/dclib/FrugalBuild b/source/xlib-extra/dclib/FrugalBuild index 7d4416f..c5e778f 100644 --- a/source/xlib-extra/dclib/FrugalBuild +++ b/source/xlib-extra/dclib/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=dclib -pkgver=0.3.14a +pkgver=0.3.16 pkgrel=1 pkgdesc="Libraries for the Direct Connect 4 Linux (valknut) File Sharing program." depends=('libxml2' 'openssl' 'bzip2' 'libstdc++') @@ -12,5 +12,5 @@ _F_sourceforge_broken_up2date="1" Finclude sourceforge groups=('xlib-extra') archs=('i686' 'x86_64') -sha1sums=('0914733117df43f22609965c62d6d559ca97011c') +sha1sums=('ee88a8b6907d017a5dbf39afb2b17a4ada225744') # optimization OK From priyank at frugalware.org Mon Jun 16 18:52:06 2008 From: priyank at frugalware.org (Priyank) Date: Mon Jun 16 18:52:08 2008 Subject: [Frugalware-git] frugalware-current: bluez-utils-3.32-2-i686 Message-ID: <20080616165206.D797A11901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=65aef258741d4a6b4e40750ecc2670505fb87cab commit 65aef258741d4a6b4e40750ecc2670505fb87cab Author: Priyank Date: Mon Jun 16 22:19:54 2008 +0530 bluez-utils-3.32-2-i686 * Removed deprecated configure options * Disabled SDPD by default. SDPD is no longer provided with this package. diff --git a/source/apps-extra/bluez-utils/FrugalBuild b/source/apps-extra/bluez-utils/FrugalBuild index 08ba8d1..7b743d9 100644 --- a/source/apps-extra/bluez-utils/FrugalBuild +++ b/source/apps-extra/bluez-utils/FrugalBuild @@ -3,7 +3,7 @@ pkgname=bluez-utils pkgver=3.32 -pkgrel=1 +pkgrel=2 pkgdesc="Bluetooth tools and daemons" url="http://bluez.sourceforge.net/" depends=('dbus-glib>=0.71' 'hal' 'alsa-lib' 'openobex>=1.3-10' 'bluez-libs>=3.28') @@ -14,24 +14,24 @@ backup=(etc/sysconfig/bluetooth etc/bluetooth/hcid.conf etc/bluetooth/rfcomm.con up2date="lynx -dump http://www.bluez.org/download.html|grep bluez-utils-|sed -n 's/.*bluez-utils-\(.*\)\.t.*/\1/; 1 p'" source=("http://bluez.sourceforge.net/download/bluez-utils-$pkgver.tar.gz" rc.bluetooth uart.conf bluetooth.default) sha1sums=('ce69ccfdc97618f79f621ab8a4cb176c7f6bb907' \ - '831cbfe1e96fc72ca71e9ec5b2b0209512f90ccc' \ + 'e5323ae9a3bdfed6dac4e323dacaf1edc70171e6' \ '706231256b0ef53e20f22b4f163e8008f092d28a' \ - 'cc763966542a83f0de4c56268c541a7b43aa2182') + '8a62cf9a7c10a4fee59acbab8e85f0a1058e4772') build() { Frcd bluetooth Ffile bluetooth.default /etc/sysconfig/bluetooth Ffile uart.conf /etc/bluetooth/uart.conf Fbuild --enable-network --enable-audio --enable-input \ - --enable-hal --enable-inotify --enable-usb --enable-hcid \ - --enable-sdpd --enable-configfiles --enable-hid2hci --enable-glib \ + --enable-hal --enable-usb --enable-hcid --enable-serial \ + --enable-configfiles --enable-hid2hci --enable-glib \ --disable-initscripts --disable-pcmciarules --enable-bccmd \ --enable-cups cd daemon Fexerel passkey-agent /usr/bin/passkey-agent Fmkdir /etc/udev/rules.d cd ../scripts - Fcprrel bluetooth.rules /etc/udev/rules.d/bluetooth.rules + Fcprel bluetooth.rules /etc/udev/rules.d/bluetooth.rules } # optimization OK diff --git a/source/apps-extra/bluez-utils/bluetooth.default b/source/apps-extra/bluez-utils/bluetooth.default index ee17c3a..a7c2d9d 100644 --- a/source/apps-extra/bluez-utils/bluetooth.default +++ b/source/apps-extra/bluez-utils/bluetooth.default @@ -7,7 +7,7 @@ HID2HCI_ENABLE=true HCID_ENABLE=true # Run sdpd -SDPD_ENABLE=true +#SDPD_ENABLE=true # Don't edit the following line unless you know what you're doing HCID_CONFIG="/etc/bluetooth/hcid.conf" diff --git a/source/apps-extra/bluez-utils/rc.bluetooth b/source/apps-extra/bluez-utils/rc.bluetooth index 684cbf0..acd0de6 100644 --- a/source/apps-extra/bluez-utils/rc.bluetooth +++ b/source/apps-extra/bluez-utils/rc.bluetooth @@ -36,11 +36,11 @@ if [ "$1" = "stop" ]; then killall hidd &> /dev/null ok $? fi - if [ "$SDPD_ENABLE" = "true" ]; then - submsg "$stopsdpd" - killall sdpd &> /dev/null - ok $? - fi + #if [ "$SDPD_ENABLE" = "true" ]; then + # submsg "$stopsdpd" + # killall sdpd &> /dev/null + # ok $? + #fi if [ "$HCID_ENABLE" = "true" ]; then submsg "$stophcid" killall hcid &> /dev/null @@ -60,11 +60,11 @@ elif [ "$1" = "start" ]; then hcid -f $HCID_CONFIG ok $? fi - if [ "$SDPD_ENABLE" = "true" ]; then - submsg "$startsdpd" - sdpd - ok $? - fi + #if [ "$SDPD_ENABLE" = "true" ]; then + # submsg "$startsdpd" + # sdpd + # ok $? + #fi if [ "$HIDD_ENABLE" = "true" ]; then submsg "$starthidd" hidd $HIDD_OPTIONS --server || true From devil505linux at gmail.com Mon Jun 16 19:20:29 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 16 19:20:31 2008 Subject: [Frugalware-git] frugalware-current: valknut-0.3.16-1-i686 Message-ID: <20080616172029.AE97F11901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c6c2258ca928734e3d534ccbf6aad0edfa06aea9 commit c6c2258ca928734e3d534ccbf6aad0edfa06aea9 Author: Devil505 Date: Mon Jun 16 19:12:58 2008 +0200 valknut-0.3.16-1-i686 * version bump diff --git a/source/xapps-extra/valknut/FrugalBuild b/source/xapps-extra/valknut/FrugalBuild index 8f0e497..4db5130 100644 --- a/source/xapps-extra/valknut/FrugalBuild +++ b/source/xapps-extra/valknut/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Devil505 pkgname=valknut -pkgver=0.3.14a +pkgver=0.3.16 pkgrel=1 pkgdesc="Direct Connect 4 Linux File Sharing program." -depends=('dclib>=0.3.14a' 'libgcc' 'qt' 'libgl' 'libxmu' 'libxi' 'libxdamage') +depends=('dclib>=0.3.16' 'libgcc' 'qt' 'libgl' 'libxmu' 'libxi' 'libxdamage') _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname="wxdcgui" _F_sourceforge_name="$pkgname" @@ -14,7 +14,7 @@ Finclude sourceforge options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('b999cdaac574257d9b3023e4152ebbc15878b745') +sha1sums=('f9369f334690973423bd0b4fbfa59baf4fb8c7e1') _F_desktop_name="Valknut" _F_desktop_icon="/usr/share/valknut/icons/appl/default/icon_128x128.png" From devil505linux at gmail.com Mon Jun 16 19:35:48 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 16 19:35:50 2008 Subject: [Frugalware-git] frugalware-current: gdmap-0.8.1-1-i686 Message-ID: <20080616173548.ED6B911901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5bd720227efa03fbc05023ddba1827f51c2947e2 commit 5bd720227efa03fbc05023ddba1827f51c2947e2 Author: Devil505 Date: Mon Jun 16 19:29:29 2008 +0200 gdmap-0.8.1-1-i686 * version bump diff --git a/source/xapps-extra/gdmap/FrugalBuild b/source/xapps-extra/gdmap/FrugalBuild index a24151a..daca409 100644 --- a/source/xapps-extra/gdmap/FrugalBuild +++ b/source/xapps-extra/gdmap/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=gdmap -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=1 pkgdesc="Tool to inspect the used space of folders." depends=('gtk+2' 'glibc' 'freetype2' 'libxau' 'libxdmcp' 'libxml2' 'libxdamage' 'libxext') @@ -11,6 +11,6 @@ options=('scriptlet') Finclude sourceforge groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('4dbb4fa1f7f6a7f2e4d3fc5a513fb7d14106f1e0') +sha1sums=('d97cc7c107dbaf9f3f3ed22ee6cef6172c115295') # optimization OK From devil505linux at gmail.com Mon Jun 16 20:22:16 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 16 20:22:17 2008 Subject: [Frugalware-git] frugalware-current: filezilla-3.0.11-1-i686 Message-ID: <20080616182216.179D211901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=85a502910866485005741f4d1a53463f7a83cb5b commit 85a502910866485005741f4d1a53463f7a83cb5b Author: Devil505 Date: Mon Jun 16 20:01:23 2008 +0200 filezilla-3.0.11-1-i686 * version bump diff --git a/source/xapps-extra/filezilla/FrugalBuild b/source/xapps-extra/filezilla/FrugalBuild index 3e89808..5432b2b 100644 --- a/source/xapps-extra/filezilla/FrugalBuild +++ b/source/xapps-extra/filezilla/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=filezilla -pkgver=3.0.10 +pkgver=3.0.11 pkgrel=1 pkgdesc="a fast and reliable cross-platform FTP, FTPS and SFTP client" depends=('wxgtk>=2.8.6' 'libidn' 'gnutls>=2.0.4' 'libgcrypt' 'libgcc' 'libxau' 'libxdmcp' 'libxxf86vm' 'expat' 'libxdamage' 'libxml2' 'libice') @@ -16,6 +16,6 @@ Finclude sourceforge options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('aee68e96f74c4ad82d31d93cd560428a4617cdc5') +sha1sums=('96ece8201a4821074c331f78482cf07d1e873092') # optimization OK From devil505linux at gmail.com Mon Jun 16 20:53:37 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 16 20:53:37 2008 Subject: [Frugalware-git] frugalware-current: vavoom-1.28-1-i686 Message-ID: <20080616185337.0E8F411901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b5423db4c5811c5435655777718a891b39167764 commit b5423db4c5811c5435655777718a891b39167764 Author: Devil505 Date: Mon Jun 16 20:53:24 2008 +0200 vavoom-1.28-1-i686 * version bump diff --git a/source/games-extra/vavoom/FrugalBuild b/source/games-extra/vavoom/FrugalBuild index 60fa434..32c4779 100644 --- a/source/games-extra/vavoom/FrugalBuild +++ b/source/games-extra/vavoom/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: jedifox pkgname=vavoom -pkgver=1.27.1 +pkgver=1.28 pkgrel=1 pkgdesc="Vavoom is Doom/Heretic/Hexen/Strife source port" _F_sourceforge_broken_up2date="1" @@ -14,7 +14,7 @@ depends=('libstdc++' 'flac' 'libmad' 'openal' 'sdl_mixer' 'libxext' 'libxdamage' groups=(games-extra) archs=('i686') source=($source README.Frugalware) -sha1sums=('ebb1550015d4f8965e7b7216f8fd15cca3f951df' \ +sha1sums=('4e73c18922c7b38d60605ace5002aef77e9b532e' \ 'bd055774c64b04814b6b7f2f90bf40f9e5b7b98a') _F_desktop_name="Vavoom" From bouleetbil at frogdev.info Mon Jun 16 21:00:24 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jun 16 21:00:25 2008 Subject: [Frugalware-git] frugalware-current: laf-plugin-0.2-1-i686 Message-ID: <20080616190024.1323211901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6ff09c1bbe4cc6e09868123a534cdb81dab31a26 commit 6ff09c1bbe4cc6e09868123a534cdb81dab31a26 Author: bouleetbil Date: Mon Jun 16 20:50:45 2008 +0200 laf-plugin-0.2-1-i686 *new package diff --git a/source/devel-extra/laf-plugin/FrugalBuild b/source/devel-extra/laf-plugin/FrugalBuild new file mode 100644 index 0000000..d87b4da --- /dev/null +++ b/source/devel-extra/laf-plugin/FrugalBuild @@ -0,0 +1,32 @@ +# Compiling Time: 0.05 SBU +# Maintainer: bouleetbil + +pkgname=laf-plugin +pkgver=0.2 +pkgrel=1 +pkgdesc="A generic plugin framework for look-and-feels" +Finclude java +depends=(${depends[@]} 'j2re') +makedepends=(${makedepends[@]} 'j2sdk') +groups=('devel-extra') +archs=('i686') +url="http://laf-plugin.dev.java.net" +up2date="elinks -dump $url/servlets/ProjectDocumentList | grep release | tail -2| tr -s ' ' | cut -d ' ' -f4 | head -1" +source=(https://$pkgname.dev.java.net/files/documents/4261/41254/$pkgname-src.zip build.xml) +sha1sums=('8ab143dd080a4bb3b78e82545cd21fd6b2046094' \ + '03ba77d3d9deeb4bdbf6c1f3298fd55f46da8bf7') +_F_cd_path="./" + +build() +{ + Fcd + mkdir -p src || Fdie + mv META-INF src/ || Fdie + mv org src/ || Fdie + Fjavacleanup + #For use Java sun (don't build and don't work without) + export JAVA_HOME=/usr/lib/java + Fant + #install + Fjar dist/$pkgname.jar +} diff --git a/source/devel-extra/laf-plugin/build.xml b/source/devel-extra/laf-plugin/build.xml new file mode 100644 index 0000000..2afa66d --- /dev/null +++ b/source/devel-extra/laf-plugin/build.xml @@ -0,0 +1,44 @@ + + + Simple build + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From devil505linux at gmail.com Mon Jun 16 21:31:27 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 16 21:31:28 2008 Subject: [Frugalware-git] frugalware-current: mednafen-0.8.9-1-i686 Message-ID: <20080616193127.8F5F711901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6a0c100915c0094553d2b9a5e98147f226029191 commit 6a0c100915c0094553d2b9a5e98147f226029191 Author: Devil505 Date: Mon Jun 16 21:31:05 2008 +0200 mednafen-0.8.9-1-i686 * version bump diff --git a/source/games-extra/mednafen/FrugalBuild b/source/games-extra/mednafen/FrugalBuild index 04ab429..7dbc714 100644 --- a/source/games-extra/mednafen/FrugalBuild +++ b/source/games-extra/mednafen/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=mednafen -pkgver=0.8.8 +pkgver=0.8.9 pkgrel=1 pkgdesc="Mednafen is a command-line multi-system emulator" _F_sourceforge_ext=".tar.bz2" @@ -13,6 +13,6 @@ makedepends=('pkgconfig') groups=('games-extra') archs=('i686') _F_cd_path="$pkgname" -sha1sums=('e84cd8205ff009f0a6b8095abc876bf35ae2acf2') +sha1sums=('ae9285da64c534b6053bdd19b9da64a4a0c00b4f') # optimization OK From devil505linux at gmail.com Mon Jun 16 22:05:30 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 16 22:05:32 2008 Subject: [Frugalware-git] frugalware-current: stormbaancoureur-2.1.5-1-i686 Message-ID: <20080616200530.C41C611901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6a3bcdacf32228d036f3a0bf3dde0b971a44692c commit 6a3bcdacf32228d036f3a0bf3dde0b971a44692c Author: Devil505 Date: Mon Jun 16 22:02:21 2008 +0200 stormbaancoureur-2.1.5-1-i686 * version bump * removed patch * fixed depends diff --git a/source/games-extra/stormbaancoureur/FrugalBuild b/source/games-extra/stormbaancoureur/FrugalBuild index 4a7ab8d..9e18f4e 100644 --- a/source/games-extra/stormbaancoureur/FrugalBuild +++ b/source/games-extra/stormbaancoureur/FrugalBuild @@ -1,20 +1,19 @@ -# Compiling Time: 0.01 SBU +# Compiling Time: 0.06 SBU # Maintainer: Devil505 # Contributor: jedifox pkgname=stormbaancoureur -pkgver=2.1.4 +pkgver=2.1.5 pkgrel=1 pkgdesc="Simulated Obstacle Course For Automobiles" url="http://www.sturmbahnfahrer.com/" -depends=('freeglut' 'plib>=1.8.4' 'ode>=0.8' 'alsa-lib') +depends=('plib' 'ode' 'freeglut' 'libgl' 'alsa-lib' 'libgcc' 'libxext' 'libxdamage') groups=('games-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://bram.creative4vision.nl/sturmbahnfahrer/download/ |Flasttar" -source=(http://bram.creative4vision.nl/sturmbahnfahrer/download/$pkgname-$pkgver.tar.gz \ -stormbaancoureur-2.1.4-1.patch) -sha1sums=('7f88c9a753d87051c84d5e627f810bf805bbf909' \ - '452f7a9bb6a19be06aafb00707d7e3764c802747') +source=(http://bram.creative4vision.nl/sturmbahnfahrer/download/$pkgname-$pkgver.tar.gz) +sha1sums=('3cbd1cb0879e143e5eb45699f133a5636a8eb0b7') + _F_cd_path="$pkgname-$pkgver/src-$pkgname" _F_desktop_name="Stormbaan Coureur" _F_desktop_categories="Game;" diff --git a/source/games-extra/stormbaancoureur/stormbaancoureur-2.1.4-1.patch b/source/games-extra/stormbaancoureur/stormbaancoureur-2.1.4-1.patch deleted file mode 100644 index 5746e6e..0000000 --- a/source/games-extra/stormbaancoureur/stormbaancoureur-2.1.4-1.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- Makefile 2008-04-20 17:57:43.000000000 +0200 -+++ Makefile 2008-04-21 21:06:03.000000000 +0200 -@@ -10,14 +10,13 @@ - - # END OF CUSTOM SETTINGS - --CXXFLAGS=\ -- -I$(GLPREFIX)/include \ -+CXXFLAGS ?= -O2-g -Wall -+CXXFLAGS += -I$(GLPREFIX)/include \ - -I$(ODEPREFIX)/include \ - -I$(PLIBPREFIX)/include \ - -I../src-common \ - -I. \ - -DGAMEVERSION=$(VERSION) \ -- -O2 -g -Wall - - LFLAGS=\ - -L$(PLIBPREFIX)/$(LIBDIRNAME) \ From devil505linux at gmail.com Mon Jun 16 22:31:54 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 16 22:31:55 2008 Subject: [Frugalware-git] frugalware-current: fotoxx-4.7-1-i686 Message-ID: <20080616203154.C431A11901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a4253cbb2725de396739abac90bc35362692e09d commit a4253cbb2725de396739abac90bc35362692e09d Author: Devil505 Date: Mon Jun 16 22:31:06 2008 +0200 fotoxx-4.7-1-i686 * new package (replaces fotox) diff --git a/source/xapps-extra/fotoxx/FrugalBuild b/source/xapps-extra/fotoxx/FrugalBuild new file mode 100644 index 0000000..ec4b442 --- /dev/null +++ b/source/xapps-extra/fotoxx/FrugalBuild @@ -0,0 +1,27 @@ +# Compiling Time: 0.01 SBU +# Maintainer: Devil505 + +pkgname=fotoxx +pkgver=4.7 +pkgrel=1 +pkgdesc="A program for improving image files made with a digital camera" +url="http://kornelix.squarespace.com/$pkgname/" +depends=('gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'libstdc++' 'libxdamage' 'libxext' 'libxml2' 'exiv2') +options=('scriptlet') +groups=('xapps-extra') +archs=('i686' 'x86_64') +Fpkgversep="." +up2date="lynx -dump http://kornelix.squarespace.com/download/ | Flasttar" +source=(http://kornelix.squarespace.com/storage/programs/$pkgname/$pkgname-$pkgver.tar.gz) +_F_cd_path="$pkgname" +sha1sums=('20919a4774895f0f2a3e9c2670cde66b4cbed2a8') +replaces=('fotox') + +build() +{ + Fcd + export PREFIX=/usr Fmake + Fmakeinstall + Fmkdir usr/share/applications/ + make LAUNCHER=$Fdestdir/usr/share/applications/$pkgname.desktop launcher || Fdie +} From devil505linux at gmail.com Mon Jun 16 22:34:17 2008 From: devil505linux at gmail.com (Devil505) Date: Mon Jun 16 22:34:18 2008 Subject: [Frugalware-git] frugalware-current: fotox-44-1-i686 Message-ID: <20080616203417.9F15D11901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bf8bf3d22b082f137d2ee102e9f84208cfd75d64 commit bf8bf3d22b082f137d2ee102e9f84208cfd75d64 Author: Devil505 Date: Mon Jun 16 22:34:06 2008 +0200 fotox-44-1-i686 * removed package diff --git a/source/xapps-extra/fotox/FrugalBuild b/source/xapps-extra/fotox/FrugalBuild deleted file mode 100644 index cf42ea9..0000000 --- a/source/xapps-extra/fotox/FrugalBuild +++ /dev/null @@ -1,33 +0,0 @@ -# Compiling Time: 0.02 SBU -# Maintainer: Devil505 - -pkgname=fotox -pkgver=44 -pkgrel=1 -pkgdesc="A program for improving image files made with a digital camera" -url="http://kornelix.squarespace.com/fotox/" -depends=('gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'libstdc++' 'libxdamage' 'libxext' 'libxml2' 'exiv2') -options=('scriptlet') -groups=('xapps-extra') -archs=('i686' 'x86_64') -Fpkgversep="." -up2date="lynx -dump http://kornelix.squarespace.com/download/ | Flasttar" -source=(http://kornelix.squarespace.com/storage/$pkgname/$pkgname.$pkgver.tar.gz) -_F_cd_path="$pkgname" -sha1sums=('fbfad9d8c34857685503cc5704dc3a0714ef8a33') - -_F_desktop_name="Fotox" -_F_desktop_desc="Improve images made whith a digital camera" -_F_desktop_icon="/usr/share/fotox/icons/fotox.png" -_F_desktop_categories="Graphics;2DGraphics;RasterGraphics;GTK;" - -build() -{ - Fmkdir usr/bin - Fcd - export PREFIX=/usr - ./build build || Fdie - export PREFIX=$Fdestdir/usr - ./build install || Fdie - Fdesktop2 -} From ryuo at frugalware.org Mon Jun 16 22:49:44 2008 From: ryuo at frugalware.org (James Buren) Date: Mon Jun 16 22:49:46 2008 Subject: [Frugalware-git] frugalware-current: joy2key-1.6-1-i686 Message-ID: <20080616204944.A309A11901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f2078586c2386e8a3f0eca109f40121e178b0aa7 commit f2078586c2386e8a3f0eca109f40121e178b0aa7 Author: James Buren Date: Mon Jun 16 15:46:21 2008 -0500 joy2key-1.6-1-i686 * new package diff --git a/source/xapps-extra/joy2key/FrugalBuild b/source/xapps-extra/joy2key/FrugalBuild new file mode 100644 index 0000000..d1b1fd4 --- /dev/null +++ b/source/xapps-extra/joy2key/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 0.02 SBU +# Maintainer: James Buren + +pkgname=joy2key +pkgver=1.6 +pkgrel=1 +pkgdesc="A program for translating joystick events to keyboard events." +url="http://interreality.org/~tetron/technology/joy2key/" +depends=('libx11' 'glibc') +makedepends=('xorg-server') +groups=('xapps-extra') +archs=('i686' 'x86_64') +up2date="Flasttar $url" +source=($url/$pkgname-$pkgver.tar.gz) +sha1sums=('7149d2b4fe3e74c4fb99ce1d27a7685265cba30c') +_F_cd_path="$pkgname-$pkgver.1" +CFLAGS="${CFLAGS} -lX11" + +# optimization OK From bouleetbil at frogdev.info Mon Jun 16 23:17:23 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jun 16 23:17:25 2008 Subject: [Frugalware-git] frugalware-current: forms-1.2.0-1-i686 Message-ID: <20080616211723.5E94311901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7229c5be32eb468c95e712365f721b3e178daef5 commit 7229c5be32eb468c95e712365f721b3e178daef5 Author: bouleetbil Date: Mon Jun 16 23:09:14 2008 +0200 forms-1.2.0-1-i686 *new package diff --git a/source/devel-extra/forms/FrugalBuild b/source/devel-extra/forms/FrugalBuild new file mode 100644 index 0000000..c30e898 --- /dev/null +++ b/source/devel-extra/forms/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0.03 SBU +# Maintainer: bouleetbil + +pkgname=forms +pkgver=1.2.0 +pkgrel=1 +pkgdesc="JGoodies Forms Library" +url="http://www.jgoodies.com/" +Finclude java +groups=('devel-extra') +archs=('i686') +up2date="lynx -dump -source $url/downloads/libraries.html | grep 'forms-' | \ + cut -d '-' -f2| cut -d '.' -f1 | sed 's/_/./g' " +source=($url/download/libraries/$pkgname/$pkgname-${pkgver//./_}.zip) +sha1sums=('e2131501d68be41c5edc652fb7a51bc6e80dee00') + +build() { + Fcd + Fjavacleanup + Fant jar + Fjar build/$pkgname.jar +} From bouleetbil at frogdev.info Tue Jun 17 00:09:00 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jun 17 00:09:03 2008 Subject: [Frugalware-git] frugalware-current: substance-4.3_09-1-i686 Message-ID: <20080616220900.3E83211901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=af38a0a6d829cc9080c3f8748ae9127dd6ac14d8 commit af38a0a6d829cc9080c3f8748ae9127dd6ac14d8 Author: bouleetbil Date: Tue Jun 17 00:01:25 2008 +0200 substance-4.3_09-1-i686 *new package diff --git a/source/devel-extra/substance/FrugalBuild b/source/devel-extra/substance/FrugalBuild new file mode 100644 index 0000000..8c75adf --- /dev/null +++ b/source/devel-extra/substance/FrugalBuild @@ -0,0 +1,33 @@ +# Compiling Time: 0.03 SBU +# Maintainer: bouleetbil + +pkgname=substance +pkgver=4.3_09 +pkgrel=1 +pkgdesc="Provide a configurable and customizable production-quality Java look and feel library for Swing applications." +url="https://substance.dev.java.net" +Finclude java +groups=('devel-extra') +depends=(${depends[@]} 'laf-widget' 'swingx' 'laf-plugin' 'forms' 'j2re') +makedepends=(${makedepends[@]} 'j2sdk') +archs=('i686') +up2date="elinks -dump -source $url/servlets/ProjectDocumentList | grep '*' | grep 'applications' | cut -d '*' -f2" +source=($url/files/documents/3294/85735/$pkgname-all.zip) +sha1sums=('5048a42ae398602c1f124c101407eba37c991209') +_F_cd_path="./" + +build() { + Fcd + Fjavacleanup + #For use Java sun (don't build and don't work without) + export JAVA_HOME=/usr/lib/java + antflags="-Djdk.home=/usr/lib/java" + Fsed "laf-plugin-50.jar" "laf-plugin.jar" build.xml + Fsed "asm-all-2.2.2.jar" "asm-all.jar" build.xml + Fsed "forms-1.1.0.jar" "forms.jar" build.xml + Fsed "\${substance.lib.dir}" "/usr/share/java" build.xml + Fant $antflags + Fjar drop/substance.jar + Fjar drop/substance-lite.jar + Fjar drop/substance-lite-feel.jar +} From vmiklos at frugalware.org Tue Jun 17 00:11:56 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 17 00:11:58 2008 Subject: [Frugalware-git] frugalware-current: avahi-0.6.22-4-i686 Message-ID: <20080616221156.CB40C11901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d89a28029186f27d1db6932a228fcf061b6b19b8 commit d89a28029186f27d1db6932a228fcf061b6b19b8 Author: Miklos Vajna Date: Tue Jun 17 00:11:39 2008 +0200 avahi-0.6.22-4-i686 - move avahi-python to extra diff --git a/source/network/avahi/FrugalBuild b/source/network/avahi/FrugalBuild index f140a42..5fd6d88 100644 --- a/source/network/avahi/FrugalBuild +++ b/source/network/avahi/FrugalBuild @@ -36,7 +36,7 @@ subdescs=('Glib bindings for Avahi' 'Mono C# bindings for Avahi' 'QT3 bindings f subdepends=("glib2 $pkgname=$pkgver" "mono>=1.9 $pkgname=$pkgver" "qt $pkgname=$pkgver" "python>=2.5 $pkgname=$pkgver" "$pkgname=$pkgver" \ "avahi-python=$pkgver libglade pygtk libavahi-ui=$pkgver avahi-glib=$pkgver" "libqtcore $pkgname=$pkgver" "$pkgname=$pkgver" \ "gtk+2 $pkgname=$pkgver" "gtk2-sharp>=2.12.0 libavahi-ui=$pkgver") -subgroups=('network' 'apps-extra' 'xlib' 'network' 'network' 'gnome-extra' 'lib-extra' 'network-extra' 'gnome' 'gnome-extra') +subgroups=('network' 'apps-extra' 'xlib' 'network-extra' 'network' 'gnome-extra' 'lib-extra' 'network-extra' 'gnome' 'gnome-extra') subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \ 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') From vmiklos at frugalware.org Tue Jun 17 00:18:09 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 17 00:18:11 2008 Subject: [Frugalware-git] frugalware-current: dbus-sharp-0.63-3-i686 Message-ID: <20080616221809.BB77E11901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=11eb3b07107c0fc07ce27eace9965876f47e3d14 commit 11eb3b07107c0fc07ce27eace9965876f47e3d14 Author: Miklos Vajna Date: Tue Jun 17 00:17:43 2008 +0200 dbus-sharp-0.63-3-i686 - move to extra - also remove conflicts/provides/replaces, it was added before 0.6 diff --git a/source/gnome-extra/dbus-sharp/FrugalBuild b/source/gnome-extra/dbus-sharp/FrugalBuild new file mode 100644 index 0000000..4bed1df --- /dev/null +++ b/source/gnome-extra/dbus-sharp/FrugalBuild @@ -0,0 +1,32 @@ +# Compiling time: 0.24 SBU +# Maintainer: crazy + +pkgname=dbus-sharp +pkgver=0.63 +pkgrel=3 +pkgdesc="Mono bindings for D-BUS" +url="http://www.freedesktop.org/wiki/Software_2fDBusBindings" +depends=('dbus-glib>=0.71' 'mono>=1.9') +groups=('gnome-extra') +archs=('i686' 'x86_64') +up2date="$pkgver" ## not even released , this tarball is from FC6 devel repo :P +source=(http://ftp.frugalware.org/pub/other/sources/dbus/$pkgname-$pkgver.tar.gz \ + dbus-sharp-0.63-nogtk.patch dbus-sharp-gchandle.patch) +Finclude mono +sha1sums=('8bd599ee0e8f05bfae2ef6174ed40faa70de6be4' \ + 'a2aad7ba1955e520fd4ae946cc51f398ba78c36a' \ + '2e54b78ca82cdca3af491fa74f9b746af1a8ef08') + +build() +{ + Fcd + Fpatchall + Fautoreconf + Fmonoexport + Fmake + Fmakeinstall + Fmonocompileaot + Fmonocleanup +} + +# optimization OK diff --git a/source/gnome-extra/dbus-sharp/dbus-sharp-0.63-nogtk.patch b/source/gnome-extra/dbus-sharp/dbus-sharp-0.63-nogtk.patch new file mode 100644 index 0000000..52fd0a6 --- /dev/null +++ b/source/gnome-extra/dbus-sharp/dbus-sharp-0.63-nogtk.patch @@ -0,0 +1,8 @@ +--- dbus-sharp-0.63/mono/Makefile.am.nogtk 2006-08-18 14:55:13.000000000 +0200 ++++ dbus-sharp-0.63/mono/Makefile.am 2006-08-18 14:55:21.000000000 +0200 +@@ -1,4 +1,4 @@ +-SUBDIRS=. doc example ++SUBDIRS=. doc + + TARGET=$(ASSEMBLY) + NOINST_EXES=test-dbus-sharp.exe diff --git a/source/gnome-extra/dbus-sharp/dbus-sharp-gchandle.patch b/source/gnome-extra/dbus-sharp/dbus-sharp-gchandle.patch new file mode 100644 index 0000000..5459db4 --- /dev/null +++ b/source/gnome-extra/dbus-sharp/dbus-sharp-gchandle.patch @@ -0,0 +1,22 @@ +--- dbus-sharp-0.63/mono/Connection.cs.gchandle 2006-08-30 15:14:28.000000000 +0200 ++++ dbus-sharp-0.63/mono/Connection.cs 2006-08-30 15:17:01.000000000 +0200 +@@ -116,7 +116,7 @@ + // Maybe we already have a Connection object associated with + // this rawConnection then return it + IntPtr rawThis = dbus_connection_get_data (rawConnection, slot); +- if (rawThis != IntPtr.Zero && ((GCHandle)rawThis).Target == typeof(DBus.Connection)) { ++ if (rawThis != IntPtr.Zero && (((GCHandle)rawThis).Target != null)) { + return (DBus.Connection) ((GCHandle)rawThis).Target; + } + } +--- dbus-sharp-0.63/mono/Message.cs.gchandle 2006-08-30 15:14:20.000000000 +0200 ++++ dbus-sharp-0.63/mono/Message.cs 2006-08-30 15:16:45.000000000 +0200 +@@ -110,7 +110,7 @@ + if (slot > -1) { + // If we already have a Message object associated with this rawMessage then return it + IntPtr rawThis = dbus_message_get_data(rawMessage, slot); +- if (rawThis != IntPtr.Zero && ((GCHandle)rawThis).Target == typeof(DBus.Message)) ++ if (rawThis != IntPtr.Zero && (((GCHandle)rawThis).Target != null)) + return (DBus.Message) ((GCHandle)rawThis).Target; + } + // If it doesn't exist then create a new Message around it diff --git a/source/gnome/dbus-sharp/FrugalBuild b/source/gnome/dbus-sharp/FrugalBuild deleted file mode 100644 index 89183da..0000000 --- a/source/gnome/dbus-sharp/FrugalBuild +++ /dev/null @@ -1,35 +0,0 @@ -# Compiling time: 0.24 SBU -# Maintainer: crazy - -pkgname=dbus-sharp -pkgver=0.63 -pkgrel=3 -pkgdesc="Mono bindings for D-BUS" -url="http://www.freedesktop.org/wiki/Software_2fDBusBindings" -depends=('dbus-glib>=0.71' 'mono>=1.9') -groups=('gnome') -conflicts=('dbus-mono') -replaces=('dbus-mono') -provides=('dbus-mono') -archs=('i686' 'x86_64') -up2date="$pkgver" ## not even released , this tarball is from FC6 devel repo :P -source=(http://ftp.frugalware.org/pub/other/sources/dbus/$pkgname-$pkgver.tar.gz \ - dbus-sharp-0.63-nogtk.patch dbus-sharp-gchandle.patch) -Finclude mono -sha1sums=('8bd599ee0e8f05bfae2ef6174ed40faa70de6be4' \ - 'a2aad7ba1955e520fd4ae946cc51f398ba78c36a' \ - '2e54b78ca82cdca3af491fa74f9b746af1a8ef08') - -build() -{ - Fcd - Fpatchall - Fautoreconf - Fmonoexport - Fmake - Fmakeinstall - Fmonocompileaot - Fmonocleanup -} - -# optimization OK diff --git a/source/gnome/dbus-sharp/dbus-sharp-0.63-nogtk.patch b/source/gnome/dbus-sharp/dbus-sharp-0.63-nogtk.patch deleted file mode 100644 index 52fd0a6..0000000 --- a/source/gnome/dbus-sharp/dbus-sharp-0.63-nogtk.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- dbus-sharp-0.63/mono/Makefile.am.nogtk 2006-08-18 14:55:13.000000000 +0200 -+++ dbus-sharp-0.63/mono/Makefile.am 2006-08-18 14:55:21.000000000 +0200 -@@ -1,4 +1,4 @@ --SUBDIRS=. doc example -+SUBDIRS=. doc - - TARGET=$(ASSEMBLY) - NOINST_EXES=test-dbus-sharp.exe diff --git a/source/gnome/dbus-sharp/dbus-sharp-gchandle.patch b/source/gnome/dbus-sharp/dbus-sharp-gchandle.patch deleted file mode 100644 index 5459db4..0000000 --- a/source/gnome/dbus-sharp/dbus-sharp-gchandle.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- dbus-sharp-0.63/mono/Connection.cs.gchandle 2006-08-30 15:14:28.000000000 +0200 -+++ dbus-sharp-0.63/mono/Connection.cs 2006-08-30 15:17:01.000000000 +0200 -@@ -116,7 +116,7 @@ - // Maybe we already have a Connection object associated with - // this rawConnection then return it - IntPtr rawThis = dbus_connection_get_data (rawConnection, slot); -- if (rawThis != IntPtr.Zero && ((GCHandle)rawThis).Target == typeof(DBus.Connection)) { -+ if (rawThis != IntPtr.Zero && (((GCHandle)rawThis).Target != null)) { - return (DBus.Connection) ((GCHandle)rawThis).Target; - } - } ---- dbus-sharp-0.63/mono/Message.cs.gchandle 2006-08-30 15:14:20.000000000 +0200 -+++ dbus-sharp-0.63/mono/Message.cs 2006-08-30 15:16:45.000000000 +0200 -@@ -110,7 +110,7 @@ - if (slot > -1) { - // If we already have a Message object associated with this rawMessage then return it - IntPtr rawThis = dbus_message_get_data(rawMessage, slot); -- if (rawThis != IntPtr.Zero && ((GCHandle)rawThis).Target == typeof(DBus.Message)) -+ if (rawThis != IntPtr.Zero && (((GCHandle)rawThis).Target != null)) - return (DBus.Message) ((GCHandle)rawThis).Target; - } - // If it doesn't exist then create a new Message around it From vmiklos at frugalware.org Tue Jun 17 00:22:44 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 17 00:22:45 2008 Subject: [Frugalware-git] frugalware-current: fetchmail-6.3.8-1-i686 Message-ID: <20080616222244.1DDF611901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8e8a7a2eb78fd970aa2a393d18ae6442d6d09b2d commit 8e8a7a2eb78fd970aa2a393d18ae6442d6d09b2d Author: Miklos Vajna Date: Tue Jun 17 00:22:32 2008 +0200 fetchmail-6.3.8-1-i686 - move fetchmailconf to extra diff --git a/source/network/fetchmail/FrugalBuild b/source/network/fetchmail/FrugalBuild index d5f1f58..d41cea8 100644 --- a/source/network/fetchmail/FrugalBuild +++ b/source/network/fetchmail/FrugalBuild @@ -17,7 +17,7 @@ subpkgs=('fetchmailconf') subdescs=('fetchmail setup tool') subpkgdesc=('A graphical configuration tool for Fetchmail.') subdepends=('fetchmail tk python dialog') -subgroups=('xapps') +subgroups=('xapps-extra') subarchs=('i686 x86_64') build() { From bouleetbil at frogdev.info Tue Jun 17 00:26:04 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jun 17 00:26:06 2008 Subject: [Frugalware-git] frugalware-current: substance-4.3_09-1-i686 Message-ID: <20080616222604.8B81511901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=daf6e509570037488d04e4405344e7d736c65705 commit daf6e509570037488d04e4405344e7d736c65705 Author: bouleetbil Date: Tue Jun 17 00:19:31 2008 +0200 substance-4.3_09-1-i686 *SBU fixed diff --git a/source/devel-extra/substance/FrugalBuild b/source/devel-extra/substance/FrugalBuild index 8c75adf..299f0f4 100644 --- a/source/devel-extra/substance/FrugalBuild +++ b/source/devel-extra/substance/FrugalBuild @@ -1,4 +1,4 @@ -# Compiling Time: 0.03 SBU +# Compiling Time: 0.85 SBU # Maintainer: bouleetbil pkgname=substance From vmiklos at frugalware.org Tue Jun 17 00:48:23 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 17 00:48:26 2008 Subject: [Frugalware-git] frugalware-current: ftgl-2.1.2-3-i686 Message-ID: <20080616224823.2CC5211901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4dac077ec80c45803229d1622a984ec027c217f0 commit 4dac077ec80c45803229d1622a984ec027c217f0 Author: Miklos Vajna Date: Tue Jun 17 00:47:52 2008 +0200 ftgl-2.1.2-3-i686 - moved to extra - removed xorg6 reference - minimal cleanup diff --git a/source/xlib-extra/ftgl/FrugalBuild b/source/xlib-extra/ftgl/FrugalBuild new file mode 100644 index 0000000..5d5634d --- /dev/null +++ b/source/xlib-extra/ftgl/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: ~0.25 SBU +# Maintainer: Zsolt Szalai + +pkgname=ftgl +pkgver=2.1.2 +pkgrel=3 +pkgdesc="Library to render text in OpenGL using FreeType" +url="http://homepages.paradise.net.nz/henryj/code/index.html" +makedepends=('libx11' 'mesa' 'libxmu' 'freeglut') +depends=('freetype2') +groups=('xlib-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump http://homepages.paradise.net.nz/henryj/code/index.html#FTGL|grep 'Current stable'|cut -d '(' -f 2 | cut -d ')' -f 1" +source=("http://opengl.geek.nz/ftgl/ftgl-$pkgver.tar.gz" 'ftgl.diff') +sha1sums=('61a019ba610351c346cd29cfa1bb12e7517475f5' \ + '86f6909833ef0e78acefe30386c3d16d251a011e') + +build() { + patch $startdir/src/FTGL/unix/docs/Makefile <$startdir/ftgl.diff + cd $startdir/src/FTGL/unix + ./configure --prefix=/usr --with-glut-lib=/usr/lib --with-pic + make || return 1 + make prefix=$startdir/pkg/usr install +} + +# optimization OK diff --git a/source/xlib-extra/ftgl/ftgl.diff b/source/xlib-extra/ftgl/ftgl.diff new file mode 100644 index 0000000..257e39b --- /dev/null +++ b/source/xlib-extra/ftgl/ftgl.diff @@ -0,0 +1,10 @@ +--- src/FTGL/unix/docs/Makefile 2003-03-06 11:22:54.000000000 +0100 ++++ Makefile 2004-11-08 13:35:03.000000000 +0100 +@@ -14,6 +14,7 @@ + + install-local: doc + $(INSTALL) -d -m 0755 $(datadir)/doc/$(PACKAGE_NAME)/html ++ tar xzf ../../docs/html.tar.gz + $(INSTALL) -m 0644 html/* $(datadir)/doc/$(PACKAGE_NAME)/html/ + + distclean-local: diff --git a/source/xlib/ftgl/FrugalBuild b/source/xlib/ftgl/FrugalBuild deleted file mode 100644 index 9db2a35..0000000 --- a/source/xlib/ftgl/FrugalBuild +++ /dev/null @@ -1,29 +0,0 @@ -# Compiling Time: ~0.25 SBU -# Maintainer: Zsolt Szalai - -pkgname=ftgl -pkgver=2.1.2 -pkgrel=3 -pkgdesc="Library to render text in OpenGL using FreeType" -url="http://homepages.paradise.net.nz/henryj/code/index.html" -makedepends=('libx11' 'mesa' 'libxmu' 'glut') -depends=('freetype2') -groups=('xlib') -archs=('i686' 'x86_64') -up2date="lynx -dump http://homepages.paradise.net.nz/henryj/code/index.html#FTGL|grep 'Current stable'|cut -d '(' -f 2 | cut -d ')' -f 1" -source=("http://opengl.geek.nz/ftgl/ftgl-$pkgver.tar.gz" 'ftgl.diff') -sha1sums=('61a019ba610351c346cd29cfa1bb12e7517475f5' \ - '86f6909833ef0e78acefe30386c3d16d251a011e') - -build() { - patch $startdir/src/FTGL/unix/docs/Makefile <$startdir/ftgl.diff - cd $startdir/src/FTGL/unix - ./configure --prefix=/usr --with-glut-lib=/usr/X11R6/lib --with-pic - make || return 1 - make prefix=$startdir/pkg/usr install -# mkdir -p $startdir/pkg/usr/share/doc/ftgl/html -# cp -R $startdir/src/FTGL/unix/docs/html $startdir/pkg/usr/share/doc/ftgl -} - - -# optimization OK diff --git a/source/xlib/ftgl/ftgl.diff b/source/xlib/ftgl/ftgl.diff deleted file mode 100644 index 257e39b..0000000 --- a/source/xlib/ftgl/ftgl.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- src/FTGL/unix/docs/Makefile 2003-03-06 11:22:54.000000000 +0100 -+++ Makefile 2004-11-08 13:35:03.000000000 +0100 -@@ -14,6 +14,7 @@ - - install-local: doc - $(INSTALL) -d -m 0755 $(datadir)/doc/$(PACKAGE_NAME)/html -+ tar xzf ../../docs/html.tar.gz - $(INSTALL) -m 0644 html/* $(datadir)/doc/$(PACKAGE_NAME)/html/ - - distclean-local: From vmiklos at frugalware.org Tue Jun 17 00:54:44 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 17 00:54:46 2008 Subject: [Frugalware-git] frugalware-current: jam-2.5-3-i686 Message-ID: <20080616225444.09CA811901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9b67644115b8881475df41204de7c0c9e468b0f1 commit 9b67644115b8881475df41204de7c0c9e468b0f1 Author: Miklos Vajna Date: Tue Jun 17 00:54:33 2008 +0200 jam-2.5-3-i686 - moved to extra diff --git a/source/devel-extra/jam/FrugalBuild b/source/devel-extra/jam/FrugalBuild new file mode 100644 index 0000000..b53d001 --- /dev/null +++ b/source/devel-extra/jam/FrugalBuild @@ -0,0 +1,36 @@ +# Compiling Time: ~0.03 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=jam +pkgver=2.5 +pkgrel=3 +pkgdesc="Just Another Make - advanced make replacement" +url="http://www.perforce.com/jam/jam.html" +depends=('glibc') +groups=('devel-extra') +archs=('x86_64' 'i686') +up2date="lynx -dump ftp://ftp.perforce.com/pub/jam/ |grep jam-[0-9\.]*.tar|tail -n 1|sed -ne 's/.*-\(.*\).t.*/\1/;1 p'" +source=(ftp://ftp.perforce.com/pub/$pkgname/$pkgname-$pkgver.tar \ + jam-2.5-cxx.patch \ + jam-2.5-amd64.patch \ + jam-2.5-dependency.patch \ + debian-fixes.patch) +sha1sums=('421c1b308c3c3dc4c95c0640078416af2195d841' \ + '9cf39afd9d7f5869fd8696516d6f53d7dbdddbbe' \ + 'cc55de044c1f619bad62b226a57801ba810ff006' \ + 'a0387cf1cd0dd7196eeed35a87d5030f4f58f977' \ + '4edb3d1814ae7acaf74152bff7814546424f97fc') + +build() +{ + unset MAKEFLAGS + Fcd + Fpatchall + export PATH="$PATH:$Fsrcdir" + make || Fdie + ./jam0 -sBINDIR=$Fdestdir/usr/bin \ + -sCCFLAGS=-g -sOPTIM=-O2 \ + install || Fdie + +} + diff --git a/source/devel-extra/jam/debian-fixes.patch b/source/devel-extra/jam/debian-fixes.patch new file mode 100644 index 0000000..81a2472 --- /dev/null +++ b/source/devel-extra/jam/debian-fixes.patch @@ -0,0 +1,2989 @@ +diff -Naur jam-2.5/Jam.html jam-2.5-p/Jam.html +--- jam-2.5/Jam.html 2003-04-23 06:45:49.000000000 +0200 ++++ jam-2.5-p/Jam.html 2007-08-19 22:36:55.000000000 +0200 +@@ -169,11 +169,16 @@ + In the parsing phase, jam reads and executes the Jambase + file, by default the built-in one. It is written in the jam + language. See Language below. The +- last action of the Jambase is to read (via the "include" rule) ++ last action of the builtin Jambase is to read (via the "include" rule) + a user-provided file called "Jamfile". + +

+ ++ On Debian systems, the builtin Jambase is available for ++ reference as /usr/share/doc/jam/Jambase.gz. ++ ++

++ + Collectively, the purpose of the Jambase and the Jamfile is to + name built target and source files, construct the dependency + graph among them, and associate build actions with targets. +@@ -273,7 +278,7 @@ + +

Overview

+ +- Jam has a interpreted, procedural language with a few ++ Jam has an interpreted, procedural language with a few + select features to effect program construction. Statements in + jam are rule (procedure) definitions, rule invocations, + updating action definitions, flow-of-control structures, variable +@@ -339,7 +344,7 @@ + +

+ +- When an rule with updating actions is invoked, those actions are ++ When a rule with updating actions is invoked, those actions are + added to those associated with its built targets ($(1)) before + the rule's procedure is run. Later, to build the targets in the + updating phase, the actions are passed to the OS command shell, +@@ -365,7 +370,7 @@ +

Invoke a rule. A rule is invoked with values in + field1 through fieldN (9 max). They may be + referenced in the procedure's statements as $(1) +- through $(<9>N). $(<) and $(>) are synonymous ++ through $(N). $(<) and $(>) are synonymous + with $(1) and $(2). + +

+@@ -851,7 +856,7 @@ + +

Builds a direct dependency: makes each of targets1 + depend on each of targets2. Generally, targets1 +- will be rebuilt if targets2 are themselves rebuilt are ++ will be rebuilt if targets2 are themselves rebuilt + or are newer than targets1. + +

+@@ -1069,7 +1074,7 @@ + +

+ +- These two variable control header file scanning. $(HDRSCAN) is ++ These two variables control header file scanning. $(HDRSCAN) is + an egrep(1) pattern, with ()'s surrounding the file name, + used to find file inclusion statements in source files. Jambase + uses $(HDRPATTERN) as the pattern for $(HDRSCAN). $(HDRRULE) +diff -Naur jam-2.5/Jambase jam-2.5-p/Jambase +--- jam-2.5/Jambase 2003-04-23 06:45:49.000000000 +0200 ++++ jam-2.5-p/Jambase 2007-08-19 22:36:55.000000000 +0200 +@@ -541,7 +541,7 @@ + CRELIB ?= ; + DOT ?= . ; + DOTDOT ?= .. ; +- EXEMODE ?= 711 ; ++ EXEMODE ?= 755 ; + FILEMODE ?= 644 ; + FORTRAN ?= f77 ; + FORTRANFLAGS ?= ; +@@ -1129,7 +1129,7 @@ + + rule Setuid + { +- MODE on [ FAppendSuffix $(<) : $(SUFEXE) ] = 4711 ; ++ MODE on [ FAppendSuffix $(<) : $(SUFEXE) ] = 4755 ; + } + + rule Shell +@@ -1420,7 +1420,7 @@ + + rule UserObject + { +- Exit "Unknown suffix on" $(>) "- see UserObject rule in Jamfile(5)." ; ++ Exit "Unknown suffix on" $(>) "- see UserObject rule in /usr/share/doc/jam/Jamfile.html." ; + } + + rule Yacc +diff -Naur jam-2.5/Jamfile.html jam-2.5-p/Jamfile.html +--- jam-2.5/Jamfile.html 2003-04-23 06:45:50.000000000 +0200 ++++ jam-2.5-p/Jamfile.html 2007-08-19 22:36:55.000000000 +0200 +@@ -290,7 +290,7 @@ + for automatic customizing with autoconf(GNU). +

+

  • Optionally, set an environment variable pointing +- to the root directory of the srouce tree. The ++ to the root directory of the source tree. The + variable's name is left up to you, but in these + examples, we use TOP. + +diff -Naur jam-2.5/jambase.c jam-2.5-p/jambase.c +--- jam-2.5/jambase.c 2004-08-19 20:19:35.000000000 +0200 ++++ jam-2.5-p/jambase.c 2007-08-19 22:36:55.000000000 +0200 +@@ -333,7 +333,7 @@ + "CRELIB ?= ;\n", + "DOT ?= . ;\n", + "DOTDOT ?= .. ;\n", +-"EXEMODE ?= 711 ;\n", ++"EXEMODE ?= 755 ;\n", + "FILEMODE ?= 644 ;\n", + "FORTRAN ?= f77 ;\n", + "FORTRANFLAGS ?= ;\n", +@@ -702,7 +702,7 @@ + "}\n", + "rule Setuid\n", + "{\n", +-"MODE on [ FAppendSuffix $(<) : $(SUFEXE) ] = 4711 ;\n", ++"MODE on [ FAppendSuffix $(<) : $(SUFEXE) ] = 4755 ;\n", + "}\n", + "rule Shell\n", + "{\n", +@@ -816,7 +816,7 @@ + "}\n", + "rule UserObject\n", + "{\n", +-"Exit \"Unknown suffix on\" $(>) \"- see UserObject rule in Jamfile(5).\" ;\n", ++"Exit \"Unknown suffix on\" $(>) \"- see UserObject rule in /usr/share/doc/jam/Jamfile.html.\" ;\n", + "}\n", + "rule Yacc\n", + "{\n", +diff -Naur jam-2.5/jamgram.c jam-2.5-p/jamgram.c +--- jam-2.5/jamgram.c 2004-08-19 20:19:34.000000000 +0200 ++++ jam-2.5-p/jamgram.c 2007-08-19 22:36:56.000000000 +0200 +@@ -1,23 +1,161 @@ +-#ifndef lint +-static char const +-yyrcsid[] = "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28.2.1 2001/07/19 05:46:39 peter Exp $"; +-#endif +-#include +-#define YYBYACC 1 +-#define YYMAJOR 1 +-#define YYMINOR 9 +-#define YYLEX yylex() +-#define YYEMPTY -1 +-#define yyclearin (yychar=(YYEMPTY)) +-#define yyerrok (yyerrflag=0) +-#define YYRECOVERING() (yyerrflag!=0) +-#if defined(__cplusplus) || __STDC__ +-static int yygrowstack(void); +-#else +-static int yygrowstack(); +-#endif +-#define YYPREFIX "yy" +-#line 85 "jamgram.y" ++/* A Bison parser, made by GNU Bison 1.875a. */ ++ ++/* Skeleton parser for Yacc-like parsing with Bison, ++ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2, or (at your option) ++ any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place - Suite 330, ++ Boston, MA 02111-1307, USA. */ ++ ++/* As a special exception, when this file is copied by Bison into a ++ Bison output file, you may use that output file without restriction. ++ This special exception was added by the Free Software Foundation ++ in version 1.24 of Bison. */ ++ ++/* Written by Richard Stallman by simplifying the original so called ++ ``semantic'' parser. */ ++ ++/* All symbols defined below should begin with yy or YY, to avoid ++ infringing on user name space. This should be done even for local ++ variables, as they might otherwise be expanded by user macros. ++ There are some unavoidable exceptions within include files to ++ define necessary library symbols; they are noted "INFRINGES ON ++ USER NAME SPACE" below. */ ++ ++/* Identify Bison output. */ ++#define YYBISON 1 ++ ++/* Skeleton name. */ ++#define YYSKELETON_NAME "yacc.c" ++ ++/* Pure parsers. */ ++#define YYPURE 0 ++ ++/* Using locations. */ ++#define YYLSP_NEEDED 0 ++ ++ ++ ++/* Tokens. */ ++#ifndef YYTOKENTYPE ++# define YYTOKENTYPE ++ /* Put the tokens into the symbol table, so that GDB and other debuggers ++ know about them. */ ++ enum yytokentype { ++ _LANGLE_t = 258, ++ _LANGLE_EQUALS_t = 259, ++ _EQUALS_t = 260, ++ _RANGLE_t = 261, ++ _RANGLE_EQUALS_t = 262, ++ _BAR_t = 263, ++ _BARBAR_t = 264, ++ _SEMIC_t = 265, ++ _COLON_t = 266, ++ _BANG_t = 267, ++ _BANG_EQUALS_t = 268, ++ _QUESTION_EQUALS_t = 269, ++ _LPAREN_t = 270, ++ _RPAREN_t = 271, ++ _LBRACKET_t = 272, ++ _RBRACKET_t = 273, ++ _LBRACE_t = 274, ++ _RBRACE_t = 275, ++ _AMPER_t = 276, ++ _AMPERAMPER_t = 277, ++ _PLUS_EQUALS_t = 278, ++ ACTIONS_t = 279, ++ BIND_t = 280, ++ BREAK_t = 281, ++ CASE_t = 282, ++ CONTINUE_t = 283, ++ DEFAULT_t = 284, ++ ELSE_t = 285, ++ EXISTING_t = 286, ++ FOR_t = 287, ++ IF_t = 288, ++ IGNORE_t = 289, ++ IN_t = 290, ++ INCLUDE_t = 291, ++ LOCAL_t = 292, ++ MAXLINE_t = 293, ++ ON_t = 294, ++ PIECEMEAL_t = 295, ++ QUIETLY_t = 296, ++ RETURN_t = 297, ++ RULE_t = 298, ++ SWITCH_t = 299, ++ TOGETHER_t = 300, ++ UPDATED_t = 301, ++ WHILE_t = 302, ++ ARG = 303, ++ STRING = 304 ++ }; ++#endif ++#define _LANGLE_t 258 ++#define _LANGLE_EQUALS_t 259 ++#define _EQUALS_t 260 ++#define _RANGLE_t 261 ++#define _RANGLE_EQUALS_t 262 ++#define _BAR_t 263 ++#define _BARBAR_t 264 ++#define _SEMIC_t 265 ++#define _COLON_t 266 ++#define _BANG_t 267 ++#define _BANG_EQUALS_t 268 ++#define _QUESTION_EQUALS_t 269 ++#define _LPAREN_t 270 ++#define _RPAREN_t 271 ++#define _LBRACKET_t 272 ++#define _RBRACKET_t 273 ++#define _LBRACE_t 274 ++#define _RBRACE_t 275 ++#define _AMPER_t 276 ++#define _AMPERAMPER_t 277 ++#define _PLUS_EQUALS_t 278 ++#define ACTIONS_t 279 ++#define BIND_t 280 ++#define BREAK_t 281 ++#define CASE_t 282 ++#define CONTINUE_t 283 ++#define DEFAULT_t 284 ++#define ELSE_t 285 ++#define EXISTING_t 286 ++#define FOR_t 287 ++#define IF_t 288 ++#define IGNORE_t 289 ++#define IN_t 290 ++#define INCLUDE_t 291 ++#define LOCAL_t 292 ++#define MAXLINE_t 293 ++#define ON_t 294 ++#define PIECEMEAL_t 295 ++#define QUIETLY_t 296 ++#define RETURN_t 297 ++#define RULE_t 298 ++#define SWITCH_t 299 ++#define TOGETHER_t 300 ++#define UPDATED_t 301 ++#define WHILE_t 302 ++#define ARG 303 ++#define STRING 304 ++ ++ ++ ++ ++/* Copy the first part of user declarations. */ ++#line 84 "jamgram.y" ++ + #include "jam.h" + + #include "lists.h" +@@ -56,877 +194,1614 @@ + # define pnode( l,r ) parse_make( F0,l,r,P0,S0,S0,0 ) + # define psnode( s,l ) parse_make( F0,l,P0,P0,s,S0,0 ) + +-#line 60 "y.tab.c" +-#define YYERRCODE 256 +-#define _BANG_t 257 +-#define _BANG_EQUALS_t 258 +-#define _AMPER_t 259 +-#define _AMPERAMPER_t 260 +-#define _LPAREN_t 261 +-#define _RPAREN_t 262 +-#define _PLUS_EQUALS_t 263 +-#define _COLON_t 264 +-#define _SEMIC_t 265 +-#define _LANGLE_t 266 +-#define _LANGLE_EQUALS_t 267 +-#define _EQUALS_t 268 +-#define _RANGLE_t 269 +-#define _RANGLE_EQUALS_t 270 +-#define _QUESTION_EQUALS_t 271 +-#define _LBRACKET_t 272 +-#define _RBRACKET_t 273 +-#define ACTIONS_t 274 +-#define BIND_t 275 +-#define BREAK_t 276 +-#define CASE_t 277 +-#define CONTINUE_t 278 +-#define DEFAULT_t 279 +-#define ELSE_t 280 +-#define EXISTING_t 281 +-#define FOR_t 282 +-#define IF_t 283 +-#define IGNORE_t 284 +-#define IN_t 285 +-#define INCLUDE_t 286 +-#define LOCAL_t 287 +-#define MAXLINE_t 288 +-#define ON_t 289 +-#define PIECEMEAL_t 290 +-#define QUIETLY_t 291 +-#define RETURN_t 292 +-#define RULE_t 293 +-#define SWITCH_t 294 +-#define TOGETHER_t 295 +-#define UPDATED_t 296 +-#define WHILE_t 297 +-#define _LBRACE_t 298 +-#define _BAR_t 299 +-#define _BARBAR_t 300 +-#define _RBRACE_t 301 +-#define ARG 302 +-#define STRING 303 +-const short yylhs[] = { -1, +- 0, 0, 2, 2, 1, 1, 1, 1, 3, 3, +- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, +- 3, 3, 3, 13, 14, 3, 7, 7, 7, 7, +- 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, +- 9, 9, 9, 9, 8, 8, 15, 10, 10, 10, +- 6, 6, 4, 16, 16, 5, 18, 5, 17, 17, +- 17, 11, 11, 19, 19, 19, 19, 19, 19, 19, +- 12, 12, +-}; +-const short yylen[] = { 2, +- 0, 1, 0, 1, 1, 2, 4, 6, 3, 3, +- 3, 4, 6, 3, 3, 3, 7, 5, 5, 7, +- 5, 6, 3, 0, 0, 9, 1, 1, 1, 2, +- 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, +- 3, 3, 2, 3, 0, 2, 4, 0, 3, 1, +- 1, 3, 1, 0, 2, 1, 0, 4, 2, 4, +- 4, 0, 2, 1, 1, 1, 1, 1, 1, 2, +- 0, 2, +-}; +-const short yydefred[] = { 0, +- 57, 62, 54, 54, 0, 0, 54, 54, 0, 54, +- 0, 54, 0, 0, 56, 0, 2, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 4, 0, 6, 28, +- 27, 29, 0, 54, 0, 0, 54, 0, 54, 0, +- 69, 66, 0, 68, 67, 65, 64, 0, 63, 14, +- 55, 15, 54, 43, 0, 54, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 10, 0, 54, +- 23, 16, 0, 0, 0, 0, 9, 30, 0, 54, +- 11, 0, 0, 59, 58, 70, 54, 0, 0, 44, +- 42, 0, 0, 0, 34, 35, 0, 36, 37, 0, +- 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, +- 54, 52, 12, 54, 54, 72, 24, 0, 0, 0, +- 49, 0, 0, 18, 46, 21, 0, 61, 60, 0, +- 0, 0, 8, 22, 0, 13, 25, 17, 20, 47, +- 0, 26, +-}; +-const short yydgoto[] = { 16, +- 37, 38, 18, 45, 28, 46, 47, 118, 29, 84, +- 21, 98, 140, 151, 119, 23, 50, 20, 59, +-}; +-const short yysindex[] = { -40, +- 0, 0, 0, 0, -295, -233, 0, 0, -240, 0, +- -284, 0, -233, -40, 0, 0, 0, -40, -7, -241, +- 49, -242, -240, -232, -239, -233, -233, -231, -75, -220, +- -195, 34, -210, -243, -226, -59, 0, -223, 0, 0, +- 0, 0, -174, 0, -165, -164, 0, -240, 0, -173, +- 0, 0, -199, 0, 0, 0, 0, -166, 0, 0, +- 0, 0, 0, 0, -154, 0, -233, -233, -233, -233, +- -233, -233, -233, -233, -40, -233, -233, 0, -40, 0, +- 0, 0, -153, -179, -157, -40, 0, 0, -42, 0, +- 0, -144, -185, 0, 0, 0, 0, -171, -170, 0, +- 0, -54, 94, 94, 0, 0, -54, 0, 0, -160, +- 88, 88, 0, -140, -243, -40, -151, -139, -157, -134, +- 0, 0, 0, 0, 0, 0, 0, -40, -149, -40, +- 0, -131, -93, 0, 0, 0, -85, 0, 0, -121, +- -115, 34, 0, 0, -40, 0, 0, 0, 0, 0, +- -105, 0, +-}; +-const short yyrindex[] = { 197, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, -103, 0, 0, 0, 3, -235, 0, +- 0, 0, -110, 0, 0, 0, 0, -94, 0, 0, +- 0, 0, 0, -96, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, -246, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, -95, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, -103, 0, 0, 0, 4, 0, +- 0, 0, -84, 0, -79, -103, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, -202, -224, -176, 0, 0, -81, 0, 0, 0, +- -257, -209, 0, 0, -96, -103, 0, 0, -79, 0, +- 0, 0, 0, 0, 0, 0, 0, -103, 1, 4, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, -237, 0, 0, 0, 0, 0, +- 0, 0, +-}; +-const short yygindex[] = { 0, +- 26, -65, -32, 5, 2, -43, 131, 108, 66, 113, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, +-}; +-#define YYTABLESIZE 364 +-const short yytable[] = { 81, +- 19, 19, 5, 3, 40, 94, 25, 22, 24, 110, +- 32, 30, 31, 113, 33, 19, 35, 34, 51, 19, +- 120, 49, 60, 26, 61, 17, 51, 27, 54, 54, +- 1, 1, 62, 19, 38, 38, 54, 38, 1, 3, +- 40, 40, 40, 39, 78, 63, 122, 48, 89, 93, +- 132, 92, 41, 66, 82, 33, 33, 33, 83, 33, +- 15, 15, 141, 3, 143, 33, 54, 99, 15, 79, +- 101, 85, 80, 38, 38, 38, 19, 87, 36, 150, +- 19, 139, 39, 39, 114, 39, 1, 19, 41, 41, +- 41, 64, 65, 88, 125, 33, 33, 33, 90, 95, +- 91, 126, 96, 67, 68, 69, 124, 100, 97, 149, +- 115, 70, 71, 72, 73, 74, 15, 19, 116, 117, +- 123, 39, 39, 39, 130, 137, 127, 128, 138, 19, +- 142, 19, 102, 103, 104, 105, 106, 107, 108, 109, +- 129, 111, 112, 19, 76, 77, 19, 53, 53, 53, +- 133, 53, 53, 53, 53, 53, 53, 53, 53, 53, +- 53, 134, 53, 31, 31, 31, 136, 31, 53, 144, +- 145, 31, 31, 31, 31, 31, 32, 32, 32, 146, +- 32, 147, 67, 68, 69, 148, 32, 53, 53, 53, +- 70, 71, 72, 73, 74, 152, 1, 3, 67, 68, +- 69, 48, 71, 31, 31, 31, 70, 71, 72, 73, +- 74, 70, 71, 50, 73, 74, 32, 32, 32, 121, +- 40, 45, 75, 76, 77, 41, 135, 131, 42, 0, +- 0, 1, 0, 2, 0, 3, 43, 4, 86, 76, +- 77, 5, 6, 0, 0, 7, 8, 0, 9, 0, +- 0, 10, 11, 12, 0, 40, 13, 14, 0, 0, +- 41, 15, 0, 42, 0, 0, 0, 0, 0, 0, +- 0, 43, 19, 0, 19, 0, 19, 19, 19, 5, +- 3, 44, 19, 19, 0, 0, 19, 19, 0, 19, +- 0, 0, 19, 19, 19, 0, 0, 19, 19, 0, +- 0, 19, 19, 5, 3, 1, 0, 2, 0, 3, +- 0, 4, 0, 0, 0, 5, 6, 0, 0, 7, +- 0, 0, 9, 0, 0, 10, 11, 12, 0, 51, +- 13, 14, 52, 0, 0, 15, 53, 0, 54, 55, +- 0, 0, 0, 56, 57, 67, 68, 69, 0, 0, +- 58, 67, 0, 70, 71, 72, 73, 74, 0, 70, +- 71, 72, 73, 74, +-}; +-const short yycheck[] = { 32, +- 0, 0, 0, 0, 262, 49, 302, 3, 4, 75, +- 9, 7, 8, 79, 10, 14, 12, 302, 265, 18, +- 86, 20, 265, 257, 23, 0, 273, 261, 264, 265, +- 272, 272, 265, 32, 259, 260, 272, 262, 272, 277, +- 298, 299, 300, 18, 265, 285, 90, 289, 44, 48, +- 116, 47, 262, 285, 265, 258, 259, 260, 302, 262, +- 302, 302, 128, 301, 130, 268, 302, 63, 302, 265, +- 66, 298, 268, 298, 299, 300, 75, 301, 13, 145, +- 79, 125, 259, 260, 80, 262, 272, 86, 298, 299, +- 300, 26, 27, 268, 93, 298, 299, 300, 264, 273, +- 265, 97, 302, 258, 259, 260, 292, 262, 275, 142, +- 264, 266, 267, 268, 269, 270, 302, 116, 298, 277, +- 265, 298, 299, 300, 265, 121, 298, 298, 124, 128, +- 280, 130, 67, 68, 69, 70, 71, 72, 73, 74, +- 301, 76, 77, 142, 299, 300, 145, 258, 259, 260, +- 302, 262, 263, 264, 265, 266, 267, 268, 269, 270, +- 271, 301, 273, 258, 259, 260, 301, 262, 279, 301, +- 264, 266, 267, 268, 269, 270, 258, 259, 260, 265, +- 262, 303, 258, 259, 260, 301, 268, 298, 299, 300, +- 266, 267, 268, 269, 270, 301, 0, 301, 258, 259, +- 260, 298, 298, 298, 299, 300, 266, 267, 268, 269, +- 270, 266, 267, 298, 269, 270, 298, 299, 300, 89, +- 263, 301, 298, 299, 300, 268, 119, 115, 271, -1, +- -1, 272, -1, 274, -1, 276, 279, 278, 298, 299, +- 300, 282, 283, -1, -1, 286, 287, -1, 289, -1, +- -1, 292, 293, 294, -1, 263, 297, 298, -1, -1, +- 268, 302, -1, 271, -1, -1, -1, -1, -1, -1, +- -1, 279, 272, -1, 274, -1, 276, 277, 278, 277, +- 277, 289, 282, 283, -1, -1, 286, 287, -1, 289, +- -1, -1, 292, 293, 294, -1, -1, 297, 298, -1, +- -1, 301, 302, 301, 301, 272, -1, 274, -1, 276, +- -1, 278, -1, -1, -1, 282, 283, -1, -1, 286, +- -1, -1, 289, -1, -1, 292, 293, 294, -1, 281, +- 297, 298, 284, -1, -1, 302, 288, -1, 290, 291, +- -1, -1, -1, 295, 296, 258, 259, 260, -1, -1, +- 302, 258, -1, 266, 267, 268, 269, 270, -1, 266, +- 267, 268, 269, 270, +-}; +-#define YYFINAL 16 ++ ++ ++/* Enabling traces. */ + #ifndef YYDEBUG +-#define YYDEBUG 0 ++# define YYDEBUG 0 + #endif +-#define YYMAXTOKEN 303 +-#if YYDEBUG +-const char * const yyname[] = { +-"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"_BANG_t","_BANG_EQUALS_t", +-"_AMPER_t","_AMPERAMPER_t","_LPAREN_t","_RPAREN_t","_PLUS_EQUALS_t","_COLON_t", +-"_SEMIC_t","_LANGLE_t","_LANGLE_EQUALS_t","_EQUALS_t","_RANGLE_t", +-"_RANGLE_EQUALS_t","_QUESTION_EQUALS_t","_LBRACKET_t","_RBRACKET_t","ACTIONS_t", +-"BIND_t","BREAK_t","CASE_t","CONTINUE_t","DEFAULT_t","ELSE_t","EXISTING_t", +-"FOR_t","IF_t","IGNORE_t","IN_t","INCLUDE_t","LOCAL_t","MAXLINE_t","ON_t", +-"PIECEMEAL_t","QUIETLY_t","RETURN_t","RULE_t","SWITCH_t","TOGETHER_t", +-"UPDATED_t","WHILE_t","_LBRACE_t","_BAR_t","_BARBAR_t","_RBRACE_t","ARG", +-"STRING", +-}; +-const char * const yyrule[] = { +-"$accept : run", +-"run :", +-"run : rules", +-"block :", +-"block : rules", +-"rules : rule", +-"rules : rule rules", +-"rules : LOCAL_t list _SEMIC_t block", +-"rules : LOCAL_t list _EQUALS_t list _SEMIC_t block", +-"rule : _LBRACE_t block _RBRACE_t", +-"rule : INCLUDE_t list _SEMIC_t", +-"rule : arg lol _SEMIC_t", +-"rule : arg assign list _SEMIC_t", +-"rule : arg ON_t list assign list _SEMIC_t", +-"rule : BREAK_t list _SEMIC_t", +-"rule : CONTINUE_t list _SEMIC_t", +-"rule : RETURN_t list _SEMIC_t", +-"rule : FOR_t ARG IN_t list _LBRACE_t block _RBRACE_t", +-"rule : SWITCH_t list _LBRACE_t cases _RBRACE_t", +-"rule : IF_t expr _LBRACE_t block _RBRACE_t", +-"rule : IF_t expr _LBRACE_t block _RBRACE_t ELSE_t rule", +-"rule : WHILE_t expr _LBRACE_t block _RBRACE_t", +-"rule : RULE_t ARG params _LBRACE_t block _RBRACE_t", +-"rule : ON_t arg rule", +-"$$1 :", +-"$$2 :", +-"rule : ACTIONS_t eflags ARG bindlist _LBRACE_t $$1 STRING $$2 _RBRACE_t", +-"assign : _EQUALS_t", +-"assign : _PLUS_EQUALS_t", +-"assign : _QUESTION_EQUALS_t", +-"assign : DEFAULT_t _EQUALS_t", +-"expr : arg", +-"expr : expr _EQUALS_t expr", +-"expr : expr _BANG_EQUALS_t expr", +-"expr : expr _LANGLE_t expr", +-"expr : expr _LANGLE_EQUALS_t expr", +-"expr : expr _RANGLE_t expr", +-"expr : expr _RANGLE_EQUALS_t expr", +-"expr : expr _AMPER_t expr", +-"expr : expr _AMPERAMPER_t expr", +-"expr : expr _BAR_t expr", +-"expr : expr _BARBAR_t expr", +-"expr : arg IN_t list", +-"expr : _BANG_t expr", +-"expr : _LPAREN_t expr _RPAREN_t", +-"cases :", +-"cases : case cases", +-"case : CASE_t ARG _COLON_t block", +-"params :", +-"params : ARG _COLON_t params", +-"params : ARG", +-"lol : list", +-"lol : list _COLON_t lol", +-"list : listp", +-"listp :", +-"listp : listp arg", +-"arg : ARG", +-"$$3 :", +-"arg : _LBRACKET_t $$3 func _RBRACKET_t", +-"func : arg lol", +-"func : ON_t arg arg lol", +-"func : ON_t arg RETURN_t list", +-"eflags :", +-"eflags : eflags eflag", +-"eflag : UPDATED_t", +-"eflag : TOGETHER_t", +-"eflag : IGNORE_t", +-"eflag : QUIETLY_t", +-"eflag : PIECEMEAL_t", +-"eflag : EXISTING_t", +-"eflag : MAXLINE_t ARG", +-"bindlist :", +-"bindlist : BIND_t list", +-}; ++ ++/* Enabling verbose error messages. */ ++#ifdef YYERROR_VERBOSE ++# undef YYERROR_VERBOSE ++# define YYERROR_VERBOSE 1 ++#else ++# define YYERROR_VERBOSE 0 + #endif +-#ifndef YYSTYPE ++ ++#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) + typedef int YYSTYPE; ++# define yystype YYSTYPE /* obsolescent; will be withdrawn */ ++# define YYSTYPE_IS_DECLARED 1 ++# define YYSTYPE_IS_TRIVIAL 1 + #endif ++ ++ ++ ++/* Copy the second part of user declarations. */ ++ ++ ++/* Line 214 of yacc.c. */ ++#line 226 "y.tab.c" ++ ++#if ! defined (yyoverflow) || YYERROR_VERBOSE ++ ++/* The parser invokes alloca or malloc; define the necessary symbols. */ ++ ++# if YYSTACK_USE_ALLOCA ++# define YYSTACK_ALLOC alloca ++# else ++# ifndef YYSTACK_USE_ALLOCA ++# if defined (alloca) || defined (_ALLOCA_H) ++# define YYSTACK_ALLOC alloca ++# else ++# ifdef __GNUC__ ++# define YYSTACK_ALLOC __builtin_alloca ++# endif ++# endif ++# endif ++# endif ++ ++# ifdef YYSTACK_ALLOC ++ /* Pacify GCC's `empty if-body' warning. */ ++# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) ++# else ++# if defined (__STDC__) || defined (__cplusplus) ++# include /* INFRINGES ON USER NAME SPACE */ ++# define YYSIZE_T size_t ++# endif ++# define YYSTACK_ALLOC malloc ++# define YYSTACK_FREE free ++# endif ++#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ ++ ++ ++#if (! defined (yyoverflow) \ ++ && (! defined (__cplusplus) \ ++ || (YYSTYPE_IS_TRIVIAL))) ++ ++/* A type that is properly aligned for any stack member. */ ++union yyalloc ++{ ++ short yyss; ++ YYSTYPE yyvs; ++ }; ++ ++/* The size of the maximum gap between one aligned stack and the next. */ ++# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) ++ ++/* The size of an array large to enough to hold all stacks, each with ++ N elements. */ ++# define YYSTACK_BYTES(N) \ ++ ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ ++ + YYSTACK_GAP_MAXIMUM) ++ ++/* Copy COUNT objects from FROM to TO. The source and destination do ++ not overlap. */ ++# ifndef YYCOPY ++# if 1 < __GNUC__ ++# define YYCOPY(To, From, Count) \ ++ __builtin_memcpy (To, From, (Count) * sizeof (*(From))) ++# else ++# define YYCOPY(To, From, Count) \ ++ do \ ++ { \ ++ register YYSIZE_T yyi; \ ++ for (yyi = 0; yyi < (Count); yyi++) \ ++ (To)[yyi] = (From)[yyi]; \ ++ } \ ++ while (0) ++# endif ++# endif ++ ++/* Relocate STACK from its old location to the new one. The ++ local variables YYSIZE and YYSTACKSIZE give the old and new number of ++ elements in the stack, and YYPTR gives the new location of the ++ stack. Advance YYPTR to a properly aligned location for the next ++ stack. */ ++# define YYSTACK_RELOCATE(Stack) \ ++ do \ ++ { \ ++ YYSIZE_T yynewbytes; \ ++ YYCOPY (&yyptr->Stack, Stack, yysize); \ ++ Stack = &yyptr->Stack; \ ++ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ ++ yyptr += yynewbytes / sizeof (*yyptr); \ ++ } \ ++ while (0) ++ ++#endif ++ ++#if defined (__STDC__) || defined (__cplusplus) ++ typedef signed char yysigned_char; ++#else ++ typedef short yysigned_char; ++#endif ++ ++/* YYFINAL -- State number of the termination state. */ ++#define YYFINAL 39 ++/* YYLAST -- Last index in YYTABLE. */ ++#define YYLAST 250 ++ ++/* YYNTOKENS -- Number of terminals. */ ++#define YYNTOKENS 50 ++/* YYNNTS -- Number of nonterminals. */ ++#define YYNNTS 21 ++/* YYNRULES -- Number of rules. */ ++#define YYNRULES 73 ++/* YYNRULES -- Number of states. */ ++#define YYNSTATES 154 ++ ++/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ ++#define YYUNDEFTOK 2 ++#define YYMAXUTOK 304 ++ ++#define YYTRANSLATE(YYX) \ ++ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) ++ ++/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ ++static const unsigned char yytranslate[] = ++{ ++ 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, ++ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, ++ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, ++ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, ++ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, ++ 45, 46, 47, 48, 49 ++}; ++ + #if YYDEBUG +-#include ++/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in ++ YYRHS. */ ++static const unsigned char yyprhs[] = ++{ ++ 0, 0, 3, 4, 6, 7, 9, 11, 14, 19, ++ 26, 30, 34, 38, 43, 50, 54, 58, 62, 70, ++ 76, 82, 90, 96, 103, 107, 108, 109, 119, 121, ++ 123, 125, 128, 130, 134, 138, 142, 146, 150, 154, ++ 158, 162, 166, 170, 174, 177, 181, 182, 185, 190, ++ 191, 195, 197, 199, 203, 205, 206, 209, 211, 212, ++ 217, 220, 225, 230, 231, 234, 236, 238, 240, 242, ++ 244, 246, 249, 250 ++}; ++ ++/* YYRHS -- A `-1'-separated list of the rules' RHS. */ ++static const yysigned_char yyrhs[] = ++{ ++ 51, 0, -1, -1, 53, -1, -1, 53, -1, 54, ++ -1, 54, 53, -1, 37, 63, 10, 52, -1, 37, ++ 63, 5, 63, 10, 52, -1, 19, 52, 20, -1, ++ 36, 63, 10, -1, 65, 62, 10, -1, 65, 57, ++ 63, 10, -1, 65, 39, 63, 57, 63, 10, -1, ++ 26, 63, 10, -1, 28, 63, 10, -1, 42, 63, ++ 10, -1, 32, 48, 35, 63, 19, 52, 20, -1, ++ 44, 63, 19, 59, 20, -1, 33, 58, 19, 52, ++ 20, -1, 33, 58, 19, 52, 20, 30, 54, -1, ++ 47, 58, 19, 52, 20, -1, 43, 48, 61, 19, ++ 52, 20, -1, 39, 65, 54, -1, -1, -1, 24, ++ 68, 48, 70, 19, 55, 49, 56, 20, -1, 5, ++ -1, 23, -1, 14, -1, 29, 5, -1, 65, -1, ++ 58, 5, 58, -1, 58, 13, 58, -1, 58, 3, ++ 58, -1, 58, 4, 58, -1, 58, 6, 58, -1, ++ 58, 7, 58, -1, 58, 21, 58, -1, 58, 22, ++ 58, -1, 58, 8, 58, -1, 58, 9, 58, -1, ++ 65, 35, 63, -1, 12, 58, -1, 15, 58, 16, ++ -1, -1, 60, 59, -1, 27, 48, 11, 52, -1, ++ -1, 48, 11, 61, -1, 48, -1, 63, -1, 63, ++ 11, 62, -1, 64, -1, -1, 64, 65, -1, 48, ++ -1, -1, 17, 66, 67, 18, -1, 65, 62, -1, ++ 39, 65, 65, 62, -1, 39, 65, 42, 63, -1, ++ -1, 68, 69, -1, 46, -1, 45, -1, 34, -1, ++ 41, -1, 40, -1, 31, -1, 38, 48, -1, -1, ++ 25, 63, -1 ++}; ++ ++/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ ++static const unsigned short yyrline[] = ++{ ++ 0, 127, 127, 129, 141, 142, 146, 148, 150, 152, ++ 156, 158, 160, 162, 164, 166, 168, 170, 172, 174, ++ 176, 178, 180, 182, 184, 187, 189, 186, 198, 200, ++ 202, 204, 212, 214, 216, 218, 220, 222, 224, 226, ++ 228, 230, 232, 234, 236, 238, 249, 250, 254, 264, ++ 265, 267, 276, 278, 288, 293, 294, 298, 300, 300, ++ 309, 311, 313, 323, 324, 328, 330, 332, 334, 336, ++ 338, 340, 350, 351 ++}; ++#endif ++ ++#if YYDEBUG || YYERROR_VERBOSE ++/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. ++ First, the terminals, then, starting at YYNTOKENS, nonterminals. */ ++static const char *const yytname[] = ++{ ++ "$end", "error", "$undefined", "_LANGLE_t", "_LANGLE_EQUALS_t", ++ "_EQUALS_t", "_RANGLE_t", "_RANGLE_EQUALS_t", "_BAR_t", "_BARBAR_t", ++ "_SEMIC_t", "_COLON_t", "_BANG_t", "_BANG_EQUALS_t", ++ "_QUESTION_EQUALS_t", "_LPAREN_t", "_RPAREN_t", "_LBRACKET_t", ++ "_RBRACKET_t", "_LBRACE_t", "_RBRACE_t", "_AMPER_t", "_AMPERAMPER_t", ++ "_PLUS_EQUALS_t", "ACTIONS_t", "BIND_t", "BREAK_t", "CASE_t", ++ "CONTINUE_t", "DEFAULT_t", "ELSE_t", "EXISTING_t", "FOR_t", "IF_t", ++ "IGNORE_t", "IN_t", "INCLUDE_t", "LOCAL_t", "MAXLINE_t", "ON_t", ++ "PIECEMEAL_t", "QUIETLY_t", "RETURN_t", "RULE_t", "SWITCH_t", ++ "TOGETHER_t", "UPDATED_t", "WHILE_t", "ARG", "STRING", "$accept", "run", ++ "block", "rules", "rule", "@1", "@2", "assign", "expr", "cases", "case", ++ "params", "lol", "list", "listp", "arg", "@3", "func", "eflags", ++ "eflag", "bindlist", 0 ++}; + #endif +-#ifdef YYSTACKSIZE +-#undef YYMAXDEPTH +-#define YYMAXDEPTH YYSTACKSIZE ++ ++# ifdef YYPRINT ++/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to ++ token YYLEX-NUM. */ ++static const unsigned short yytoknum[] = ++{ ++ 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, ++ 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, ++ 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, ++ 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, ++ 295, 296, 297, 298, 299, 300, 301, 302, 303, 304 ++}; ++# endif ++ ++/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ ++static const unsigned char yyr1[] = ++{ ++ 0, 50, 51, 51, 52, 52, 53, 53, 53, 53, ++ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, ++ 54, 54, 54, 54, 54, 55, 56, 54, 57, 57, ++ 57, 57, 58, 58, 58, 58, 58, 58, 58, 58, ++ 58, 58, 58, 58, 58, 58, 59, 59, 60, 61, ++ 61, 61, 62, 62, 63, 64, 64, 65, 66, 65, ++ 67, 67, 67, 68, 68, 69, 69, 69, 69, 69, ++ 69, 69, 70, 70 ++}; ++ ++/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ ++static const unsigned char yyr2[] = ++{ ++ 0, 2, 0, 1, 0, 1, 1, 2, 4, 6, ++ 3, 3, 3, 4, 6, 3, 3, 3, 7, 5, ++ 5, 7, 5, 6, 3, 0, 0, 9, 1, 1, ++ 1, 2, 1, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 2, 3, 0, 2, 4, 0, ++ 3, 1, 1, 3, 1, 0, 2, 1, 0, 4, ++ 2, 4, 4, 0, 2, 1, 1, 1, 1, 1, ++ 1, 2, 0, 2 ++}; ++ ++/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state ++ STATE-NUM when YYTABLE doesn't specify something else to do. Zero ++ means the default is an error. */ ++static const unsigned char yydefact[] = ++{ ++ 2, 58, 4, 63, 55, 55, 0, 0, 55, 55, ++ 0, 55, 0, 55, 0, 57, 0, 3, 6, 55, ++ 0, 0, 5, 0, 0, 54, 0, 0, 0, 0, ++ 0, 32, 0, 0, 0, 0, 49, 0, 0, 1, ++ 7, 28, 30, 29, 0, 55, 55, 0, 52, 0, ++ 55, 0, 10, 70, 67, 0, 69, 68, 66, 65, ++ 72, 64, 15, 56, 16, 55, 44, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 4, 0, 0, 55, ++ 11, 55, 4, 24, 17, 51, 0, 46, 4, 31, ++ 0, 0, 12, 55, 0, 60, 59, 71, 55, 0, ++ 0, 45, 35, 36, 33, 37, 38, 41, 42, 34, ++ 0, 39, 40, 43, 0, 8, 49, 4, 0, 0, ++ 46, 0, 55, 13, 53, 55, 55, 73, 25, 4, ++ 20, 4, 50, 0, 0, 19, 47, 22, 0, 62, ++ 61, 0, 0, 0, 9, 23, 4, 14, 26, 18, ++ 21, 48, 0, 27 ++}; ++ ++/* YYDEFGOTO[NTERM-NUM]. */ ++static const short yydefgoto[] = ++{ ++ -1, 16, 21, 22, 18, 141, 152, 46, 30, 119, ++ 120, 86, 47, 48, 25, 31, 20, 51, 23, 61, ++ 99 ++}; ++ ++/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing ++ STATE-NUM. */ ++#define YYPACT_NINF -48 ++static const short yypact[] = ++{ ++ 130, -48, 130, -48, -48, -48, -43, -8, -48, -48, ++ 7, -48, -17, -48, -8, -48, 15, -48, 130, 9, ++ -11, 23, -48, 151, 31, 7, 35, 12, -8, -8, ++ 53, 16, 42, 17, 162, 59, 22, 44, 208, -48, ++ -48, -48, -48, -48, 72, -48, -48, 68, 69, 7, ++ -48, 66, -48, -48, -48, 38, -48, -48, -48, -48, ++ 65, -48, -48, -48, -48, -48, -48, 228, -8, -8, ++ -8, -8, -8, -8, -8, -8, 130, -8, -8, -48, ++ -48, -48, 130, -48, -48, 80, 73, 70, 130, -48, ++ 21, 83, -48, -48, -9, -48, -48, -48, -48, 79, ++ 88, -48, -48, -48, 61, -48, -48, 98, 98, 61, ++ 89, 109, 109, -48, 108, -48, 22, 130, 51, 101, ++ 70, 103, -48, -48, -48, -48, -48, -48, -48, 130, ++ 78, 130, -48, 104, 114, -48, -48, -48, 116, -48, ++ -48, 85, 107, 162, -48, -48, 130, -48, -48, -48, ++ -48, -48, 112, -48 ++}; ++ ++/* YYPGOTO[NTERM-NUM]. */ ++static const yysigned_char yypgoto[] = ++{ ++ -48, -48, -46, 11, -33, -48, -48, 58, 67, 30, ++ -48, 36, -47, 8, -48, 0, -48, -48, -48, -48, ++ -48 ++}; ++ ++/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If ++ positive, shift that token. If negative, reduce the rule which ++ number is the opposite. If zero, do what YYDEFACT says. ++ If YYTABLE_NINF, syntax error. */ ++#define YYTABLE_NINF -1 ++static const unsigned char yytable[] = ++{ ++ 19, 83, 19, 95, 28, 27, 1, 29, 1, 1, ++ 34, 17, 24, 26, 41, 39, 32, 33, 19, 35, ++ 50, 37, 81, 42, 1, 63, 41, 82, 49, 40, ++ 110, 36, 43, 125, 19, 42, 115, 15, 44, 15, ++ 15, 62, 121, 52, 43, 64, 124, 65, 45, 94, ++ 44, 79, 80, 90, 91, 15, 68, 69, 70, 71, ++ 72, 73, 74, 87, 68, 69, 75, 71, 72, 84, ++ 85, 133, 76, 100, 77, 78, 19, 89, 92, 140, ++ 93, 38, 19, 142, 96, 144, 97, 113, 19, 114, ++ 98, 116, 117, 123, 126, 66, 67, 118, 128, 134, ++ 151, 68, 69, 70, 71, 72, 127, 129, 143, 130, ++ 150, 75, 68, 69, 70, 71, 72, 19, 131, 77, ++ 78, 135, 75, 137, 145, 146, 147, 149, 0, 19, ++ 138, 19, 153, 139, 148, 102, 103, 104, 105, 106, ++ 107, 108, 109, 19, 111, 112, 19, 1, 122, 2, ++ 136, 0, 132, 0, 3, 0, 4, 0, 5, 0, ++ 0, 0, 6, 7, 0, 0, 8, 9, 0, 10, ++ 0, 0, 11, 12, 13, 0, 0, 14, 15, 1, ++ 0, 2, 53, 0, 0, 54, 3, 0, 4, 55, ++ 5, 56, 57, 0, 6, 7, 58, 59, 8, 60, ++ 0, 10, 0, 0, 11, 12, 13, 0, 0, 14, ++ 15, 68, 69, 70, 71, 72, 73, 74, 0, 0, ++ 0, 75, 0, 0, 0, 0, 0, 88, 0, 77, ++ 78, 68, 69, 70, 71, 72, 73, 74, 0, 0, ++ 0, 75, 0, 0, 101, 0, 0, 0, 0, 77, ++ 78 ++}; ++ ++static const short yycheck[] = ++{ ++ 0, 34, 2, 50, 12, 48, 17, 15, 17, 17, ++ 10, 0, 4, 5, 5, 0, 8, 9, 18, 11, ++ 20, 13, 5, 14, 17, 25, 5, 10, 39, 18, ++ 76, 48, 23, 42, 34, 14, 82, 48, 29, 48, ++ 48, 10, 88, 20, 23, 10, 93, 35, 39, 49, ++ 29, 35, 10, 45, 46, 48, 3, 4, 5, 6, ++ 7, 8, 9, 19, 3, 4, 13, 6, 7, 10, ++ 48, 117, 19, 65, 21, 22, 76, 5, 10, 126, ++ 11, 14, 82, 129, 18, 131, 48, 79, 88, 81, ++ 25, 11, 19, 10, 94, 28, 29, 27, 19, 48, ++ 146, 3, 4, 5, 6, 7, 98, 19, 30, 20, ++ 143, 13, 3, 4, 5, 6, 7, 117, 10, 21, ++ 22, 20, 13, 20, 20, 11, 10, 20, -1, 129, ++ 122, 131, 20, 125, 49, 68, 69, 70, 71, 72, ++ 73, 74, 75, 143, 77, 78, 146, 17, 90, 19, ++ 120, -1, 116, -1, 24, -1, 26, -1, 28, -1, ++ -1, -1, 32, 33, -1, -1, 36, 37, -1, 39, ++ -1, -1, 42, 43, 44, -1, -1, 47, 48, 17, ++ -1, 19, 31, -1, -1, 34, 24, -1, 26, 38, ++ 28, 40, 41, -1, 32, 33, 45, 46, 36, 48, ++ -1, 39, -1, -1, 42, 43, 44, -1, -1, 47, ++ 48, 3, 4, 5, 6, 7, 8, 9, -1, -1, ++ -1, 13, -1, -1, -1, -1, -1, 19, -1, 21, ++ 22, 3, 4, 5, 6, 7, 8, 9, -1, -1, ++ -1, 13, -1, -1, 16, -1, -1, -1, -1, 21, ++ 22 ++}; ++ ++/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing ++ symbol of state STATE-NUM. */ ++static const unsigned char yystos[] = ++{ ++ 0, 17, 19, 24, 26, 28, 32, 33, 36, 37, ++ 39, 42, 43, 44, 47, 48, 51, 53, 54, 65, ++ 66, 52, 53, 68, 63, 64, 63, 48, 12, 15, ++ 58, 65, 63, 63, 65, 63, 48, 63, 58, 0, ++ 53, 5, 14, 23, 29, 39, 57, 62, 63, 39, ++ 65, 67, 20, 31, 34, 38, 40, 41, 45, 46, ++ 48, 69, 10, 65, 10, 35, 58, 58, 3, 4, ++ 5, 6, 7, 8, 9, 13, 19, 21, 22, 35, ++ 10, 5, 10, 54, 10, 48, 61, 19, 19, 5, ++ 63, 63, 10, 11, 65, 62, 18, 48, 25, 70, ++ 63, 16, 58, 58, 58, 58, 58, 58, 58, 58, ++ 52, 58, 58, 63, 63, 52, 11, 19, 27, 59, ++ 60, 52, 57, 10, 62, 42, 65, 63, 19, 19, ++ 20, 10, 61, 52, 48, 20, 59, 20, 63, 63, ++ 62, 55, 52, 30, 52, 20, 11, 10, 49, 20, ++ 54, 52, 56, 20 ++}; ++ ++#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) ++# define YYSIZE_T __SIZE_TYPE__ ++#endif ++#if ! defined (YYSIZE_T) && defined (size_t) ++# define YYSIZE_T size_t ++#endif ++#if ! defined (YYSIZE_T) ++# if defined (__STDC__) || defined (__cplusplus) ++# include /* INFRINGES ON USER NAME SPACE */ ++# define YYSIZE_T size_t ++# endif ++#endif ++#if ! defined (YYSIZE_T) ++# define YYSIZE_T unsigned int ++#endif ++ ++#define yyerrok (yyerrstatus = 0) ++#define yyclearin (yychar = YYEMPTY) ++#define YYEMPTY (-2) ++#define YYEOF 0 ++ ++#define YYACCEPT goto yyacceptlab ++#define YYABORT goto yyabortlab ++#define YYERROR goto yyerrlab1 ++ ++ ++/* Like YYERROR except do call yyerror. This remains here temporarily ++ to ease the transition to the new meaning of YYERROR, for GCC. ++ Once GCC version 2 has supplanted version 1, this can go. */ ++ ++#define YYFAIL goto yyerrlab ++ ++#define YYRECOVERING() (!!yyerrstatus) ++ ++#define YYBACKUP(Token, Value) \ ++do \ ++ if (yychar == YYEMPTY && yylen == 1) \ ++ { \ ++ yychar = (Token); \ ++ yylval = (Value); \ ++ yytoken = YYTRANSLATE (yychar); \ ++ YYPOPSTACK; \ ++ goto yybackup; \ ++ } \ ++ else \ ++ { \ ++ yyerror ("syntax error: cannot back up");\ ++ YYERROR; \ ++ } \ ++while (0) ++ ++#define YYTERROR 1 ++#define YYERRCODE 256 ++ ++/* YYLLOC_DEFAULT -- Compute the default location (before the actions ++ are run). */ ++ ++#ifndef YYLLOC_DEFAULT ++# define YYLLOC_DEFAULT(Current, Rhs, N) \ ++ Current.first_line = Rhs[1].first_line; \ ++ Current.first_column = Rhs[1].first_column; \ ++ Current.last_line = Rhs[N].last_line; \ ++ Current.last_column = Rhs[N].last_column; ++#endif ++ ++/* YYLEX -- calling `yylex' with the right arguments. */ ++ ++#ifdef YYLEX_PARAM ++# define YYLEX yylex (YYLEX_PARAM) + #else +-#ifdef YYMAXDEPTH +-#define YYSTACKSIZE YYMAXDEPTH ++# define YYLEX yylex () ++#endif ++ ++/* Enable debugging if requested. */ ++#if YYDEBUG ++ ++# ifndef YYFPRINTF ++# include /* INFRINGES ON USER NAME SPACE */ ++# define YYFPRINTF fprintf ++# endif ++ ++# define YYDPRINTF(Args) \ ++do { \ ++ if (yydebug) \ ++ YYFPRINTF Args; \ ++} while (0) ++ ++# define YYDSYMPRINT(Args) \ ++do { \ ++ if (yydebug) \ ++ yysymprint Args; \ ++} while (0) ++ ++# define YYDSYMPRINTF(Title, Token, Value, Location) \ ++do { \ ++ if (yydebug) \ ++ { \ ++ YYFPRINTF (stderr, "%s ", Title); \ ++ yysymprint (stderr, \ ++ Token, Value); \ ++ YYFPRINTF (stderr, "\n"); \ ++ } \ ++} while (0) ++ ++/*------------------------------------------------------------------. ++| yy_stack_print -- Print the state stack from its BOTTOM up to its | ++| TOP (cinluded). | ++`------------------------------------------------------------------*/ ++ ++#if defined (__STDC__) || defined (__cplusplus) ++static void ++yy_stack_print (short *bottom, short *top) + #else +-#define YYSTACKSIZE 10000 +-#define YYMAXDEPTH 10000 ++static void ++yy_stack_print (bottom, top) ++ short *bottom; ++ short *top; + #endif ++{ ++ YYFPRINTF (stderr, "Stack now"); ++ for (/* Nothing. */; bottom <= top; ++bottom) ++ YYFPRINTF (stderr, " %d", *bottom); ++ YYFPRINTF (stderr, "\n"); ++} ++ ++# define YY_STACK_PRINT(Bottom, Top) \ ++do { \ ++ if (yydebug) \ ++ yy_stack_print ((Bottom), (Top)); \ ++} while (0) ++ ++ ++/*------------------------------------------------. ++| Report that the YYRULE is going to be reduced. | ++`------------------------------------------------*/ ++ ++#if defined (__STDC__) || defined (__cplusplus) ++static void ++yy_reduce_print (int yyrule) ++#else ++static void ++yy_reduce_print (yyrule) ++ int yyrule; + #endif +-#define YYINITSTACKSIZE 200 ++{ ++ int yyi; ++ unsigned int yylineno = yyrline[yyrule]; ++ YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", ++ yyrule - 1, yylineno); ++ /* Print the symbols being reduced, and their result. */ ++ for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) ++ YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); ++ YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]); ++} ++ ++# define YY_REDUCE_PRINT(Rule) \ ++do { \ ++ if (yydebug) \ ++ yy_reduce_print (Rule); \ ++} while (0) ++ ++/* Nonzero means print parse trace. It is left uninitialized so that ++ multiple parsers can coexist. */ + int yydebug; +-int yynerrs; +-int yyerrflag; ++#else /* !YYDEBUG */ ++# define YYDPRINTF(Args) ++# define YYDSYMPRINT(Args) ++# define YYDSYMPRINTF(Title, Token, Value, Location) ++# define YY_STACK_PRINT(Bottom, Top) ++# define YY_REDUCE_PRINT(Rule) ++#endif /* !YYDEBUG */ ++ ++ ++/* YYINITDEPTH -- initial size of the parser's stacks. */ ++#ifndef YYINITDEPTH ++# define YYINITDEPTH 200 ++#endif ++ ++/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only ++ if the built-in stack extension method is used). ++ ++ Do not make this value too large; the results are undefined if ++ SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) ++ evaluated with infinite-precision integer arithmetic. */ ++ ++#if YYMAXDEPTH == 0 ++# undef YYMAXDEPTH ++#endif ++ ++#ifndef YYMAXDEPTH ++# define YYMAXDEPTH 10000 ++#endif ++ ++ ++ ++#if YYERROR_VERBOSE ++ ++# ifndef yystrlen ++# if defined (__GLIBC__) && defined (_STRING_H) ++# define yystrlen strlen ++# else ++/* Return the length of YYSTR. */ ++static YYSIZE_T ++# if defined (__STDC__) || defined (__cplusplus) ++yystrlen (const char *yystr) ++# else ++yystrlen (yystr) ++ const char *yystr; ++# endif ++{ ++ register const char *yys = yystr; ++ ++ while (*yys++ != '\0') ++ continue; ++ ++ return yys - yystr - 1; ++} ++# endif ++# endif ++ ++# ifndef yystpcpy ++# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE) ++# define yystpcpy stpcpy ++# else ++/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in ++ YYDEST. */ ++static char * ++# if defined (__STDC__) || defined (__cplusplus) ++yystpcpy (char *yydest, const char *yysrc) ++# else ++yystpcpy (yydest, yysrc) ++ char *yydest; ++ const char *yysrc; ++# endif ++{ ++ register char *yyd = yydest; ++ register const char *yys = yysrc; ++ ++ while ((*yyd++ = *yys++) != '\0') ++ continue; ++ ++ return yyd - 1; ++} ++# endif ++# endif ++ ++#endif /* !YYERROR_VERBOSE */ ++ ++ ++ ++#if YYDEBUG ++/*--------------------------------. ++| Print this symbol on YYOUTPUT. | ++`--------------------------------*/ ++ ++#if defined (__STDC__) || defined (__cplusplus) ++static void ++yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep) ++#else ++static void ++yysymprint (yyoutput, yytype, yyvaluep) ++ FILE *yyoutput; ++ int yytype; ++ YYSTYPE *yyvaluep; ++#endif ++{ ++ /* Pacify ``unused variable'' warnings. */ ++ (void) yyvaluep; ++ ++ if (yytype < YYNTOKENS) ++ { ++ YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); ++# ifdef YYPRINT ++ YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); ++# endif ++ } ++ else ++ YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); ++ ++ switch (yytype) ++ { ++ default: ++ break; ++ } ++ YYFPRINTF (yyoutput, ")"); ++} ++ ++#endif /* ! YYDEBUG */ ++/*-----------------------------------------------. ++| Release the memory associated to this symbol. | ++`-----------------------------------------------*/ ++ ++#if defined (__STDC__) || defined (__cplusplus) ++static void ++yydestruct (int yytype, YYSTYPE *yyvaluep) ++#else ++static void ++yydestruct (yytype, yyvaluep) ++ int yytype; ++ YYSTYPE *yyvaluep; ++#endif ++{ ++ /* Pacify ``unused variable'' warnings. */ ++ (void) yyvaluep; ++ ++ switch (yytype) ++ { ++ ++ default: ++ break; ++ } ++} ++ ++ ++/* Prevent warnings from -Wmissing-prototypes. */ ++ ++#ifdef YYPARSE_PARAM ++# if defined (__STDC__) || defined (__cplusplus) ++int yyparse (void *YYPARSE_PARAM); ++# else ++int yyparse (); ++# endif ++#else /* ! YYPARSE_PARAM */ ++#if defined (__STDC__) || defined (__cplusplus) ++int yyparse (void); ++#else ++int yyparse (); ++#endif ++#endif /* ! YYPARSE_PARAM */ ++ ++ ++ ++/* The lookahead symbol. */ + int yychar; +-short *yyssp; +-YYSTYPE *yyvsp; +-YYSTYPE yyval; ++ ++/* The semantic value of the lookahead symbol. */ + YYSTYPE yylval; +-short *yyss; +-short *yysslim; +-YYSTYPE *yyvs; +-int yystacksize; +-/* allocate initial stack or double stack size, up to YYMAXDEPTH */ +-static int yygrowstack() +-{ +- int newsize, i; +- short *newss; +- YYSTYPE *newvs; +- +- if ((newsize = yystacksize) == 0) +- newsize = YYINITSTACKSIZE; +- else if (newsize >= YYMAXDEPTH) +- return -1; +- else if ((newsize *= 2) > YYMAXDEPTH) +- newsize = YYMAXDEPTH; +- i = yyssp - yyss; +- newss = yyss ? (short *)realloc(yyss, newsize * sizeof *newss) : +- (short *)malloc(newsize * sizeof *newss); +- if (newss == NULL) +- return -1; +- yyss = newss; +- yyssp = newss + i; +- newvs = yyvs ? (YYSTYPE *)realloc(yyvs, newsize * sizeof *newvs) : +- (YYSTYPE *)malloc(newsize * sizeof *newvs); +- if (newvs == NULL) +- return -1; +- yyvs = newvs; +- yyvsp = newvs + i; +- yystacksize = newsize; +- yysslim = yyss + newsize - 1; +- return 0; +-} + +-#define YYABORT goto yyabort +-#define YYREJECT goto yyabort +-#define YYACCEPT goto yyaccept +-#define YYERROR goto yyerrlab +- +-#ifndef YYPARSE_PARAM +-#if defined(__cplusplus) || __STDC__ +-#define YYPARSE_PARAM_ARG void +-#define YYPARSE_PARAM_DECL +-#else /* ! ANSI-C/C++ */ +-#define YYPARSE_PARAM_ARG +-#define YYPARSE_PARAM_DECL +-#endif /* ANSI-C/C++ */ +-#else /* YYPARSE_PARAM */ +-#ifndef YYPARSE_PARAM_TYPE +-#define YYPARSE_PARAM_TYPE void * +-#endif +-#if defined(__cplusplus) || __STDC__ +-#define YYPARSE_PARAM_ARG YYPARSE_PARAM_TYPE YYPARSE_PARAM +-#define YYPARSE_PARAM_DECL +-#else /* ! ANSI-C/C++ */ +-#define YYPARSE_PARAM_ARG YYPARSE_PARAM +-#define YYPARSE_PARAM_DECL YYPARSE_PARAM_TYPE YYPARSE_PARAM; +-#endif /* ANSI-C/C++ */ +-#endif /* ! YYPARSE_PARAM */ ++/* Number of syntax errors so far. */ ++int yynerrs; ++ ++ ++ ++/*----------. ++| yyparse. | ++`----------*/ + ++#ifdef YYPARSE_PARAM ++# if defined (__STDC__) || defined (__cplusplus) ++int yyparse (void *YYPARSE_PARAM) ++# else ++int yyparse (YYPARSE_PARAM) ++ void *YYPARSE_PARAM; ++# endif ++#else /* ! YYPARSE_PARAM */ ++#if defined (__STDC__) || defined (__cplusplus) + int +-yyparse (YYPARSE_PARAM_ARG) +- YYPARSE_PARAM_DECL ++yyparse (void) ++#else ++int ++yyparse () ++ ++#endif ++#endif + { +- register int yym, yyn, yystate; +-#if YYDEBUG +- register const char *yys; ++ ++ register int yystate; ++ register int yyn; ++ int yyresult; ++ /* Number of tokens to shift before error messages enabled. */ ++ int yyerrstatus; ++ /* Lookahead token as an internal (translated) token number. */ ++ int yytoken = 0; ++ ++ /* Three stacks and their tools: ++ `yyss': related to states, ++ `yyvs': related to semantic values, ++ `yyls': related to locations. ++ ++ Refer to the stacks thru separate pointers, to allow yyoverflow ++ to reallocate them elsewhere. */ ++ ++ /* The state stack. */ ++ short yyssa[YYINITDEPTH]; ++ short *yyss = yyssa; ++ register short *yyssp; ++ ++ /* The semantic value stack. */ ++ YYSTYPE yyvsa[YYINITDEPTH]; ++ YYSTYPE *yyvs = yyvsa; ++ register YYSTYPE *yyvsp; ++ ++ ++ ++#define YYPOPSTACK (yyvsp--, yyssp--) + +- if ((yys = getenv("YYDEBUG"))) ++ YYSIZE_T yystacksize = YYINITDEPTH; ++ ++ /* The variables used to return semantic value and location from the ++ action routines. */ ++ YYSTYPE yyval; ++ ++ ++ /* When reducing, the number of symbols on the RHS of the reduced ++ rule. */ ++ int yylen; ++ ++ YYDPRINTF ((stderr, "Starting parse\n")); ++ ++ yystate = 0; ++ yyerrstatus = 0; ++ yynerrs = 0; ++ yychar = YYEMPTY; /* Cause a token to be read. */ ++ ++ /* Initialize stack pointers. ++ Waste one element of value and location stack ++ so that they stay on the same level as the state stack. ++ The wasted elements are never initialized. */ ++ ++ yyssp = yyss; ++ yyvsp = yyvs; ++ ++ goto yysetstate; ++ ++/*------------------------------------------------------------. ++| yynewstate -- Push a new state, which is found in yystate. | ++`------------------------------------------------------------*/ ++ yynewstate: ++ /* In all cases, when you get here, the value and location stacks ++ have just been pushed. so pushing a state here evens the stacks. ++ */ ++ yyssp++; ++ ++ yysetstate: ++ *yyssp = yystate; ++ ++ if (yyss + yystacksize - 1 <= yyssp) + { +- yyn = *yys; +- if (yyn >= '0' && yyn <= '9') +- yydebug = yyn - '0'; ++ /* Get the current used size of the three stacks, in elements. */ ++ YYSIZE_T yysize = yyssp - yyss + 1; ++ ++#ifdef yyoverflow ++ { ++ /* Give user a chance to reallocate the stack. Use copies of ++ these so that the &'s don't force the real ones into ++ memory. */ ++ YYSTYPE *yyvs1 = yyvs; ++ short *yyss1 = yyss; ++ ++ ++ /* Each stack pointer address is followed by the size of the ++ data in use in that stack, in bytes. This used to be a ++ conditional around just the two extra args, but that might ++ be undefined if yyoverflow is a macro. */ ++ yyoverflow ("parser stack overflow", ++ &yyss1, yysize * sizeof (*yyssp), ++ &yyvs1, yysize * sizeof (*yyvsp), ++ ++ &yystacksize); ++ ++ yyss = yyss1; ++ yyvs = yyvs1; ++ } ++#else /* no yyoverflow */ ++# ifndef YYSTACK_RELOCATE ++ goto yyoverflowlab; ++# else ++ /* Extend the stack our own way. */ ++ if (YYMAXDEPTH <= yystacksize) ++ goto yyoverflowlab; ++ yystacksize *= 2; ++ if (YYMAXDEPTH < yystacksize) ++ yystacksize = YYMAXDEPTH; ++ ++ { ++ short *yyss1 = yyss; ++ union yyalloc *yyptr = ++ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); ++ if (! yyptr) ++ goto yyoverflowlab; ++ YYSTACK_RELOCATE (yyss); ++ YYSTACK_RELOCATE (yyvs); ++ ++# undef YYSTACK_RELOCATE ++ if (yyss1 != yyssa) ++ YYSTACK_FREE (yyss1); ++ } ++# endif ++#endif /* no yyoverflow */ ++ ++ yyssp = yyss + yysize - 1; ++ yyvsp = yyvs + yysize - 1; ++ ++ ++ YYDPRINTF ((stderr, "Stack size increased to %lu\n", ++ (unsigned long int) yystacksize)); ++ ++ if (yyss + yystacksize - 1 <= yyssp) ++ YYABORT; + } +-#endif + +- yynerrs = 0; +- yyerrflag = 0; +- yychar = (-1); ++ YYDPRINTF ((stderr, "Entering state %d\n", yystate)); ++ ++ goto yybackup; ++ ++/*-----------. ++| yybackup. | ++`-----------*/ ++yybackup: ++ ++/* Do appropriate processing given the current state. */ ++/* Read a lookahead token if we need one and don't already have one. */ ++/* yyresume: */ + +- if (yyss == NULL && yygrowstack()) goto yyoverflow; +- yyssp = yyss; +- yyvsp = yyvs; +- *yyssp = yystate = 0; ++ /* First try to decide what to do without reference to lookahead token. */ + +-yyloop: +- if ((yyn = yydefred[yystate])) goto yyreduce; +- if (yychar < 0) ++ yyn = yypact[yystate]; ++ if (yyn == YYPACT_NINF) ++ goto yydefault; ++ ++ /* Not known => get a lookahead token if don't already have one. */ ++ ++ /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ ++ if (yychar == YYEMPTY) + { +- if ((yychar = yylex()) < 0) yychar = 0; +-#if YYDEBUG +- if (yydebug) +- { +- yys = 0; +- if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; +- if (!yys) yys = "illegal-symbol"; +- printf("%sdebug: state %d, reading %d (%s)\n", +- YYPREFIX, yystate, yychar, yys); +- } +-#endif ++ YYDPRINTF ((stderr, "Reading a token: ")); ++ yychar = YYLEX; + } +- if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 && +- yyn <= YYTABLESIZE && yycheck[yyn] == yychar) ++ ++ if (yychar <= YYEOF) + { +-#if YYDEBUG +- if (yydebug) +- printf("%sdebug: state %d, shifting to state %d\n", +- YYPREFIX, yystate, yytable[yyn]); +-#endif +- if (yyssp >= yysslim && yygrowstack()) +- { +- goto yyoverflow; +- } +- *++yyssp = yystate = yytable[yyn]; +- *++yyvsp = yylval; +- yychar = (-1); +- if (yyerrflag > 0) --yyerrflag; +- goto yyloop; +- } +- if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 && +- yyn <= YYTABLESIZE && yycheck[yyn] == yychar) +- { +- yyn = yytable[yyn]; +- goto yyreduce; +- } +- if (yyerrflag) goto yyinrecovery; +-#if defined(lint) || defined(__GNUC__) +- goto yynewerror; +-#endif +-yynewerror: +- yyerror("syntax error"); +-#if defined(lint) || defined(__GNUC__) +- goto yyerrlab; +-#endif +-yyerrlab: +- ++yynerrs; +-yyinrecovery: +- if (yyerrflag < 3) ++ yychar = yytoken = YYEOF; ++ YYDPRINTF ((stderr, "Now at end of input.\n")); ++ } ++ else + { +- yyerrflag = 3; +- for (;;) +- { +- if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 && +- yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE) +- { +-#if YYDEBUG +- if (yydebug) +- printf("%sdebug: state %d, error recovery shifting\ +- to state %d\n", YYPREFIX, *yyssp, yytable[yyn]); +-#endif +- if (yyssp >= yysslim && yygrowstack()) +- { +- goto yyoverflow; +- } +- *++yyssp = yystate = yytable[yyn]; +- *++yyvsp = yylval; +- goto yyloop; +- } +- else +- { +-#if YYDEBUG +- if (yydebug) +- printf("%sdebug: error recovery discarding state %d\n", +- YYPREFIX, *yyssp); +-#endif +- if (yyssp <= yyss) goto yyabort; +- --yyssp; +- --yyvsp; +- } +- } ++ yytoken = YYTRANSLATE (yychar); ++ YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); + } +- else ++ ++ /* If the proper action on seeing token YYTOKEN is to reduce or to ++ detect an error, take that action. */ ++ yyn += yytoken; ++ if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) ++ goto yydefault; ++ yyn = yytable[yyn]; ++ if (yyn <= 0) + { +- if (yychar == 0) goto yyabort; +-#if YYDEBUG +- if (yydebug) +- { +- yys = 0; +- if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; +- if (!yys) yys = "illegal-symbol"; +- printf("%sdebug: state %d, error recovery discards token %d (%s)\n", +- YYPREFIX, yystate, yychar, yys); +- } +-#endif +- yychar = (-1); +- goto yyloop; ++ if (yyn == 0 || yyn == YYTABLE_NINF) ++ goto yyerrlab; ++ yyn = -yyn; ++ goto yyreduce; + } ++ ++ if (yyn == YYFINAL) ++ YYACCEPT; ++ ++ /* Shift the lookahead token. */ ++ YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); ++ ++ /* Discard the token being shifted unless it is eof. */ ++ if (yychar != YYEOF) ++ yychar = YYEMPTY; ++ ++ *++yyvsp = yylval; ++ ++ ++ /* Count tokens shifted since error; after three, turn off error ++ status. */ ++ if (yyerrstatus) ++ yyerrstatus--; ++ ++ yystate = yyn; ++ goto yynewstate; ++ ++ ++/*-----------------------------------------------------------. ++| yydefault -- do the default action for the current state. | ++`-----------------------------------------------------------*/ ++yydefault: ++ yyn = yydefact[yystate]; ++ if (yyn == 0) ++ goto yyerrlab; ++ goto yyreduce; ++ ++ ++/*-----------------------------. ++| yyreduce -- Do a reduction. | ++`-----------------------------*/ + yyreduce: +-#if YYDEBUG +- if (yydebug) +- printf("%sdebug: state %d, reducing by rule %d (%s)\n", +- YYPREFIX, yystate, yyn, yyrule[yyn]); +-#endif +- yym = yylen[yyn]; +- yyval = yyvsp[1-yym]; +- switch (yyn) ++ /* yyn is the number of a rule to reduce with. */ ++ yylen = yyr2[yyn]; ++ ++ /* If YYLEN is nonzero, implement the default value of the action: ++ `$$ = $1'. ++ ++ Otherwise, the following line sets YYVAL to garbage. ++ This behavior is undocumented and Bison ++ users should not rely upon it. Assigning to YYVAL ++ unconditionally makes the parser a bit smaller, and it avoids a ++ GCC warning that YYVAL may be used uninitialized. */ ++ yyval = yyvsp[1-yylen]; ++ ++ ++ YY_REDUCE_PRINT (yyn); ++ switch (yyn) + { +-case 2: ++ case 3: + #line 130 "jamgram.y" +-{ parse_save( yyvsp[0].parse ); } +-break; +-case 3: ++ { parse_save( yyvsp[0].parse ); } ++ break; ++ ++ case 4: + #line 141 "jamgram.y" +-{ yyval.parse = pnull(); } +-break; +-case 4: ++ { yyval.parse = pnull(); } ++ break; ++ ++ case 5: + #line 143 "jamgram.y" +-{ yyval.parse = yyvsp[0].parse; } +-break; +-case 5: ++ { yyval.parse = yyvsp[0].parse; } ++ break; ++ ++ case 6: + #line 147 "jamgram.y" +-{ yyval.parse = yyvsp[0].parse; } +-break; +-case 6: ++ { yyval.parse = yyvsp[0].parse; } ++ break; ++ ++ case 7: + #line 149 "jamgram.y" +-{ yyval.parse = prules( yyvsp[-1].parse, yyvsp[0].parse ); } +-break; +-case 7: ++ { yyval.parse = prules( yyvsp[-1].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 8: + #line 151 "jamgram.y" +-{ yyval.parse = plocal( yyvsp[-2].parse, pnull(), yyvsp[0].parse ); } +-break; +-case 8: ++ { yyval.parse = plocal( yyvsp[-2].parse, pnull(), yyvsp[0].parse ); } ++ break; ++ ++ case 9: + #line 153 "jamgram.y" +-{ yyval.parse = plocal( yyvsp[-4].parse, yyvsp[-2].parse, yyvsp[0].parse ); } +-break; +-case 9: ++ { yyval.parse = plocal( yyvsp[-4].parse, yyvsp[-2].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 10: + #line 157 "jamgram.y" +-{ yyval.parse = yyvsp[-1].parse; } +-break; +-case 10: ++ { yyval.parse = yyvsp[-1].parse; } ++ break; ++ ++ case 11: + #line 159 "jamgram.y" +-{ yyval.parse = pincl( yyvsp[-1].parse ); } +-break; +-case 11: ++ { yyval.parse = pincl( yyvsp[-1].parse ); } ++ break; ++ ++ case 12: + #line 161 "jamgram.y" +-{ yyval.parse = prule( yyvsp[-2].parse, yyvsp[-1].parse ); } +-break; +-case 12: ++ { yyval.parse = prule( yyvsp[-2].parse, yyvsp[-1].parse ); } ++ break; ++ ++ case 13: + #line 163 "jamgram.y" +-{ yyval.parse = pset( yyvsp[-3].parse, yyvsp[-1].parse, yyvsp[-2].number ); } +-break; +-case 13: ++ { yyval.parse = pset( yyvsp[-3].parse, yyvsp[-1].parse, yyvsp[-2].number ); } ++ break; ++ ++ case 14: + #line 165 "jamgram.y" +-{ yyval.parse = pset1( yyvsp[-5].parse, yyvsp[-3].parse, yyvsp[-1].parse, yyvsp[-2].number ); } +-break; +-case 14: ++ { yyval.parse = pset1( yyvsp[-5].parse, yyvsp[-3].parse, yyvsp[-1].parse, yyvsp[-2].number ); } ++ break; ++ ++ case 15: + #line 167 "jamgram.y" +-{ yyval.parse = pbreak( yyvsp[-1].parse, JMP_BREAK ); } +-break; +-case 15: ++ { yyval.parse = pbreak( yyvsp[-1].parse, JMP_BREAK ); } ++ break; ++ ++ case 16: + #line 169 "jamgram.y" +-{ yyval.parse = pbreak( yyvsp[-1].parse, JMP_CONTINUE ); } +-break; +-case 16: ++ { yyval.parse = pbreak( yyvsp[-1].parse, JMP_CONTINUE ); } ++ break; ++ ++ case 17: + #line 171 "jamgram.y" +-{ yyval.parse = pbreak( yyvsp[-1].parse, JMP_RETURN ); } +-break; +-case 17: ++ { yyval.parse = pbreak( yyvsp[-1].parse, JMP_RETURN ); } ++ break; ++ ++ case 18: + #line 173 "jamgram.y" +-{ yyval.parse = pfor( yyvsp[-5].string, yyvsp[-3].parse, yyvsp[-1].parse ); } +-break; +-case 18: ++ { yyval.parse = pfor( yyvsp[-5].string, yyvsp[-3].parse, yyvsp[-1].parse ); } ++ break; ++ ++ case 19: + #line 175 "jamgram.y" +-{ yyval.parse = pswitch( yyvsp[-3].parse, yyvsp[-1].parse ); } +-break; +-case 19: ++ { yyval.parse = pswitch( yyvsp[-3].parse, yyvsp[-1].parse ); } ++ break; ++ ++ case 20: + #line 177 "jamgram.y" +-{ yyval.parse = pif( yyvsp[-3].parse, yyvsp[-1].parse, pnull() ); } +-break; +-case 20: ++ { yyval.parse = pif( yyvsp[-3].parse, yyvsp[-1].parse, pnull() ); } ++ break; ++ ++ case 21: + #line 179 "jamgram.y" +-{ yyval.parse = pif( yyvsp[-5].parse, yyvsp[-3].parse, yyvsp[0].parse ); } +-break; +-case 21: ++ { yyval.parse = pif( yyvsp[-5].parse, yyvsp[-3].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 22: + #line 181 "jamgram.y" +-{ yyval.parse = pwhile( yyvsp[-3].parse, yyvsp[-1].parse ); } +-break; +-case 22: ++ { yyval.parse = pwhile( yyvsp[-3].parse, yyvsp[-1].parse ); } ++ break; ++ ++ case 23: + #line 183 "jamgram.y" +-{ yyval.parse = psetc( yyvsp[-4].string, yyvsp[-3].parse, yyvsp[-1].parse ); } +-break; +-case 23: ++ { yyval.parse = psetc( yyvsp[-4].string, yyvsp[-3].parse, yyvsp[-1].parse ); } ++ break; ++ ++ case 24: + #line 185 "jamgram.y" +-{ yyval.parse = pon( yyvsp[-1].parse, yyvsp[0].parse ); } +-break; +-case 24: ++ { yyval.parse = pon( yyvsp[-1].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 25: + #line 187 "jamgram.y" +-{ yymode( SCAN_STRING ); } +-break; +-case 25: ++ { yymode( SCAN_STRING ); } ++ break; ++ ++ case 26: + #line 189 "jamgram.y" +-{ yymode( SCAN_NORMAL ); } +-break; +-case 26: ++ { yymode( SCAN_NORMAL ); } ++ break; ++ ++ case 27: + #line 191 "jamgram.y" +-{ yyval.parse = psete( yyvsp[-6].string,yyvsp[-5].parse,yyvsp[-2].string,yyvsp[-7].number ); } +-break; +-case 27: ++ { yyval.parse = psete( yyvsp[-6].string,yyvsp[-5].parse,yyvsp[-2].string,yyvsp[-7].number ); } ++ break; ++ ++ case 28: + #line 199 "jamgram.y" +-{ yyval.number = VAR_SET; } +-break; +-case 28: ++ { yyval.number = VAR_SET; } ++ break; ++ ++ case 29: + #line 201 "jamgram.y" +-{ yyval.number = VAR_APPEND; } +-break; +-case 29: ++ { yyval.number = VAR_APPEND; } ++ break; ++ ++ case 30: + #line 203 "jamgram.y" +-{ yyval.number = VAR_DEFAULT; } +-break; +-case 30: ++ { yyval.number = VAR_DEFAULT; } ++ break; ++ ++ case 31: + #line 205 "jamgram.y" +-{ yyval.number = VAR_DEFAULT; } +-break; +-case 31: ++ { yyval.number = VAR_DEFAULT; } ++ break; ++ ++ case 32: + #line 213 "jamgram.y" +-{ yyval.parse = peval( EXPR_EXISTS, yyvsp[0].parse, pnull() ); } +-break; +-case 32: ++ { yyval.parse = peval( EXPR_EXISTS, yyvsp[0].parse, pnull() ); } ++ break; ++ ++ case 33: + #line 215 "jamgram.y" +-{ yyval.parse = peval( EXPR_EQUALS, yyvsp[-2].parse, yyvsp[0].parse ); } +-break; +-case 33: ++ { yyval.parse = peval( EXPR_EQUALS, yyvsp[-2].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 34: + #line 217 "jamgram.y" +-{ yyval.parse = peval( EXPR_NOTEQ, yyvsp[-2].parse, yyvsp[0].parse ); } +-break; +-case 34: ++ { yyval.parse = peval( EXPR_NOTEQ, yyvsp[-2].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 35: + #line 219 "jamgram.y" +-{ yyval.parse = peval( EXPR_LESS, yyvsp[-2].parse, yyvsp[0].parse ); } +-break; +-case 35: ++ { yyval.parse = peval( EXPR_LESS, yyvsp[-2].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 36: + #line 221 "jamgram.y" +-{ yyval.parse = peval( EXPR_LESSEQ, yyvsp[-2].parse, yyvsp[0].parse ); } +-break; +-case 36: ++ { yyval.parse = peval( EXPR_LESSEQ, yyvsp[-2].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 37: + #line 223 "jamgram.y" +-{ yyval.parse = peval( EXPR_MORE, yyvsp[-2].parse, yyvsp[0].parse ); } +-break; +-case 37: ++ { yyval.parse = peval( EXPR_MORE, yyvsp[-2].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 38: + #line 225 "jamgram.y" +-{ yyval.parse = peval( EXPR_MOREEQ, yyvsp[-2].parse, yyvsp[0].parse ); } +-break; +-case 38: ++ { yyval.parse = peval( EXPR_MOREEQ, yyvsp[-2].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 39: + #line 227 "jamgram.y" +-{ yyval.parse = peval( EXPR_AND, yyvsp[-2].parse, yyvsp[0].parse ); } +-break; +-case 39: ++ { yyval.parse = peval( EXPR_AND, yyvsp[-2].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 40: + #line 229 "jamgram.y" +-{ yyval.parse = peval( EXPR_AND, yyvsp[-2].parse, yyvsp[0].parse ); } +-break; +-case 40: ++ { yyval.parse = peval( EXPR_AND, yyvsp[-2].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 41: + #line 231 "jamgram.y" +-{ yyval.parse = peval( EXPR_OR, yyvsp[-2].parse, yyvsp[0].parse ); } +-break; +-case 41: ++ { yyval.parse = peval( EXPR_OR, yyvsp[-2].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 42: + #line 233 "jamgram.y" +-{ yyval.parse = peval( EXPR_OR, yyvsp[-2].parse, yyvsp[0].parse ); } +-break; +-case 42: ++ { yyval.parse = peval( EXPR_OR, yyvsp[-2].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 43: + #line 235 "jamgram.y" +-{ yyval.parse = peval( EXPR_IN, yyvsp[-2].parse, yyvsp[0].parse ); } +-break; +-case 43: ++ { yyval.parse = peval( EXPR_IN, yyvsp[-2].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 44: + #line 237 "jamgram.y" +-{ yyval.parse = peval( EXPR_NOT, yyvsp[0].parse, pnull() ); } +-break; +-case 44: ++ { yyval.parse = peval( EXPR_NOT, yyvsp[0].parse, pnull() ); } ++ break; ++ ++ case 45: + #line 239 "jamgram.y" +-{ yyval.parse = yyvsp[-1].parse; } +-break; +-case 45: ++ { yyval.parse = yyvsp[-1].parse; } ++ break; ++ ++ case 46: + #line 249 "jamgram.y" +-{ yyval.parse = P0; } +-break; +-case 46: ++ { yyval.parse = P0; } ++ break; ++ ++ case 47: + #line 251 "jamgram.y" +-{ yyval.parse = pnode( yyvsp[-1].parse, yyvsp[0].parse ); } +-break; +-case 47: ++ { yyval.parse = pnode( yyvsp[-1].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 48: + #line 255 "jamgram.y" +-{ yyval.parse = psnode( yyvsp[-2].string, yyvsp[0].parse ); } +-break; +-case 48: ++ { yyval.parse = psnode( yyvsp[-2].string, yyvsp[0].parse ); } ++ break; ++ ++ case 49: + #line 264 "jamgram.y" +-{ yyval.parse = P0; } +-break; +-case 49: ++ { yyval.parse = P0; } ++ break; ++ ++ case 50: + #line 266 "jamgram.y" +-{ yyval.parse = psnode( yyvsp[-2].string, yyvsp[0].parse ); } +-break; +-case 50: ++ { yyval.parse = psnode( yyvsp[-2].string, yyvsp[0].parse ); } ++ break; ++ ++ case 51: + #line 268 "jamgram.y" +-{ yyval.parse = psnode( yyvsp[0].string, P0 ); } +-break; +-case 51: ++ { yyval.parse = psnode( yyvsp[0].string, P0 ); } ++ break; ++ ++ case 52: + #line 277 "jamgram.y" +-{ yyval.parse = pnode( P0, yyvsp[0].parse ); } +-break; +-case 52: ++ { yyval.parse = pnode( P0, yyvsp[0].parse ); } ++ break; ++ ++ case 53: + #line 279 "jamgram.y" +-{ yyval.parse = pnode( yyvsp[0].parse, yyvsp[-2].parse ); } +-break; +-case 53: ++ { yyval.parse = pnode( yyvsp[0].parse, yyvsp[-2].parse ); } ++ break; ++ ++ case 54: + #line 289 "jamgram.y" +-{ yyval.parse = yyvsp[0].parse; yymode( SCAN_NORMAL ); } +-break; +-case 54: ++ { yyval.parse = yyvsp[0].parse; yymode( SCAN_NORMAL ); } ++ break; ++ ++ case 55: + #line 293 "jamgram.y" +-{ yyval.parse = pnull(); yymode( SCAN_PUNCT ); } +-break; +-case 55: ++ { yyval.parse = pnull(); yymode( SCAN_PUNCT ); } ++ break; ++ ++ case 56: + #line 295 "jamgram.y" +-{ yyval.parse = pappend( yyvsp[-1].parse, yyvsp[0].parse ); } +-break; +-case 56: ++ { yyval.parse = pappend( yyvsp[-1].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 57: + #line 299 "jamgram.y" +-{ yyval.parse = plist( yyvsp[0].string ); } +-break; +-case 57: ++ { yyval.parse = plist( yyvsp[0].string ); } ++ break; ++ ++ case 58: + #line 300 "jamgram.y" +-{ yymode( SCAN_NORMAL ); } +-break; +-case 58: ++ { yymode( SCAN_NORMAL ); } ++ break; ++ ++ case 59: + #line 301 "jamgram.y" +-{ yyval.parse = yyvsp[-1].parse; } +-break; +-case 59: ++ { yyval.parse = yyvsp[-1].parse; } ++ break; ++ ++ case 60: + #line 310 "jamgram.y" +-{ yyval.parse = prule( yyvsp[-1].parse, yyvsp[0].parse ); } +-break; +-case 60: ++ { yyval.parse = prule( yyvsp[-1].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 61: + #line 312 "jamgram.y" +-{ yyval.parse = pon( yyvsp[-2].parse, prule( yyvsp[-1].parse, yyvsp[0].parse ) ); } +-break; +-case 61: ++ { yyval.parse = pon( yyvsp[-2].parse, prule( yyvsp[-1].parse, yyvsp[0].parse ) ); } ++ break; ++ ++ case 62: + #line 314 "jamgram.y" +-{ yyval.parse = pon( yyvsp[-2].parse, yyvsp[0].parse ); } +-break; +-case 62: ++ { yyval.parse = pon( yyvsp[-2].parse, yyvsp[0].parse ); } ++ break; ++ ++ case 63: + #line 323 "jamgram.y" +-{ yyval.number = 0; } +-break; +-case 63: ++ { yyval.number = 0; } ++ break; ++ ++ case 64: + #line 325 "jamgram.y" +-{ yyval.number = yyvsp[-1].number | yyvsp[0].number; } +-break; +-case 64: ++ { yyval.number = yyvsp[-1].number | yyvsp[0].number; } ++ break; ++ ++ case 65: + #line 329 "jamgram.y" +-{ yyval.number = RULE_UPDATED; } +-break; +-case 65: ++ { yyval.number = RULE_UPDATED; } ++ break; ++ ++ case 66: + #line 331 "jamgram.y" +-{ yyval.number = RULE_TOGETHER; } +-break; +-case 66: ++ { yyval.number = RULE_TOGETHER; } ++ break; ++ ++ case 67: + #line 333 "jamgram.y" +-{ yyval.number = RULE_IGNORE; } +-break; +-case 67: ++ { yyval.number = RULE_IGNORE; } ++ break; ++ ++ case 68: + #line 335 "jamgram.y" +-{ yyval.number = RULE_QUIETLY; } +-break; +-case 68: ++ { yyval.number = RULE_QUIETLY; } ++ break; ++ ++ case 69: + #line 337 "jamgram.y" +-{ yyval.number = RULE_PIECEMEAL; } +-break; +-case 69: ++ { yyval.number = RULE_PIECEMEAL; } ++ break; ++ ++ case 70: + #line 339 "jamgram.y" +-{ yyval.number = RULE_EXISTING; } +-break; +-case 70: ++ { yyval.number = RULE_EXISTING; } ++ break; ++ ++ case 71: + #line 341 "jamgram.y" +-{ yyval.number = atoi( yyvsp[0].string ) * RULE_MAXLINE; } +-break; +-case 71: ++ { yyval.number = atoi( yyvsp[0].string ) * RULE_MAXLINE; } ++ break; ++ ++ case 72: + #line 350 "jamgram.y" +-{ yyval.parse = pnull(); } +-break; +-case 72: ++ { yyval.parse = pnull(); } ++ break; ++ ++ case 73: + #line 352 "jamgram.y" +-{ yyval.parse = yyvsp[0].parse; } +-break; +-#line 877 "y.tab.c" +- } +- yyssp -= yym; +- yystate = *yyssp; +- yyvsp -= yym; +- yym = yylhs[yyn]; +- if (yystate == 0 && yym == 0) ++ { yyval.parse = yyvsp[0].parse; } ++ break; ++ ++ ++ } ++ ++/* Line 999 of yacc.c. */ ++#line 1614 "y.tab.c" ++ ++ yyvsp -= yylen; ++ yyssp -= yylen; ++ ++ ++ YY_STACK_PRINT (yyss, yyssp); ++ ++ *++yyvsp = yyval; ++ ++ ++ /* Now `shift' the result of the reduction. Determine what state ++ that goes to, based on the state we popped back to and the rule ++ number reduced by. */ ++ ++ yyn = yyr1[yyn]; ++ ++ yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; ++ if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) ++ yystate = yytable[yystate]; ++ else ++ yystate = yydefgoto[yyn - YYNTOKENS]; ++ ++ goto yynewstate; ++ ++ ++/*------------------------------------. ++| yyerrlab -- here on detecting error | ++`------------------------------------*/ ++yyerrlab: ++ /* If not already recovering from an error, report this error. */ ++ if (!yyerrstatus) + { +-#if YYDEBUG +- if (yydebug) +- printf("%sdebug: after reduction, shifting from state 0 to\ +- state %d\n", YYPREFIX, YYFINAL); +-#endif +- yystate = YYFINAL; +- *++yyssp = YYFINAL; +- *++yyvsp = yyval; +- if (yychar < 0) ++ ++yynerrs; ++#if YYERROR_VERBOSE ++ yyn = yypact[yystate]; ++ ++ if (YYPACT_NINF < yyn && yyn < YYLAST) ++ { ++ YYSIZE_T yysize = 0; ++ int yytype = YYTRANSLATE (yychar); ++ char *yymsg; ++ int yyx, yycount; ++ ++ yycount = 0; ++ /* Start YYX at -YYN if negative to avoid negative indexes in ++ YYCHECK. */ ++ for (yyx = yyn < 0 ? -yyn : 0; ++ yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++) ++ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) ++ yysize += yystrlen (yytname[yyx]) + 15, yycount++; ++ yysize += yystrlen ("syntax error, unexpected ") + 1; ++ yysize += yystrlen (yytname[yytype]); ++ yymsg = (char *) YYSTACK_ALLOC (yysize); ++ if (yymsg != 0) ++ { ++ char *yyp = yystpcpy (yymsg, "syntax error, unexpected "); ++ yyp = yystpcpy (yyp, yytname[yytype]); ++ ++ if (yycount < 5) ++ { ++ yycount = 0; ++ for (yyx = yyn < 0 ? -yyn : 0; ++ yyx < (int) (sizeof (yytname) / sizeof (char *)); ++ yyx++) ++ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) ++ { ++ const char *yyq = ! yycount ? ", expecting " : " or "; ++ yyp = yystpcpy (yyp, yyq); ++ yyp = yystpcpy (yyp, yytname[yyx]); ++ yycount++; ++ } ++ } ++ yyerror (yymsg); ++ YYSTACK_FREE (yymsg); ++ } ++ else ++ yyerror ("syntax error; also virtual memory exhausted"); ++ } ++ else ++#endif /* YYERROR_VERBOSE */ ++ yyerror ("syntax error"); ++ } ++ ++ ++ ++ if (yyerrstatus == 3) ++ { ++ /* If just tried and failed to reuse lookahead token after an ++ error, discard it. */ ++ ++ /* Return failure if at end of input. */ ++ if (yychar == YYEOF) + { +- if ((yychar = yylex()) < 0) yychar = 0; +-#if YYDEBUG +- if (yydebug) +- { +- yys = 0; +- if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; +- if (!yys) yys = "illegal-symbol"; +- printf("%sdebug: state %d, reading %d (%s)\n", +- YYPREFIX, YYFINAL, yychar, yys); +- } +-#endif ++ /* Pop the error token. */ ++ YYPOPSTACK; ++ /* Pop the rest of the stack. */ ++ while (yyss < yyssp) ++ { ++ YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); ++ yydestruct (yystos[*yyssp], yyvsp); ++ YYPOPSTACK; ++ } ++ YYABORT; + } +- if (yychar == 0) goto yyaccept; +- goto yyloop; ++ ++ YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); ++ yydestruct (yytoken, &yylval); ++ yychar = YYEMPTY; ++ + } +- if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 && +- yyn <= YYTABLESIZE && yycheck[yyn] == yystate) +- yystate = yytable[yyn]; +- else +- yystate = yydgoto[yym]; +-#if YYDEBUG +- if (yydebug) +- printf("%sdebug: after reduction, shifting from state %d \ +-to state %d\n", YYPREFIX, *yyssp, yystate); +-#endif +- if (yyssp >= yysslim && yygrowstack()) +- { +- goto yyoverflow; +- } +- *++yyssp = yystate; +- *++yyvsp = yyval; +- goto yyloop; +-yyoverflow: +- yyerror("yacc stack overflow"); +-yyabort: +- return (1); +-yyaccept: +- return (0); ++ ++ /* Else will try to reuse lookahead token after shifting the error ++ token. */ ++ goto yyerrlab1; ++ ++ ++/*----------------------------------------------------. ++| yyerrlab1 -- error raised explicitly by an action. | ++`----------------------------------------------------*/ ++yyerrlab1: ++ yyerrstatus = 3; /* Each real token shifted decrements this. */ ++ ++ for (;;) ++ { ++ yyn = yypact[yystate]; ++ if (yyn != YYPACT_NINF) ++ { ++ yyn += YYTERROR; ++ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) ++ { ++ yyn = yytable[yyn]; ++ if (0 < yyn) ++ break; ++ } ++ } ++ ++ /* Pop the current state because it cannot handle the error token. */ ++ if (yyssp == yyss) ++ YYABORT; ++ ++ YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); ++ yydestruct (yystos[yystate], yyvsp); ++ yyvsp--; ++ yystate = *--yyssp; ++ ++ YY_STACK_PRINT (yyss, yyssp); ++ } ++ ++ if (yyn == YYFINAL) ++ YYACCEPT; ++ ++ YYDPRINTF ((stderr, "Shifting error token, ")); ++ ++ *++yyvsp = yylval; ++ ++ ++ yystate = yyn; ++ goto yynewstate; ++ ++ ++/*-------------------------------------. ++| yyacceptlab -- YYACCEPT comes here. | ++`-------------------------------------*/ ++yyacceptlab: ++ yyresult = 0; ++ goto yyreturn; ++ ++/*-----------------------------------. ++| yyabortlab -- YYABORT comes here. | ++`-----------------------------------*/ ++yyabortlab: ++ yyresult = 1; ++ goto yyreturn; ++ ++#ifndef yyoverflow ++/*----------------------------------------------. ++| yyoverflowlab -- parser overflow comes here. | ++`----------------------------------------------*/ ++yyoverflowlab: ++ yyerror ("parser stack overflow"); ++ yyresult = 2; ++ /* Fall through. */ ++#endif ++ ++yyreturn: ++#ifndef yyoverflow ++ if (yyss != yyssa) ++ YYSTACK_FREE (yyss); ++#endif ++ return yyresult; + } ++ ++ ++ +diff -Naur jam-2.5/jamgram.h jam-2.5-p/jamgram.h +--- jam-2.5/jamgram.h 2004-08-19 20:19:34.000000000 +0200 ++++ jam-2.5-p/jamgram.h 2007-08-19 22:36:55.000000000 +0200 +@@ -1,51 +1,142 @@ +-#ifndef YYERRCODE +-#define YYERRCODE 256 +-#endif ++/* A Bison parser, made by GNU Bison 1.875a. */ ++ ++/* Skeleton parser for Yacc-like parsing with Bison, ++ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2, or (at your option) ++ any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. + +-#define _BANG_t 257 +-#define _BANG_EQUALS_t 258 +-#define _AMPER_t 259 +-#define _AMPERAMPER_t 260 +-#define _LPAREN_t 261 +-#define _RPAREN_t 262 +-#define _PLUS_EQUALS_t 263 +-#define _COLON_t 264 ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place - Suite 330, ++ Boston, MA 02111-1307, USA. */ ++ ++/* As a special exception, when this file is copied by Bison into a ++ Bison output file, you may use that output file without restriction. ++ This special exception was added by the Free Software Foundation ++ in version 1.24 of Bison. */ ++ ++/* Tokens. */ ++#ifndef YYTOKENTYPE ++# define YYTOKENTYPE ++ /* Put the tokens into the symbol table, so that GDB and other debuggers ++ know about them. */ ++ enum yytokentype { ++ _LANGLE_t = 258, ++ _LANGLE_EQUALS_t = 259, ++ _EQUALS_t = 260, ++ _RANGLE_t = 261, ++ _RANGLE_EQUALS_t = 262, ++ _BAR_t = 263, ++ _BARBAR_t = 264, ++ _SEMIC_t = 265, ++ _COLON_t = 266, ++ _BANG_t = 267, ++ _BANG_EQUALS_t = 268, ++ _QUESTION_EQUALS_t = 269, ++ _LPAREN_t = 270, ++ _RPAREN_t = 271, ++ _LBRACKET_t = 272, ++ _RBRACKET_t = 273, ++ _LBRACE_t = 274, ++ _RBRACE_t = 275, ++ _AMPER_t = 276, ++ _AMPERAMPER_t = 277, ++ _PLUS_EQUALS_t = 278, ++ ACTIONS_t = 279, ++ BIND_t = 280, ++ BREAK_t = 281, ++ CASE_t = 282, ++ CONTINUE_t = 283, ++ DEFAULT_t = 284, ++ ELSE_t = 285, ++ EXISTING_t = 286, ++ FOR_t = 287, ++ IF_t = 288, ++ IGNORE_t = 289, ++ IN_t = 290, ++ INCLUDE_t = 291, ++ LOCAL_t = 292, ++ MAXLINE_t = 293, ++ ON_t = 294, ++ PIECEMEAL_t = 295, ++ QUIETLY_t = 296, ++ RETURN_t = 297, ++ RULE_t = 298, ++ SWITCH_t = 299, ++ TOGETHER_t = 300, ++ UPDATED_t = 301, ++ WHILE_t = 302, ++ ARG = 303, ++ STRING = 304 ++ }; ++#endif ++#define _LANGLE_t 258 ++#define _LANGLE_EQUALS_t 259 ++#define _EQUALS_t 260 ++#define _RANGLE_t 261 ++#define _RANGLE_EQUALS_t 262 ++#define _BAR_t 263 ++#define _BARBAR_t 264 + #define _SEMIC_t 265 +-#define _LANGLE_t 266 +-#define _LANGLE_EQUALS_t 267 +-#define _EQUALS_t 268 +-#define _RANGLE_t 269 +-#define _RANGLE_EQUALS_t 270 +-#define _QUESTION_EQUALS_t 271 ++#define _COLON_t 266 ++#define _BANG_t 267 ++#define _BANG_EQUALS_t 268 ++#define _QUESTION_EQUALS_t 269 ++#define _LPAREN_t 270 ++#define _RPAREN_t 271 + #define _LBRACKET_t 272 + #define _RBRACKET_t 273 +-#define ACTIONS_t 274 +-#define BIND_t 275 +-#define BREAK_t 276 +-#define CASE_t 277 +-#define CONTINUE_t 278 +-#define DEFAULT_t 279 +-#define ELSE_t 280 +-#define EXISTING_t 281 +-#define FOR_t 282 +-#define IF_t 283 +-#define IGNORE_t 284 +-#define IN_t 285 +-#define INCLUDE_t 286 +-#define LOCAL_t 287 +-#define MAXLINE_t 288 +-#define ON_t 289 +-#define PIECEMEAL_t 290 +-#define QUIETLY_t 291 +-#define RETURN_t 292 +-#define RULE_t 293 +-#define SWITCH_t 294 +-#define TOGETHER_t 295 +-#define UPDATED_t 296 +-#define WHILE_t 297 +-#define _LBRACE_t 298 +-#define _BAR_t 299 +-#define _BARBAR_t 300 +-#define _RBRACE_t 301 +-#define ARG 302 +-#define STRING 303 ++#define _LBRACE_t 274 ++#define _RBRACE_t 275 ++#define _AMPER_t 276 ++#define _AMPERAMPER_t 277 ++#define _PLUS_EQUALS_t 278 ++#define ACTIONS_t 279 ++#define BIND_t 280 ++#define BREAK_t 281 ++#define CASE_t 282 ++#define CONTINUE_t 283 ++#define DEFAULT_t 284 ++#define ELSE_t 285 ++#define EXISTING_t 286 ++#define FOR_t 287 ++#define IF_t 288 ++#define IGNORE_t 289 ++#define IN_t 290 ++#define INCLUDE_t 291 ++#define LOCAL_t 292 ++#define MAXLINE_t 293 ++#define ON_t 294 ++#define PIECEMEAL_t 295 ++#define QUIETLY_t 296 ++#define RETURN_t 297 ++#define RULE_t 298 ++#define SWITCH_t 299 ++#define TOGETHER_t 300 ++#define UPDATED_t 301 ++#define WHILE_t 302 ++#define ARG 303 ++#define STRING 304 ++ ++ ++ ++ ++#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) ++typedef int YYSTYPE; ++# define yystype YYSTYPE /* obsolescent; will be withdrawn */ ++# define YYSTYPE_IS_DECLARED 1 ++# define YYSTYPE_IS_TRIVIAL 1 ++#endif ++ ++extern YYSTYPE yylval; ++ ++ ++ +diff -Naur jam-2.5/jamgram.y jam-2.5-p/jamgram.y +--- jam-2.5/jamgram.y 2003-04-23 06:57:07.000000000 +0200 ++++ jam-2.5-p/jamgram.y 2007-08-19 22:36:55.000000000 +0200 +@@ -1,20 +1,24 @@ +-%token _BANG_t +-%token _BANG_EQUALS_t +-%token _AMPER_t +-%token _AMPERAMPER_t +-%token _LPAREN_t +-%token _RPAREN_t +-%token _PLUS_EQUALS_t +-%token _COLON_t +-%token _SEMIC_t + %token _LANGLE_t + %token _LANGLE_EQUALS_t + %token _EQUALS_t + %token _RANGLE_t + %token _RANGLE_EQUALS_t ++%token _BAR_t ++%token _BARBAR_t ++%token _SEMIC_t ++%token _COLON_t ++%token _BANG_t ++%token _BANG_EQUALS_t + %token _QUESTION_EQUALS_t ++%token _LPAREN_t ++%token _RPAREN_t + %token _LBRACKET_t + %token _RBRACKET_t ++%token _LBRACE_t ++%token _RBRACE_t ++%token _AMPER_t ++%token _AMPERAMPER_t ++%token _PLUS_EQUALS_t + %token ACTIONS_t + %token BIND_t + %token BREAK_t +@@ -39,10 +43,6 @@ + %token TOGETHER_t + %token UPDATED_t + %token WHILE_t +-%token _LBRACE_t +-%token _BAR_t +-%token _BARBAR_t +-%token _RBRACE_t + /* + * Copyright 1993-2002 Christopher Seiwald and Perforce Software, Inc. + * +diff -Naur jam-2.5/jamgramtab.h jam-2.5-p/jamgramtab.h +--- jam-2.5/jamgramtab.h 2003-04-23 06:57:07.000000000 +0200 ++++ jam-2.5-p/jamgramtab.h 2007-08-19 22:36:55.000000000 +0200 +@@ -1,20 +1,24 @@ +- { "!", _BANG_t }, +- { "!=", _BANG_EQUALS_t }, +- { "&", _AMPER_t }, +- { "&&", _AMPERAMPER_t }, +- { "(", _LPAREN_t }, +- { ")", _RPAREN_t }, +- { "+=", _PLUS_EQUALS_t }, +- { ":", _COLON_t }, +- { ";", _SEMIC_t }, + { "<", _LANGLE_t }, + { "<=", _LANGLE_EQUALS_t }, + { "=", _EQUALS_t }, + { ">", _RANGLE_t }, + { ">=", _RANGLE_EQUALS_t }, ++ { "|", _BAR_t }, ++ { "||", _BARBAR_t }, ++ { ";", _SEMIC_t }, ++ { ":", _COLON_t }, ++ { "!", _BANG_t }, ++ { "!=", _BANG_EQUALS_t }, + { "?=", _QUESTION_EQUALS_t }, ++ { "(", _LPAREN_t }, ++ { ")", _RPAREN_t }, + { "[", _LBRACKET_t }, + { "]", _RBRACKET_t }, ++ { "{", _LBRACE_t }, ++ { "}", _RBRACE_t }, ++ { "&", _AMPER_t }, ++ { "&&", _AMPERAMPER_t }, ++ { "+=", _PLUS_EQUALS_t }, + { "actions", ACTIONS_t }, + { "bind", BIND_t }, + { "break", BREAK_t }, +@@ -39,7 +43,3 @@ + { "together", TOGETHER_t }, + { "updated", UPDATED_t }, + { "while", WHILE_t }, +- { "{", _LBRACE_t }, +- { "|", _BAR_t }, +- { "||", _BARBAR_t }, +- { "}", _RBRACE_t }, diff --git a/source/devel-extra/jam/jam-2.5-amd64.patch b/source/devel-extra/jam/jam-2.5-amd64.patch new file mode 100644 index 0000000..dfc7155 --- /dev/null +++ b/source/devel-extra/jam/jam-2.5-amd64.patch @@ -0,0 +1,14 @@ +diff -Nru jam-2.5.original/jam.h jam-2.5/jam.h +--- jam-2.5.original/jam.h 2003-04-23 06:45:51.000000000 +0200 ++++ jam-2.5/jam.h 2005-07-01 23:45:53.000000000 +0200 +@@ -449,6 +449,10 @@ + # define OSPLAT "OSPLAT=390" + # endif + ++# ifdef __amd64__ ++# define OSPLAT "OSPLAT=AMD64" ++# endif ++ + # ifndef OSPLAT + # define OSPLAT "" + # endif diff --git a/source/devel-extra/jam/jam-2.5-cxx.patch b/source/devel-extra/jam/jam-2.5-cxx.patch new file mode 100644 index 0000000..4159294 --- /dev/null +++ b/source/devel-extra/jam/jam-2.5-cxx.patch @@ -0,0 +1,43 @@ +Use the C++ compiler to build C++ code by default. + +Patch by Krzysiek Pawlik +http://bugs.gentoo.org/show_bug.cgi?id=87974 + +--- jam-2.5/Jambase ++++ jam-2.5/Jambase +@@ -533,7 +533,7 @@ + ASFLAGS ?= ; + AWK ?= awk ; + BINDIR ?= /usr/local/bin ; +- C++ ?= cc ; ++ C++ ?= c++ ; + C++FLAGS ?= ; + CC ?= cc ; + CCFLAGS ?= ; +@@ -1070,6 +1070,7 @@ + case .C : C++ $(<) : $(>) ; + case .cc : C++ $(<) : $(>) ; + case .cpp : C++ $(<) : $(>) ; ++ case .cxx : C++ $(<) : $(>) ; + case .f : Fortran $(<) : $(>) ; + case .l : Cc $(<) : $(<:S=.c) ; + Lex $(<:S=.c) : $(>) ; +--- jam-2.5/jambase.c ++++ jam-2.5/jambase.c +@@ -325,7 +325,7 @@ + "ASFLAGS ?= ;\n", + "AWK ?= awk ;\n", + "BINDIR ?= /usr/local/bin ;\n", +-"C++ ?= cc ;\n", ++"C++ ?= c++ ;\n", + "C++FLAGS ?= ;\n", + "CC ?= cc ;\n", + "CCFLAGS ?= ;\n", +@@ -658,6 +658,7 @@ + "case .C : C++ $(<) : $(>) ;\n", + "case .cc : C++ $(<) : $(>) ;\n", + "case .cpp : C++ $(<) : $(>) ;\n", ++"case .cxx : C++ $(<) : $(>) ;\n", + "case .f : Fortran $(<) : $(>) ;\n", + "case .l : Cc $(<) : $(<:S=.c) ;\n", + "Lex $(<:S=.c) : $(>) ;\n", diff --git a/source/devel-extra/jam/jam-2.5-dependency.patch b/source/devel-extra/jam/jam-2.5-dependency.patch new file mode 100644 index 0000000..eba137b --- /dev/null +++ b/source/devel-extra/jam/jam-2.5-dependency.patch @@ -0,0 +1,38 @@ +--- jam-2.5/Jambase ++++ jam-2.5/Jambase +@@ -710,7 +710,7 @@ + local s = $(>:G=$(HDRGRIST:E)) ; + + Includes $(<) : $(s) ; +- SEARCH on $(s) = $(HDRSEARCH) ; ++ SEARCH on $(s) = $(3:D) $(HDRSEARCH) ; + NoCare $(s) ; + + # Propagate on $(<) to $(>) +--- jam-2.5/headers.c ++++ jam-2.5/headers.c +@@ -71,7 +71,13 @@ + lol_add( &lol, headers1( t->boundname, hdrscan ) ); + + if( lol_get( &lol, 1 ) ) ++ { ++ /* The third argument to HDRRULE is the bound name of ++ * $(<) */ ++ lol_add( &lol, list_new( L0, t->boundname, 1 ) ); ++ + list_free( evaluate_rule( hdrrule->string, &lol, L0 ) ); ++ } + + /* Clean up */ + +--- jam-2.5/jambase.c ++++ jam-2.5/jambase.c +@@ -452,7 +452,7 @@ + "{\n", + "local s = $(>:G=$(HDRGRIST:E)) ;\n", + "Includes $(<) : $(s) ;\n", +-"SEARCH on $(s) = $(HDRSEARCH) ;\n", ++"SEARCH on $(s) = $(3:D) $(HDRSEARCH) ;\n", + "NoCare $(s) ;\n", + "HDRSEARCH on $(s) = $(HDRSEARCH) ;\n", + "HDRSCAN on $(s) = $(HDRSCAN) ;\n", diff --git a/source/devel/jam/FrugalBuild b/source/devel/jam/FrugalBuild deleted file mode 100644 index 7c537b3..0000000 --- a/source/devel/jam/FrugalBuild +++ /dev/null @@ -1,36 +0,0 @@ -# Compiling Time: ~0.03 SBU -# Maintainer: Christian Hamar alias krix - -pkgname=jam -pkgver=2.5 -pkgrel=3 -pkgdesc="Just Another Make - advanced make replacement" -url="http://www.perforce.com/jam/jam.html" -depends=('glibc') -groups=('devel') -archs=('x86_64' 'i686') -up2date="lynx -dump ftp://ftp.perforce.com/pub/jam/ |grep jam-[0-9\.]*.tar|tail -n 1|sed -ne 's/.*-\(.*\).t.*/\1/;1 p'" -source=(ftp://ftp.perforce.com/pub/$pkgname/$pkgname-$pkgver.tar \ - jam-2.5-cxx.patch \ - jam-2.5-amd64.patch \ - jam-2.5-dependency.patch \ - debian-fixes.patch) -sha1sums=('421c1b308c3c3dc4c95c0640078416af2195d841' \ - '9cf39afd9d7f5869fd8696516d6f53d7dbdddbbe' \ - 'cc55de044c1f619bad62b226a57801ba810ff006' \ - 'a0387cf1cd0dd7196eeed35a87d5030f4f58f977' \ - '4edb3d1814ae7acaf74152bff7814546424f97fc') - -build() -{ - unset MAKEFLAGS - Fcd - Fpatchall - export PATH="$PATH:$Fsrcdir" - make || Fdie - ./jam0 -sBINDIR=$Fdestdir/usr/bin \ - -sCCFLAGS=-g -sOPTIM=-O2 \ - install || Fdie - -} - diff --git a/source/devel/jam/debian-fixes.patch b/source/devel/jam/debian-fixes.patch deleted file mode 100644 index 81a2472..0000000 --- a/source/devel/jam/debian-fixes.patch +++ /dev/null @@ -1,2989 +0,0 @@ -diff -Naur jam-2.5/Jam.html jam-2.5-p/Jam.html ---- jam-2.5/Jam.html 2003-04-23 06:45:49.000000000 +0200 -+++ jam-2.5-p/Jam.html 2007-08-19 22:36:55.000000000 +0200 -@@ -169,11 +169,16 @@ - In the parsing phase, jam reads and executes the Jambase - file, by default the built-in one. It is written in the jam - language. See Language below. The -- last action of the Jambase is to read (via the "include" rule) -+ last action of the builtin Jambase is to read (via the "include" rule) - a user-provided file called "Jamfile". - -

    - -+ On Debian systems, the builtin Jambase is available for -+ reference as /usr/share/doc/jam/Jambase.gz. -+ -+

    -+ - Collectively, the purpose of the Jambase and the Jamfile is to - name built target and source files, construct the dependency - graph among them, and associate build actions with targets. -@@ -273,7 +278,7 @@ - -

    Overview

    - -- Jam has a interpreted, procedural language with a few -+ Jam has an interpreted, procedural language with a few - select features to effect program construction. Statements in - jam are rule (procedure) definitions, rule invocations, - updating action definitions, flow-of-control structures, variable -@@ -339,7 +344,7 @@ - -

    - -- When an rule with updating actions is invoked, those actions are -+ When a rule with updating actions is invoked, those actions are - added to those associated with its built targets ($(1)) before - the rule's procedure is run. Later, to build the targets in the - updating phase, the actions are passed to the OS command shell, -@@ -365,7 +370,7 @@ -

    Invoke a rule. A rule is invoked with values in - field1 through fieldN (9 max). They may be - referenced in the procedure's statements as $(1) -- through $(<9>N). $(<) and $(>) are synonymous -+ through $(N). $(<) and $(>) are synonymous - with $(1) and $(2). - -

    -@@ -851,7 +856,7 @@ - -

    Builds a direct dependency: makes each of targets1 - depend on each of targets2. Generally, targets1 -- will be rebuilt if targets2 are themselves rebuilt are -+ will be rebuilt if targets2 are themselves rebuilt - or are newer than targets1. - -

    -@@ -1069,7 +1074,7 @@ - -

    - -- These two variable control header file scanning. $(HDRSCAN) is -+ These two variables control header file scanning. $(HDRSCAN) is - an egrep(1) pattern, with ()'s surrounding the file name, - used to find file inclusion statements in source files. Jambase - uses $(HDRPATTERN) as the pattern for $(HDRSCAN). $(HDRRULE) -diff -Naur jam-2.5/Jambase jam-2.5-p/Jambase ---- jam-2.5/Jambase 2003-04-23 06:45:49.000000000 +0200 -+++ jam-2.5-p/Jambase 2007-08-19 22:36:55.000000000 +0200 -@@ -541,7 +541,7 @@ - CRELIB ?= ; - DOT ?= . ; - DOTDOT ?= .. ; -- EXEMODE ?= 711 ; -+ EXEMODE ?= 755 ; - FILEMODE ?= 644 ; - FORTRAN ?= f77 ; - FORTRANFLAGS ?= ; -@@ -1129,7 +1129,7 @@ - - rule Setuid - { -- MODE on [ FAppendSuffix $(<) : $(SUFEXE) ] = 4711 ; -+ MODE on [ FAppendSuffix $(<) : $(SUFEXE) ] = 4755 ; - } - - rule Shell -@@ -1420,7 +1420,7 @@ - - rule UserObject - { -- Exit "Unknown suffix on" $(>) "- see UserObject rule in Jamfile(5)." ; -+ Exit "Unknown suffix on" $(>) "- see UserObject rule in /usr/share/doc/jam/Jamfile.html." ; - } - - rule Yacc -diff -Naur jam-2.5/Jamfile.html jam-2.5-p/Jamfile.html ---- jam-2.5/Jamfile.html 2003-04-23 06:45:50.000000000 +0200 -+++ jam-2.5-p/Jamfile.html 2007-08-19 22:36:55.000000000 +0200 -@@ -290,7 +290,7 @@ - for automatic customizing with autoconf(GNU). -

    -

  • Optionally, set an environment variable pointing -- to the root directory of the srouce tree. The -+ to the root directory of the source tree. The - variable's name is left up to you, but in these - examples, we use TOP. - -diff -Naur jam-2.5/jambase.c jam-2.5-p/jambase.c ---- jam-2.5/jambase.c 2004-08-19 20:19:35.000000000 +0200 -+++ jam-2.5-p/jambase.c 2007-08-19 22:36:55.000000000 +0200 -@@ -333,7 +333,7 @@ - "CRELIB ?= ;\n", - "DOT ?= . ;\n", - "DOTDOT ?= .. ;\n", --"EXEMODE ?= 711 ;\n", -+"EXEMODE ?= 755 ;\n", - "FILEMODE ?= 644 ;\n", - "FORTRAN ?= f77 ;\n", - "FORTRANFLAGS ?= ;\n", -@@ -702,7 +702,7 @@ - "}\n", - "rule Setuid\n", - "{\n", --"MODE on [ FAppendSuffix $(<) : $(SUFEXE) ] = 4711 ;\n", -+"MODE on [ FAppendSuffix $(<) : $(SUFEXE) ] = 4755 ;\n", - "}\n", - "rule Shell\n", - "{\n", -@@ -816,7 +816,7 @@ - "}\n", - "rule UserObject\n", - "{\n", --"Exit \"Unknown suffix on\" $(>) \"- see UserObject rule in Jamfile(5).\" ;\n", -+"Exit \"Unknown suffix on\" $(>) \"- see UserObject rule in /usr/share/doc/jam/Jamfile.html.\" ;\n", - "}\n", - "rule Yacc\n", - "{\n", -diff -Naur jam-2.5/jamgram.c jam-2.5-p/jamgram.c ---- jam-2.5/jamgram.c 2004-08-19 20:19:34.000000000 +0200 -+++ jam-2.5-p/jamgram.c 2007-08-19 22:36:56.000000000 +0200 -@@ -1,23 +1,161 @@ --#ifndef lint --static char const --yyrcsid[] = "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28.2.1 2001/07/19 05:46:39 peter Exp $"; --#endif --#include --#define YYBYACC 1 --#define YYMAJOR 1 --#define YYMINOR 9 --#define YYLEX yylex() --#define YYEMPTY -1 --#define yyclearin (yychar=(YYEMPTY)) --#define yyerrok (yyerrflag=0) --#define YYRECOVERING() (yyerrflag!=0) --#if defined(__cplusplus) || __STDC__ --static int yygrowstack(void); --#else --static int yygrowstack(); --#endif --#define YYPREFIX "yy" --#line 85 "jamgram.y" -+/* A Bison parser, made by GNU Bison 1.875a. */ -+ -+/* Skeleton parser for Yacc-like parsing with Bison, -+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. */ -+ -+/* As a special exception, when this file is copied by Bison into a -+ Bison output file, you may use that output file without restriction. -+ This special exception was added by the Free Software Foundation -+ in version 1.24 of Bison. */ -+ -+/* Written by Richard Stallman by simplifying the original so called -+ ``semantic'' parser. */ -+ -+/* All symbols defined below should begin with yy or YY, to avoid -+ infringing on user name space. This should be done even for local -+ variables, as they might otherwise be expanded by user macros. -+ There are some unavoidable exceptions within include files to -+ define necessary library symbols; they are noted "INFRINGES ON -+ USER NAME SPACE" below. */ -+ -+/* Identify Bison output. */ -+#define YYBISON 1 -+ -+/* Skeleton name. */ -+#define YYSKELETON_NAME "yacc.c" -+ -+/* Pure parsers. */ -+#define YYPURE 0 -+ -+/* Using locations. */ -+#define YYLSP_NEEDED 0 -+ -+ -+ -+/* Tokens. */ -+#ifndef YYTOKENTYPE -+# define YYTOKENTYPE -+ /* Put the tokens into the symbol table, so that GDB and other debuggers -+ know about them. */ -+ enum yytokentype { -+ _LANGLE_t = 258, -+ _LANGLE_EQUALS_t = 259, -+ _EQUALS_t = 260, -+ _RANGLE_t = 261, -+ _RANGLE_EQUALS_t = 262, -+ _BAR_t = 263, -+ _BARBAR_t = 264, -+ _SEMIC_t = 265, -+ _COLON_t = 266, -+ _BANG_t = 267, -+ _BANG_EQUALS_t = 268, -+ _QUESTION_EQUALS_t = 269, -+ _LPAREN_t = 270, -+ _RPAREN_t = 271, -+ _LBRACKET_t = 272, -+ _RBRACKET_t = 273, -+ _LBRACE_t = 274, -+ _RBRACE_t = 275, -+ _AMPER_t = 276, -+ _AMPERAMPER_t = 277, -+ _PLUS_EQUALS_t = 278, -+ ACTIONS_t = 279, -+ BIND_t = 280, -+ BREAK_t = 281, -+ CASE_t = 282, -+ CONTINUE_t = 283, -+ DEFAULT_t = 284, -+ ELSE_t = 285, -+ EXISTING_t = 286, -+ FOR_t = 287, -+ IF_t = 288, -+ IGNORE_t = 289, -+ IN_t = 290, -+ INCLUDE_t = 291, -+ LOCAL_t = 292, -+ MAXLINE_t = 293, -+ ON_t = 294, -+ PIECEMEAL_t = 295, -+ QUIETLY_t = 296, -+ RETURN_t = 297, -+ RULE_t = 298, -+ SWITCH_t = 299, -+ TOGETHER_t = 300, -+ UPDATED_t = 301, -+ WHILE_t = 302, -+ ARG = 303, -+ STRING = 304 -+ }; -+#endif -+#define _LANGLE_t 258 -+#define _LANGLE_EQUALS_t 259 -+#define _EQUALS_t 260 -+#define _RANGLE_t 261 -+#define _RANGLE_EQUALS_t 262 -+#define _BAR_t 263 -+#define _BARBAR_t 264 -+#define _SEMIC_t 265 -+#define _COLON_t 266 -+#define _BANG_t 267 -+#define _BANG_EQUALS_t 268 -+#define _QUESTION_EQUALS_t 269 -+#define _LPAREN_t 270 -+#define _RPAREN_t 271 -+#define _LBRACKET_t 272 -+#define _RBRACKET_t 273 -+#define _LBRACE_t 274 -+#define _RBRACE_t 275 -+#define _AMPER_t 276 -+#define _AMPERAMPER_t 277 -+#define _PLUS_EQUALS_t 278 -+#define ACTIONS_t 279 -+#define BIND_t 280 -+#define BREAK_t 281 -+#define CASE_t 282 -+#define CONTINUE_t 283 -+#define DEFAULT_t 284 -+#define ELSE_t 285 -+#define EXISTING_t 286 -+#define FOR_t 287 -+#define IF_t 288 -+#define IGNORE_t 289 -+#define IN_t 290 -+#define INCLUDE_t 291 -+#define LOCAL_t 292 -+#define MAXLINE_t 293 -+#define ON_t 294 -+#define PIECEMEAL_t 295 -+#define QUIETLY_t 296 -+#define RETURN_t 297 -+#define RULE_t 298 -+#define SWITCH_t 299 -+#define TOGETHER_t 300 -+#define UPDATED_t 301 -+#define WHILE_t 302 -+#define ARG 303 -+#define STRING 304 -+ -+ -+ -+ -+/* Copy the first part of user declarations. */ -+#line 84 "jamgram.y" -+ - #include "jam.h" - - #include "lists.h" -@@ -56,877 +194,1614 @@ - # define pnode( l,r ) parse_make( F0,l,r,P0,S0,S0,0 ) - # define psnode( s,l ) parse_make( F0,l,P0,P0,s,S0,0 ) - --#line 60 "y.tab.c" --#define YYERRCODE 256 --#define _BANG_t 257 --#define _BANG_EQUALS_t 258 --#define _AMPER_t 259 --#define _AMPERAMPER_t 260 --#define _LPAREN_t 261 --#define _RPAREN_t 262 --#define _PLUS_EQUALS_t 263 --#define _COLON_t 264 --#define _SEMIC_t 265 --#define _LANGLE_t 266 --#define _LANGLE_EQUALS_t 267 --#define _EQUALS_t 268 --#define _RANGLE_t 269 --#define _RANGLE_EQUALS_t 270 --#define _QUESTION_EQUALS_t 271 --#define _LBRACKET_t 272 --#define _RBRACKET_t 273 --#define ACTIONS_t 274 --#define BIND_t 275 --#define BREAK_t 276 --#define CASE_t 277 --#define CONTINUE_t 278 --#define DEFAULT_t 279 --#define ELSE_t 280 --#define EXISTING_t 281 --#define FOR_t 282 --#define IF_t 283 --#define IGNORE_t 284 --#define IN_t 285 --#define INCLUDE_t 286 --#define LOCAL_t 287 --#define MAXLINE_t 288 --#define ON_t 289 --#define PIECEMEAL_t 290 --#define QUIETLY_t 291 --#define RETURN_t 292 --#define RULE_t 293 --#define SWITCH_t 294 --#define TOGETHER_t 295 --#define UPDATED_t 296 --#define WHILE_t 297 --#define _LBRACE_t 298 --#define _BAR_t 299 --#define _BARBAR_t 300 --#define _RBRACE_t 301 --#define ARG 302 --#define STRING 303 --const short yylhs[] = { -1, -- 0, 0, 2, 2, 1, 1, 1, 1, 3, 3, -- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, -- 3, 3, 3, 13, 14, 3, 7, 7, 7, 7, -- 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, -- 9, 9, 9, 9, 8, 8, 15, 10, 10, 10, -- 6, 6, 4, 16, 16, 5, 18, 5, 17, 17, -- 17, 11, 11, 19, 19, 19, 19, 19, 19, 19, -- 12, 12, --}; --const short yylen[] = { 2, -- 0, 1, 0, 1, 1, 2, 4, 6, 3, 3, -- 3, 4, 6, 3, 3, 3, 7, 5, 5, 7, -- 5, 6, 3, 0, 0, 9, 1, 1, 1, 2, -- 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, -- 3, 3, 2, 3, 0, 2, 4, 0, 3, 1, -- 1, 3, 1, 0, 2, 1, 0, 4, 2, 4, -- 4, 0, 2, 1, 1, 1, 1, 1, 1, 2, -- 0, 2, --}; --const short yydefred[] = { 0, -- 57, 62, 54, 54, 0, 0, 54, 54, 0, 54, -- 0, 54, 0, 0, 56, 0, 2, 0, 0, 0, -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- 0, 0, 0, 0, 0, 0, 4, 0, 6, 28, -- 27, 29, 0, 54, 0, 0, 54, 0, 54, 0, -- 69, 66, 0, 68, 67, 65, 64, 0, 63, 14, -- 55, 15, 54, 43, 0, 54, 0, 0, 0, 0, -- 0, 0, 0, 0, 0, 0, 0, 10, 0, 54, -- 23, 16, 0, 0, 0, 0, 9, 30, 0, 54, -- 11, 0, 0, 59, 58, 70, 54, 0, 0, 44, -- 42, 0, 0, 0, 34, 35, 0, 36, 37, 0, -- 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, -- 54, 52, 12, 54, 54, 72, 24, 0, 0, 0, -- 49, 0, 0, 18, 46, 21, 0, 61, 60, 0, -- 0, 0, 8, 22, 0, 13, 25, 17, 20, 47, -- 0, 26, --}; --const short yydgoto[] = { 16, -- 37, 38, 18, 45, 28, 46, 47, 118, 29, 84, -- 21, 98, 140, 151, 119, 23, 50, 20, 59, --}; --const short yysindex[] = { -40, -- 0, 0, 0, 0, -295, -233, 0, 0, -240, 0, -- -284, 0, -233, -40, 0, 0, 0, -40, -7, -241, -- 49, -242, -240, -232, -239, -233, -233, -231, -75, -220, -- -195, 34, -210, -243, -226, -59, 0, -223, 0, 0, -- 0, 0, -174, 0, -165, -164, 0, -240, 0, -173, -- 0, 0, -199, 0, 0, 0, 0, -166, 0, 0, -- 0, 0, 0, 0, -154, 0, -233, -233, -233, -233, -- -233, -233, -233, -233, -40, -233, -233, 0, -40, 0, -- 0, 0, -153, -179, -157, -40, 0, 0, -42, 0, -- 0, -144, -185, 0, 0, 0, 0, -171, -170, 0, -- 0, -54, 94, 94, 0, 0, -54, 0, 0, -160, -- 88, 88, 0, -140, -243, -40, -151, -139, -157, -134, -- 0, 0, 0, 0, 0, 0, 0, -40, -149, -40, -- 0, -131, -93, 0, 0, 0, -85, 0, 0, -121, -- -115, 34, 0, 0, -40, 0, 0, 0, 0, 0, -- -105, 0, --}; --const short yyrindex[] = { 197, -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- 0, 0, 0, -103, 0, 0, 0, 3, -235, 0, -- 0, 0, -110, 0, 0, 0, 0, -94, 0, 0, -- 0, 0, 0, -96, 0, 0, 0, 0, 0, 0, -- 0, 0, 0, 0, -246, 0, 0, 0, 0, 0, -- 0, 0, 0, 0, 0, 0, 0, -95, 0, 0, -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- 0, 0, 0, 0, -103, 0, 0, 0, 4, 0, -- 0, 0, -84, 0, -79, -103, 0, 0, 0, 0, -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- 0, -202, -224, -176, 0, 0, -81, 0, 0, 0, -- -257, -209, 0, 0, -96, -103, 0, 0, -79, 0, -- 0, 0, 0, 0, 0, 0, 0, -103, 1, 4, -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- 0, 0, 0, 0, -237, 0, 0, 0, 0, 0, -- 0, 0, --}; --const short yygindex[] = { 0, -- 26, -65, -32, 5, 2, -43, 131, 108, 66, 113, -- 0, 0, 0, 0, 0, 0, 0, 0, 0, --}; --#define YYTABLESIZE 364 --const short yytable[] = { 81, -- 19, 19, 5, 3, 40, 94, 25, 22, 24, 110, -- 32, 30, 31, 113, 33, 19, 35, 34, 51, 19, -- 120, 49, 60, 26, 61, 17, 51, 27, 54, 54, -- 1, 1, 62, 19, 38, 38, 54, 38, 1, 3, -- 40, 40, 40, 39, 78, 63, 122, 48, 89, 93, -- 132, 92, 41, 66, 82, 33, 33, 33, 83, 33, -- 15, 15, 141, 3, 143, 33, 54, 99, 15, 79, -- 101, 85, 80, 38, 38, 38, 19, 87, 36, 150, -- 19, 139, 39, 39, 114, 39, 1, 19, 41, 41, -- 41, 64, 65, 88, 125, 33, 33, 33, 90, 95, -- 91, 126, 96, 67, 68, 69, 124, 100, 97, 149, -- 115, 70, 71, 72, 73, 74, 15, 19, 116, 117, -- 123, 39, 39, 39, 130, 137, 127, 128, 138, 19, -- 142, 19, 102, 103, 104, 105, 106, 107, 108, 109, -- 129, 111, 112, 19, 76, 77, 19, 53, 53, 53, -- 133, 53, 53, 53, 53, 53, 53, 53, 53, 53, -- 53, 134, 53, 31, 31, 31, 136, 31, 53, 144, -- 145, 31, 31, 31, 31, 31, 32, 32, 32, 146, -- 32, 147, 67, 68, 69, 148, 32, 53, 53, 53, -- 70, 71, 72, 73, 74, 152, 1, 3, 67, 68, -- 69, 48, 71, 31, 31, 31, 70, 71, 72, 73, -- 74, 70, 71, 50, 73, 74, 32, 32, 32, 121, -- 40, 45, 75, 76, 77, 41, 135, 131, 42, 0, -- 0, 1, 0, 2, 0, 3, 43, 4, 86, 76, -- 77, 5, 6, 0, 0, 7, 8, 0, 9, 0, -- 0, 10, 11, 12, 0, 40, 13, 14, 0, 0, -- 41, 15, 0, 42, 0, 0, 0, 0, 0, 0, -- 0, 43, 19, 0, 19, 0, 19, 19, 19, 5, -- 3, 44, 19, 19, 0, 0, 19, 19, 0, 19, -- 0, 0, 19, 19, 19, 0, 0, 19, 19, 0, -- 0, 19, 19, 5, 3, 1, 0, 2, 0, 3, -- 0, 4, 0, 0, 0, 5, 6, 0, 0, 7, -- 0, 0, 9, 0, 0, 10, 11, 12, 0, 51, -- 13, 14, 52, 0, 0, 15, 53, 0, 54, 55, -- 0, 0, 0, 56, 57, 67, 68, 69, 0, 0, -- 58, 67, 0, 70, 71, 72, 73, 74, 0, 70, -- 71, 72, 73, 74, --}; --const short yycheck[] = { 32, -- 0, 0, 0, 0, 262, 49, 302, 3, 4, 75, -- 9, 7, 8, 79, 10, 14, 12, 302, 265, 18, -- 86, 20, 265, 257, 23, 0, 273, 261, 264, 265, -- 272, 272, 265, 32, 259, 260, 272, 262, 272, 277, -- 298, 299, 300, 18, 265, 285, 90, 289, 44, 48, -- 116, 47, 262, 285, 265, 258, 259, 260, 302, 262, -- 302, 302, 128, 301, 130, 268, 302, 63, 302, 265, -- 66, 298, 268, 298, 299, 300, 75, 301, 13, 145, -- 79, 125, 259, 260, 80, 262, 272, 86, 298, 299, -- 300, 26, 27, 268, 93, 298, 299, 300, 264, 273, -- 265, 97, 302, 258, 259, 260, 292, 262, 275, 142, -- 264, 266, 267, 268, 269, 270, 302, 116, 298, 277, -- 265, 298, 299, 300, 265, 121, 298, 298, 124, 128, -- 280, 130, 67, 68, 69, 70, 71, 72, 73, 74, -- 301, 76, 77, 142, 299, 300, 145, 258, 259, 260, -- 302, 262, 263, 264, 265, 266, 267, 268, 269, 270, -- 271, 301, 273, 258, 259, 260, 301, 262, 279, 301, -- 264, 266, 267, 268, 269, 270, 258, 259, 260, 265, -- 262, 303, 258, 259, 260, 301, 268, 298, 299, 300, -- 266, 267, 268, 269, 270, 301, 0, 301, 258, 259, -- 260, 298, 298, 298, 299, 300, 266, 267, 268, 269, -- 270, 266, 267, 298, 269, 270, 298, 299, 300, 89, -- 263, 301, 298, 299, 300, 268, 119, 115, 271, -1, -- -1, 272, -1, 274, -1, 276, 279, 278, 298, 299, -- 300, 282, 283, -1, -1, 286, 287, -1, 289, -1, -- -1, 292, 293, 294, -1, 263, 297, 298, -1, -1, -- 268, 302, -1, 271, -1, -1, -1, -1, -1, -1, -- -1, 279, 272, -1, 274, -1, 276, 277, 278, 277, -- 277, 289, 282, 283, -1, -1, 286, 287, -1, 289, -- -1, -1, 292, 293, 294, -1, -1, 297, 298, -1, -- -1, 301, 302, 301, 301, 272, -1, 274, -1, 276, -- -1, 278, -1, -1, -1, 282, 283, -1, -1, 286, -- -1, -1, 289, -1, -1, 292, 293, 294, -1, 281, -- 297, 298, 284, -1, -1, 302, 288, -1, 290, 291, -- -1, -1, -1, 295, 296, 258, 259, 260, -1, -1, -- 302, 258, -1, 266, 267, 268, 269, 270, -1, 266, -- 267, 268, 269, 270, --}; --#define YYFINAL 16 -+ -+ -+/* Enabling traces. */ - #ifndef YYDEBUG --#define YYDEBUG 0 -+# define YYDEBUG 0 - #endif --#define YYMAXTOKEN 303 --#if YYDEBUG --const char * const yyname[] = { --"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, --0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, --0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, --0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, --0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, --0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, --0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"_BANG_t","_BANG_EQUALS_t", --"_AMPER_t","_AMPERAMPER_t","_LPAREN_t","_RPAREN_t","_PLUS_EQUALS_t","_COLON_t", --"_SEMIC_t","_LANGLE_t","_LANGLE_EQUALS_t","_EQUALS_t","_RANGLE_t", --"_RANGLE_EQUALS_t","_QUESTION_EQUALS_t","_LBRACKET_t","_RBRACKET_t","ACTIONS_t", --"BIND_t","BREAK_t","CASE_t","CONTINUE_t","DEFAULT_t","ELSE_t","EXISTING_t", --"FOR_t","IF_t","IGNORE_t","IN_t","INCLUDE_t","LOCAL_t","MAXLINE_t","ON_t", --"PIECEMEAL_t","QUIETLY_t","RETURN_t","RULE_t","SWITCH_t","TOGETHER_t", --"UPDATED_t","WHILE_t","_LBRACE_t","_BAR_t","_BARBAR_t","_RBRACE_t","ARG", --"STRING", --}; --const char * const yyrule[] = { --"$accept : run", --"run :", --"run : rules", --"block :", --"block : rules", --"rules : rule", --"rules : rule rules", --"rules : LOCAL_t list _SEMIC_t block", --"rules : LOCAL_t list _EQUALS_t list _SEMIC_t block", --"rule : _LBRACE_t block _RBRACE_t", --"rule : INCLUDE_t list _SEMIC_t", --"rule : arg lol _SEMIC_t", --"rule : arg assign list _SEMIC_t", --"rule : arg ON_t list assign list _SEMIC_t", --"rule : BREAK_t list _SEMIC_t", --"rule : CONTINUE_t list _SEMIC_t", --"rule : RETURN_t list _SEMIC_t", --"rule : FOR_t ARG IN_t list _LBRACE_t block _RBRACE_t", --"rule : SWITCH_t list _LBRACE_t cases _RBRACE_t", --"rule : IF_t expr _LBRACE_t block _RBRACE_t", --"rule : IF_t expr _LBRACE_t block _RBRACE_t ELSE_t rule", --"rule : WHILE_t expr _LBRACE_t block _RBRACE_t", --"rule : RULE_t ARG params _LBRACE_t block _RBRACE_t", --"rule : ON_t arg rule", --"$$1 :", --"$$2 :", --"rule : ACTIONS_t eflags ARG bindlist _LBRACE_t $$1 STRING $$2 _RBRACE_t", --"assign : _EQUALS_t", --"assign : _PLUS_EQUALS_t", --"assign : _QUESTION_EQUALS_t", --"assign : DEFAULT_t _EQUALS_t", --"expr : arg", --"expr : expr _EQUALS_t expr", --"expr : expr _BANG_EQUALS_t expr", --"expr : expr _LANGLE_t expr", --"expr : expr _LANGLE_EQUALS_t expr", --"expr : expr _RANGLE_t expr", --"expr : expr _RANGLE_EQUALS_t expr", --"expr : expr _AMPER_t expr", --"expr : expr _AMPERAMPER_t expr", --"expr : expr _BAR_t expr", --"expr : expr _BARBAR_t expr", --"expr : arg IN_t list", --"expr : _BANG_t expr", --"expr : _LPAREN_t expr _RPAREN_t", --"cases :", --"cases : case cases", --"case : CASE_t ARG _COLON_t block", --"params :", --"params : ARG _COLON_t params", --"params : ARG", --"lol : list", --"lol : list _COLON_t lol", --"list : listp", --"listp :", --"listp : listp arg", --"arg : ARG", --"$$3 :", --"arg : _LBRACKET_t $$3 func _RBRACKET_t", --"func : arg lol", --"func : ON_t arg arg lol", --"func : ON_t arg RETURN_t list", --"eflags :", --"eflags : eflags eflag", --"eflag : UPDATED_t", --"eflag : TOGETHER_t", --"eflag : IGNORE_t", --"eflag : QUIETLY_t", --"eflag : PIECEMEAL_t", --"eflag : EXISTING_t", --"eflag : MAXLINE_t ARG", --"bindlist :", --"bindlist : BIND_t list", --}; -+ -+/* Enabling verbose error messages. */ -+#ifdef YYERROR_VERBOSE -+# undef YYERROR_VERBOSE -+# define YYERROR_VERBOSE 1 -+#else -+# define YYERROR_VERBOSE 0 - #endif --#ifndef YYSTYPE -+ -+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) - typedef int YYSTYPE; -+# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -+# define YYSTYPE_IS_DECLARED 1 -+# define YYSTYPE_IS_TRIVIAL 1 - #endif -+ -+ -+ -+/* Copy the second part of user declarations. */ -+ -+ -+/* Line 214 of yacc.c. */ -+#line 226 "y.tab.c" -+ -+#if ! defined (yyoverflow) || YYERROR_VERBOSE -+ -+/* The parser invokes alloca or malloc; define the necessary symbols. */ -+ -+# if YYSTACK_USE_ALLOCA -+# define YYSTACK_ALLOC alloca -+# else -+# ifndef YYSTACK_USE_ALLOCA -+# if defined (alloca) || defined (_ALLOCA_H) -+# define YYSTACK_ALLOC alloca -+# else -+# ifdef __GNUC__ -+# define YYSTACK_ALLOC __builtin_alloca -+# endif -+# endif -+# endif -+# endif -+ -+# ifdef YYSTACK_ALLOC -+ /* Pacify GCC's `empty if-body' warning. */ -+# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) -+# else -+# if defined (__STDC__) || defined (__cplusplus) -+# include /* INFRINGES ON USER NAME SPACE */ -+# define YYSIZE_T size_t -+# endif -+# define YYSTACK_ALLOC malloc -+# define YYSTACK_FREE free -+# endif -+#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ -+ -+ -+#if (! defined (yyoverflow) \ -+ && (! defined (__cplusplus) \ -+ || (YYSTYPE_IS_TRIVIAL))) -+ -+/* A type that is properly aligned for any stack member. */ -+union yyalloc -+{ -+ short yyss; -+ YYSTYPE yyvs; -+ }; -+ -+/* The size of the maximum gap between one aligned stack and the next. */ -+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) -+ -+/* The size of an array large to enough to hold all stacks, each with -+ N elements. */ -+# define YYSTACK_BYTES(N) \ -+ ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ -+ + YYSTACK_GAP_MAXIMUM) -+ -+/* Copy COUNT objects from FROM to TO. The source and destination do -+ not overlap. */ -+# ifndef YYCOPY -+# if 1 < __GNUC__ -+# define YYCOPY(To, From, Count) \ -+ __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -+# else -+# define YYCOPY(To, From, Count) \ -+ do \ -+ { \ -+ register YYSIZE_T yyi; \ -+ for (yyi = 0; yyi < (Count); yyi++) \ -+ (To)[yyi] = (From)[yyi]; \ -+ } \ -+ while (0) -+# endif -+# endif -+ -+/* Relocate STACK from its old location to the new one. The -+ local variables YYSIZE and YYSTACKSIZE give the old and new number of -+ elements in the stack, and YYPTR gives the new location of the -+ stack. Advance YYPTR to a properly aligned location for the next -+ stack. */ -+# define YYSTACK_RELOCATE(Stack) \ -+ do \ -+ { \ -+ YYSIZE_T yynewbytes; \ -+ YYCOPY (&yyptr->Stack, Stack, yysize); \ -+ Stack = &yyptr->Stack; \ -+ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ -+ yyptr += yynewbytes / sizeof (*yyptr); \ -+ } \ -+ while (0) -+ -+#endif -+ -+#if defined (__STDC__) || defined (__cplusplus) -+ typedef signed char yysigned_char; -+#else -+ typedef short yysigned_char; -+#endif -+ -+/* YYFINAL -- State number of the termination state. */ -+#define YYFINAL 39 -+/* YYLAST -- Last index in YYTABLE. */ -+#define YYLAST 250 -+ -+/* YYNTOKENS -- Number of terminals. */ -+#define YYNTOKENS 50 -+/* YYNNTS -- Number of nonterminals. */ -+#define YYNNTS 21 -+/* YYNRULES -- Number of rules. */ -+#define YYNRULES 73 -+/* YYNRULES -- Number of states. */ -+#define YYNSTATES 154 -+ -+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ -+#define YYUNDEFTOK 2 -+#define YYMAXUTOK 304 -+ -+#define YYTRANSLATE(YYX) \ -+ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -+ -+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -+static const unsigned char yytranslate[] = -+{ -+ 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -+ 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, -+ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, -+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, -+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, -+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, -+ 45, 46, 47, 48, 49 -+}; -+ - #if YYDEBUG --#include -+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in -+ YYRHS. */ -+static const unsigned char yyprhs[] = -+{ -+ 0, 0, 3, 4, 6, 7, 9, 11, 14, 19, -+ 26, 30, 34, 38, 43, 50, 54, 58, 62, 70, -+ 76, 82, 90, 96, 103, 107, 108, 109, 119, 121, -+ 123, 125, 128, 130, 134, 138, 142, 146, 150, 154, -+ 158, 162, 166, 170, 174, 177, 181, 182, 185, 190, -+ 191, 195, 197, 199, 203, 205, 206, 209, 211, 212, -+ 217, 220, 225, 230, 231, 234, 236, 238, 240, 242, -+ 244, 246, 249, 250 -+}; -+ -+/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -+static const yysigned_char yyrhs[] = -+{ -+ 51, 0, -1, -1, 53, -1, -1, 53, -1, 54, -+ -1, 54, 53, -1, 37, 63, 10, 52, -1, 37, -+ 63, 5, 63, 10, 52, -1, 19, 52, 20, -1, -+ 36, 63, 10, -1, 65, 62, 10, -1, 65, 57, -+ 63, 10, -1, 65, 39, 63, 57, 63, 10, -1, -+ 26, 63, 10, -1, 28, 63, 10, -1, 42, 63, -+ 10, -1, 32, 48, 35, 63, 19, 52, 20, -1, -+ 44, 63, 19, 59, 20, -1, 33, 58, 19, 52, -+ 20, -1, 33, 58, 19, 52, 20, 30, 54, -1, -+ 47, 58, 19, 52, 20, -1, 43, 48, 61, 19, -+ 52, 20, -1, 39, 65, 54, -1, -1, -1, 24, -+ 68, 48, 70, 19, 55, 49, 56, 20, -1, 5, -+ -1, 23, -1, 14, -1, 29, 5, -1, 65, -1, -+ 58, 5, 58, -1, 58, 13, 58, -1, 58, 3, -+ 58, -1, 58, 4, 58, -1, 58, 6, 58, -1, -+ 58, 7, 58, -1, 58, 21, 58, -1, 58, 22, -+ 58, -1, 58, 8, 58, -1, 58, 9, 58, -1, -+ 65, 35, 63, -1, 12, 58, -1, 15, 58, 16, -+ -1, -1, 60, 59, -1, 27, 48, 11, 52, -1, -+ -1, 48, 11, 61, -1, 48, -1, 63, -1, 63, -+ 11, 62, -1, 64, -1, -1, 64, 65, -1, 48, -+ -1, -1, 17, 66, 67, 18, -1, 65, 62, -1, -+ 39, 65, 65, 62, -1, 39, 65, 42, 63, -1, -+ -1, 68, 69, -1, 46, -1, 45, -1, 34, -1, -+ 41, -1, 40, -1, 31, -1, 38, 48, -1, -1, -+ 25, 63, -1 -+}; -+ -+/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -+static const unsigned short yyrline[] = -+{ -+ 0, 127, 127, 129, 141, 142, 146, 148, 150, 152, -+ 156, 158, 160, 162, 164, 166, 168, 170, 172, 174, -+ 176, 178, 180, 182, 184, 187, 189, 186, 198, 200, -+ 202, 204, 212, 214, 216, 218, 220, 222, 224, 226, -+ 228, 230, 232, 234, 236, 238, 249, 250, 254, 264, -+ 265, 267, 276, 278, 288, 293, 294, 298, 300, 300, -+ 309, 311, 313, 323, 324, 328, 330, 332, 334, 336, -+ 338, 340, 350, 351 -+}; -+#endif -+ -+#if YYDEBUG || YYERROR_VERBOSE -+/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. -+ First, the terminals, then, starting at YYNTOKENS, nonterminals. */ -+static const char *const yytname[] = -+{ -+ "$end", "error", "$undefined", "_LANGLE_t", "_LANGLE_EQUALS_t", -+ "_EQUALS_t", "_RANGLE_t", "_RANGLE_EQUALS_t", "_BAR_t", "_BARBAR_t", -+ "_SEMIC_t", "_COLON_t", "_BANG_t", "_BANG_EQUALS_t", -+ "_QUESTION_EQUALS_t", "_LPAREN_t", "_RPAREN_t", "_LBRACKET_t", -+ "_RBRACKET_t", "_LBRACE_t", "_RBRACE_t", "_AMPER_t", "_AMPERAMPER_t", -+ "_PLUS_EQUALS_t", "ACTIONS_t", "BIND_t", "BREAK_t", "CASE_t", -+ "CONTINUE_t", "DEFAULT_t", "ELSE_t", "EXISTING_t", "FOR_t", "IF_t", -+ "IGNORE_t", "IN_t", "INCLUDE_t", "LOCAL_t", "MAXLINE_t", "ON_t", -+ "PIECEMEAL_t", "QUIETLY_t", "RETURN_t", "RULE_t", "SWITCH_t", -+ "TOGETHER_t", "UPDATED_t", "WHILE_t", "ARG", "STRING", "$accept", "run", -+ "block", "rules", "rule", "@1", "@2", "assign", "expr", "cases", "case", -+ "params", "lol", "list", "listp", "arg", "@3", "func", "eflags", -+ "eflag", "bindlist", 0 -+}; - #endif --#ifdef YYSTACKSIZE --#undef YYMAXDEPTH --#define YYMAXDEPTH YYSTACKSIZE -+ -+# ifdef YYPRINT -+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to -+ token YYLEX-NUM. */ -+static const unsigned short yytoknum[] = -+{ -+ 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, -+ 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, -+ 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, -+ 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, -+ 295, 296, 297, 298, 299, 300, 301, 302, 303, 304 -+}; -+# endif -+ -+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -+static const unsigned char yyr1[] = -+{ -+ 0, 50, 51, 51, 52, 52, 53, 53, 53, 53, -+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, -+ 54, 54, 54, 54, 54, 55, 56, 54, 57, 57, -+ 57, 57, 58, 58, 58, 58, 58, 58, 58, 58, -+ 58, 58, 58, 58, 58, 58, 59, 59, 60, 61, -+ 61, 61, 62, 62, 63, 64, 64, 65, 66, 65, -+ 67, 67, 67, 68, 68, 69, 69, 69, 69, 69, -+ 69, 69, 70, 70 -+}; -+ -+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -+static const unsigned char yyr2[] = -+{ -+ 0, 2, 0, 1, 0, 1, 1, 2, 4, 6, -+ 3, 3, 3, 4, 6, 3, 3, 3, 7, 5, -+ 5, 7, 5, 6, 3, 0, 0, 9, 1, 1, -+ 1, 2, 1, 3, 3, 3, 3, 3, 3, 3, -+ 3, 3, 3, 3, 2, 3, 0, 2, 4, 0, -+ 3, 1, 1, 3, 1, 0, 2, 1, 0, 4, -+ 2, 4, 4, 0, 2, 1, 1, 1, 1, 1, -+ 1, 2, 0, 2 -+}; -+ -+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state -+ STATE-NUM when YYTABLE doesn't specify something else to do. Zero -+ means the default is an error. */ -+static const unsigned char yydefact[] = -+{ -+ 2, 58, 4, 63, 55, 55, 0, 0, 55, 55, -+ 0, 55, 0, 55, 0, 57, 0, 3, 6, 55, -+ 0, 0, 5, 0, 0, 54, 0, 0, 0, 0, -+ 0, 32, 0, 0, 0, 0, 49, 0, 0, 1, -+ 7, 28, 30, 29, 0, 55, 55, 0, 52, 0, -+ 55, 0, 10, 70, 67, 0, 69, 68, 66, 65, -+ 72, 64, 15, 56, 16, 55, 44, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 4, 0, 0, 55, -+ 11, 55, 4, 24, 17, 51, 0, 46, 4, 31, -+ 0, 0, 12, 55, 0, 60, 59, 71, 55, 0, -+ 0, 45, 35, 36, 33, 37, 38, 41, 42, 34, -+ 0, 39, 40, 43, 0, 8, 49, 4, 0, 0, -+ 46, 0, 55, 13, 53, 55, 55, 73, 25, 4, -+ 20, 4, 50, 0, 0, 19, 47, 22, 0, 62, -+ 61, 0, 0, 0, 9, 23, 4, 14, 26, 18, -+ 21, 48, 0, 27 -+}; -+ -+/* YYDEFGOTO[NTERM-NUM]. */ -+static const short yydefgoto[] = -+{ -+ -1, 16, 21, 22, 18, 141, 152, 46, 30, 119, -+ 120, 86, 47, 48, 25, 31, 20, 51, 23, 61, -+ 99 -+}; -+ -+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing -+ STATE-NUM. */ -+#define YYPACT_NINF -48 -+static const short yypact[] = -+{ -+ 130, -48, 130, -48, -48, -48, -43, -8, -48, -48, -+ 7, -48, -17, -48, -8, -48, 15, -48, 130, 9, -+ -11, 23, -48, 151, 31, 7, 35, 12, -8, -8, -+ 53, 16, 42, 17, 162, 59, 22, 44, 208, -48, -+ -48, -48, -48, -48, 72, -48, -48, 68, 69, 7, -+ -48, 66, -48, -48, -48, 38, -48, -48, -48, -48, -+ 65, -48, -48, -48, -48, -48, -48, 228, -8, -8, -+ -8, -8, -8, -8, -8, -8, 130, -8, -8, -48, -+ -48, -48, 130, -48, -48, 80, 73, 70, 130, -48, -+ 21, 83, -48, -48, -9, -48, -48, -48, -48, 79, -+ 88, -48, -48, -48, 61, -48, -48, 98, 98, 61, -+ 89, 109, 109, -48, 108, -48, 22, 130, 51, 101, -+ 70, 103, -48, -48, -48, -48, -48, -48, -48, 130, -+ 78, 130, -48, 104, 114, -48, -48, -48, 116, -48, -+ -48, 85, 107, 162, -48, -48, 130, -48, -48, -48, -+ -48, -48, 112, -48 -+}; -+ -+/* YYPGOTO[NTERM-NUM]. */ -+static const yysigned_char yypgoto[] = -+{ -+ -48, -48, -46, 11, -33, -48, -48, 58, 67, 30, -+ -48, 36, -47, 8, -48, 0, -48, -48, -48, -48, -+ -48 -+}; -+ -+/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If -+ positive, shift that token. If negative, reduce the rule which -+ number is the opposite. If zero, do what YYDEFACT says. -+ If YYTABLE_NINF, syntax error. */ -+#define YYTABLE_NINF -1 -+static const unsigned char yytable[] = -+{ -+ 19, 83, 19, 95, 28, 27, 1, 29, 1, 1, -+ 34, 17, 24, 26, 41, 39, 32, 33, 19, 35, -+ 50, 37, 81, 42, 1, 63, 41, 82, 49, 40, -+ 110, 36, 43, 125, 19, 42, 115, 15, 44, 15, -+ 15, 62, 121, 52, 43, 64, 124, 65, 45, 94, -+ 44, 79, 80, 90, 91, 15, 68, 69, 70, 71, -+ 72, 73, 74, 87, 68, 69, 75, 71, 72, 84, -+ 85, 133, 76, 100, 77, 78, 19, 89, 92, 140, -+ 93, 38, 19, 142, 96, 144, 97, 113, 19, 114, -+ 98, 116, 117, 123, 126, 66, 67, 118, 128, 134, -+ 151, 68, 69, 70, 71, 72, 127, 129, 143, 130, -+ 150, 75, 68, 69, 70, 71, 72, 19, 131, 77, -+ 78, 135, 75, 137, 145, 146, 147, 149, 0, 19, -+ 138, 19, 153, 139, 148, 102, 103, 104, 105, 106, -+ 107, 108, 109, 19, 111, 112, 19, 1, 122, 2, -+ 136, 0, 132, 0, 3, 0, 4, 0, 5, 0, -+ 0, 0, 6, 7, 0, 0, 8, 9, 0, 10, -+ 0, 0, 11, 12, 13, 0, 0, 14, 15, 1, -+ 0, 2, 53, 0, 0, 54, 3, 0, 4, 55, -+ 5, 56, 57, 0, 6, 7, 58, 59, 8, 60, -+ 0, 10, 0, 0, 11, 12, 13, 0, 0, 14, -+ 15, 68, 69, 70, 71, 72, 73, 74, 0, 0, -+ 0, 75, 0, 0, 0, 0, 0, 88, 0, 77, -+ 78, 68, 69, 70, 71, 72, 73, 74, 0, 0, -+ 0, 75, 0, 0, 101, 0, 0, 0, 0, 77, -+ 78 -+}; -+ -+static const short yycheck[] = -+{ -+ 0, 34, 2, 50, 12, 48, 17, 15, 17, 17, -+ 10, 0, 4, 5, 5, 0, 8, 9, 18, 11, -+ 20, 13, 5, 14, 17, 25, 5, 10, 39, 18, -+ 76, 48, 23, 42, 34, 14, 82, 48, 29, 48, -+ 48, 10, 88, 20, 23, 10, 93, 35, 39, 49, -+ 29, 35, 10, 45, 46, 48, 3, 4, 5, 6, -+ 7, 8, 9, 19, 3, 4, 13, 6, 7, 10, -+ 48, 117, 19, 65, 21, 22, 76, 5, 10, 126, -+ 11, 14, 82, 129, 18, 131, 48, 79, 88, 81, -+ 25, 11, 19, 10, 94, 28, 29, 27, 19, 48, -+ 146, 3, 4, 5, 6, 7, 98, 19, 30, 20, -+ 143, 13, 3, 4, 5, 6, 7, 117, 10, 21, -+ 22, 20, 13, 20, 20, 11, 10, 20, -1, 129, -+ 122, 131, 20, 125, 49, 68, 69, 70, 71, 72, -+ 73, 74, 75, 143, 77, 78, 146, 17, 90, 19, -+ 120, -1, 116, -1, 24, -1, 26, -1, 28, -1, -+ -1, -1, 32, 33, -1, -1, 36, 37, -1, 39, -+ -1, -1, 42, 43, 44, -1, -1, 47, 48, 17, -+ -1, 19, 31, -1, -1, 34, 24, -1, 26, 38, -+ 28, 40, 41, -1, 32, 33, 45, 46, 36, 48, -+ -1, 39, -1, -1, 42, 43, 44, -1, -1, 47, -+ 48, 3, 4, 5, 6, 7, 8, 9, -1, -1, -+ -1, 13, -1, -1, -1, -1, -1, 19, -1, 21, -+ 22, 3, 4, 5, 6, 7, 8, 9, -1, -1, -+ -1, 13, -1, -1, 16, -1, -1, -1, -1, 21, -+ 22 -+}; -+ -+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing -+ symbol of state STATE-NUM. */ -+static const unsigned char yystos[] = -+{ -+ 0, 17, 19, 24, 26, 28, 32, 33, 36, 37, -+ 39, 42, 43, 44, 47, 48, 51, 53, 54, 65, -+ 66, 52, 53, 68, 63, 64, 63, 48, 12, 15, -+ 58, 65, 63, 63, 65, 63, 48, 63, 58, 0, -+ 53, 5, 14, 23, 29, 39, 57, 62, 63, 39, -+ 65, 67, 20, 31, 34, 38, 40, 41, 45, 46, -+ 48, 69, 10, 65, 10, 35, 58, 58, 3, 4, -+ 5, 6, 7, 8, 9, 13, 19, 21, 22, 35, -+ 10, 5, 10, 54, 10, 48, 61, 19, 19, 5, -+ 63, 63, 10, 11, 65, 62, 18, 48, 25, 70, -+ 63, 16, 58, 58, 58, 58, 58, 58, 58, 58, -+ 52, 58, 58, 63, 63, 52, 11, 19, 27, 59, -+ 60, 52, 57, 10, 62, 42, 65, 63, 19, 19, -+ 20, 10, 61, 52, 48, 20, 59, 20, 63, 63, -+ 62, 55, 52, 30, 52, 20, 11, 10, 49, 20, -+ 54, 52, 56, 20 -+}; -+ -+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) -+# define YYSIZE_T __SIZE_TYPE__ -+#endif -+#if ! defined (YYSIZE_T) && defined (size_t) -+# define YYSIZE_T size_t -+#endif -+#if ! defined (YYSIZE_T) -+# if defined (__STDC__) || defined (__cplusplus) -+# include /* INFRINGES ON USER NAME SPACE */ -+# define YYSIZE_T size_t -+# endif -+#endif -+#if ! defined (YYSIZE_T) -+# define YYSIZE_T unsigned int -+#endif -+ -+#define yyerrok (yyerrstatus = 0) -+#define yyclearin (yychar = YYEMPTY) -+#define YYEMPTY (-2) -+#define YYEOF 0 -+ -+#define YYACCEPT goto yyacceptlab -+#define YYABORT goto yyabortlab -+#define YYERROR goto yyerrlab1 -+ -+ -+/* Like YYERROR except do call yyerror. This remains here temporarily -+ to ease the transition to the new meaning of YYERROR, for GCC. -+ Once GCC version 2 has supplanted version 1, this can go. */ -+ -+#define YYFAIL goto yyerrlab -+ -+#define YYRECOVERING() (!!yyerrstatus) -+ -+#define YYBACKUP(Token, Value) \ -+do \ -+ if (yychar == YYEMPTY && yylen == 1) \ -+ { \ -+ yychar = (Token); \ -+ yylval = (Value); \ -+ yytoken = YYTRANSLATE (yychar); \ -+ YYPOPSTACK; \ -+ goto yybackup; \ -+ } \ -+ else \ -+ { \ -+ yyerror ("syntax error: cannot back up");\ -+ YYERROR; \ -+ } \ -+while (0) -+ -+#define YYTERROR 1 -+#define YYERRCODE 256 -+ -+/* YYLLOC_DEFAULT -- Compute the default location (before the actions -+ are run). */ -+ -+#ifndef YYLLOC_DEFAULT -+# define YYLLOC_DEFAULT(Current, Rhs, N) \ -+ Current.first_line = Rhs[1].first_line; \ -+ Current.first_column = Rhs[1].first_column; \ -+ Current.last_line = Rhs[N].last_line; \ -+ Current.last_column = Rhs[N].last_column; -+#endif -+ -+/* YYLEX -- calling `yylex' with the right arguments. */ -+ -+#ifdef YYLEX_PARAM -+# define YYLEX yylex (YYLEX_PARAM) - #else --#ifdef YYMAXDEPTH --#define YYSTACKSIZE YYMAXDEPTH -+# define YYLEX yylex () -+#endif -+ -+/* Enable debugging if requested. */ -+#if YYDEBUG -+ -+# ifndef YYFPRINTF -+# include /* INFRINGES ON USER NAME SPACE */ -+# define YYFPRINTF fprintf -+# endif -+ -+# define YYDPRINTF(Args) \ -+do { \ -+ if (yydebug) \ -+ YYFPRINTF Args; \ -+} while (0) -+ -+# define YYDSYMPRINT(Args) \ -+do { \ -+ if (yydebug) \ -+ yysymprint Args; \ -+} while (0) -+ -+# define YYDSYMPRINTF(Title, Token, Value, Location) \ -+do { \ -+ if (yydebug) \ -+ { \ -+ YYFPRINTF (stderr, "%s ", Title); \ -+ yysymprint (stderr, \ -+ Token, Value); \ -+ YYFPRINTF (stderr, "\n"); \ -+ } \ -+} while (0) -+ -+/*------------------------------------------------------------------. -+| yy_stack_print -- Print the state stack from its BOTTOM up to its | -+| TOP (cinluded). | -+`------------------------------------------------------------------*/ -+ -+#if defined (__STDC__) || defined (__cplusplus) -+static void -+yy_stack_print (short *bottom, short *top) - #else --#define YYSTACKSIZE 10000 --#define YYMAXDEPTH 10000 -+static void -+yy_stack_print (bottom, top) -+ short *bottom; -+ short *top; - #endif -+{ -+ YYFPRINTF (stderr, "Stack now"); -+ for (/* Nothing. */; bottom <= top; ++bottom) -+ YYFPRINTF (stderr, " %d", *bottom); -+ YYFPRINTF (stderr, "\n"); -+} -+ -+# define YY_STACK_PRINT(Bottom, Top) \ -+do { \ -+ if (yydebug) \ -+ yy_stack_print ((Bottom), (Top)); \ -+} while (0) -+ -+ -+/*------------------------------------------------. -+| Report that the YYRULE is going to be reduced. | -+`------------------------------------------------*/ -+ -+#if defined (__STDC__) || defined (__cplusplus) -+static void -+yy_reduce_print (int yyrule) -+#else -+static void -+yy_reduce_print (yyrule) -+ int yyrule; - #endif --#define YYINITSTACKSIZE 200 -+{ -+ int yyi; -+ unsigned int yylineno = yyrline[yyrule]; -+ YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", -+ yyrule - 1, yylineno); -+ /* Print the symbols being reduced, and their result. */ -+ for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) -+ YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); -+ YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]); -+} -+ -+# define YY_REDUCE_PRINT(Rule) \ -+do { \ -+ if (yydebug) \ -+ yy_reduce_print (Rule); \ -+} while (0) -+ -+/* Nonzero means print parse trace. It is left uninitialized so that -+ multiple parsers can coexist. */ - int yydebug; --int yynerrs; --int yyerrflag; -+#else /* !YYDEBUG */ -+# define YYDPRINTF(Args) -+# define YYDSYMPRINT(Args) -+# define YYDSYMPRINTF(Title, Token, Value, Location) -+# define YY_STACK_PRINT(Bottom, Top) -+# define YY_REDUCE_PRINT(Rule) -+#endif /* !YYDEBUG */ -+ -+ -+/* YYINITDEPTH -- initial size of the parser's stacks. */ -+#ifndef YYINITDEPTH -+# define YYINITDEPTH 200 -+#endif -+ -+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only -+ if the built-in stack extension method is used). -+ -+ Do not make this value too large; the results are undefined if -+ SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) -+ evaluated with infinite-precision integer arithmetic. */ -+ -+#if YYMAXDEPTH == 0 -+# undef YYMAXDEPTH -+#endif -+ -+#ifndef YYMAXDEPTH -+# define YYMAXDEPTH 10000 -+#endif -+ -+ -+ -+#if YYERROR_VERBOSE -+ -+# ifndef yystrlen -+# if defined (__GLIBC__) && defined (_STRING_H) -+# define yystrlen strlen -+# else -+/* Return the length of YYSTR. */ -+static YYSIZE_T -+# if defined (__STDC__) || defined (__cplusplus) -+yystrlen (const char *yystr) -+# else -+yystrlen (yystr) -+ const char *yystr; -+# endif -+{ -+ register const char *yys = yystr; -+ -+ while (*yys++ != '\0') -+ continue; -+ -+ return yys - yystr - 1; -+} -+# endif -+# endif -+ -+# ifndef yystpcpy -+# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE) -+# define yystpcpy stpcpy -+# else -+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in -+ YYDEST. */ -+static char * -+# if defined (__STDC__) || defined (__cplusplus) -+yystpcpy (char *yydest, const char *yysrc) -+# else -+yystpcpy (yydest, yysrc) -+ char *yydest; -+ const char *yysrc; -+# endif -+{ -+ register char *yyd = yydest; -+ register const char *yys = yysrc; -+ -+ while ((*yyd++ = *yys++) != '\0') -+ continue; -+ -+ return yyd - 1; -+} -+# endif -+# endif -+ -+#endif /* !YYERROR_VERBOSE */ -+ -+ -+ -+#if YYDEBUG -+/*--------------------------------. -+| Print this symbol on YYOUTPUT. | -+`--------------------------------*/ -+ -+#if defined (__STDC__) || defined (__cplusplus) -+static void -+yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep) -+#else -+static void -+yysymprint (yyoutput, yytype, yyvaluep) -+ FILE *yyoutput; -+ int yytype; -+ YYSTYPE *yyvaluep; -+#endif -+{ -+ /* Pacify ``unused variable'' warnings. */ -+ (void) yyvaluep; -+ -+ if (yytype < YYNTOKENS) -+ { -+ YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); -+# ifdef YYPRINT -+ YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -+# endif -+ } -+ else -+ YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); -+ -+ switch (yytype) -+ { -+ default: -+ break; -+ } -+ YYFPRINTF (yyoutput, ")"); -+} -+ -+#endif /* ! YYDEBUG */ -+/*-----------------------------------------------. -+| Release the memory associated to this symbol. | -+`-----------------------------------------------*/ -+ -+#if defined (__STDC__) || defined (__cplusplus) -+static void -+yydestruct (int yytype, YYSTYPE *yyvaluep) -+#else -+static void -+yydestruct (yytype, yyvaluep) -+ int yytype; -+ YYSTYPE *yyvaluep; -+#endif -+{ -+ /* Pacify ``unused variable'' warnings. */ -+ (void) yyvaluep; -+ -+ switch (yytype) -+ { -+ -+ default: -+ break; -+ } -+} -+ -+ -+/* Prevent warnings from -Wmissing-prototypes. */ -+ -+#ifdef YYPARSE_PARAM -+# if defined (__STDC__) || defined (__cplusplus) -+int yyparse (void *YYPARSE_PARAM); -+# else -+int yyparse (); -+# endif -+#else /* ! YYPARSE_PARAM */ -+#if defined (__STDC__) || defined (__cplusplus) -+int yyparse (void); -+#else -+int yyparse (); -+#endif -+#endif /* ! YYPARSE_PARAM */ -+ -+ -+ -+/* The lookahead symbol. */ - int yychar; --short *yyssp; --YYSTYPE *yyvsp; --YYSTYPE yyval; -+ -+/* The semantic value of the lookahead symbol. */ - YYSTYPE yylval; --short *yyss; --short *yysslim; --YYSTYPE *yyvs; --int yystacksize; --/* allocate initial stack or double stack size, up to YYMAXDEPTH */ --static int yygrowstack() --{ -- int newsize, i; -- short *newss; -- YYSTYPE *newvs; -- -- if ((newsize = yystacksize) == 0) -- newsize = YYINITSTACKSIZE; -- else if (newsize >= YYMAXDEPTH) -- return -1; -- else if ((newsize *= 2) > YYMAXDEPTH) -- newsize = YYMAXDEPTH; -- i = yyssp - yyss; -- newss = yyss ? (short *)realloc(yyss, newsize * sizeof *newss) : -- (short *)malloc(newsize * sizeof *newss); -- if (newss == NULL) -- return -1; -- yyss = newss; -- yyssp = newss + i; -- newvs = yyvs ? (YYSTYPE *)realloc(yyvs, newsize * sizeof *newvs) : -- (YYSTYPE *)malloc(newsize * sizeof *newvs); -- if (newvs == NULL) -- return -1; -- yyvs = newvs; -- yyvsp = newvs + i; -- yystacksize = newsize; -- yysslim = yyss + newsize - 1; -- return 0; --} - --#define YYABORT goto yyabort --#define YYREJECT goto yyabort --#define YYACCEPT goto yyaccept --#define YYERROR goto yyerrlab -- --#ifndef YYPARSE_PARAM --#if defined(__cplusplus) || __STDC__ --#define YYPARSE_PARAM_ARG void --#define YYPARSE_PARAM_DECL --#else /* ! ANSI-C/C++ */ --#define YYPARSE_PARAM_ARG --#define YYPARSE_PARAM_DECL --#endif /* ANSI-C/C++ */ --#else /* YYPARSE_PARAM */ --#ifndef YYPARSE_PARAM_TYPE --#define YYPARSE_PARAM_TYPE void * --#endif --#if defined(__cplusplus) || __STDC__ --#define YYPARSE_PARAM_ARG YYPARSE_PARAM_TYPE YYPARSE_PARAM --#define YYPARSE_PARAM_DECL --#else /* ! ANSI-C/C++ */ --#define YYPARSE_PARAM_ARG YYPARSE_PARAM --#define YYPARSE_PARAM_DECL YYPARSE_PARAM_TYPE YYPARSE_PARAM; --#endif /* ANSI-C/C++ */ --#endif /* ! YYPARSE_PARAM */ -+/* Number of syntax errors so far. */ -+int yynerrs; -+ -+ -+ -+/*----------. -+| yyparse. | -+`----------*/ - -+#ifdef YYPARSE_PARAM -+# if defined (__STDC__) || defined (__cplusplus) -+int yyparse (void *YYPARSE_PARAM) -+# else -+int yyparse (YYPARSE_PARAM) -+ void *YYPARSE_PARAM; -+# endif -+#else /* ! YYPARSE_PARAM */ -+#if defined (__STDC__) || defined (__cplusplus) - int --yyparse (YYPARSE_PARAM_ARG) -- YYPARSE_PARAM_DECL -+yyparse (void) -+#else -+int -+yyparse () -+ -+#endif -+#endif - { -- register int yym, yyn, yystate; --#if YYDEBUG -- register const char *yys; -+ -+ register int yystate; -+ register int yyn; -+ int yyresult; -+ /* Number of tokens to shift before error messages enabled. */ -+ int yyerrstatus; -+ /* Lookahead token as an internal (translated) token number. */ -+ int yytoken = 0; -+ -+ /* Three stacks and their tools: -+ `yyss': related to states, -+ `yyvs': related to semantic values, -+ `yyls': related to locations. -+ -+ Refer to the stacks thru separate pointers, to allow yyoverflow -+ to reallocate them elsewhere. */ -+ -+ /* The state stack. */ -+ short yyssa[YYINITDEPTH]; -+ short *yyss = yyssa; -+ register short *yyssp; -+ -+ /* The semantic value stack. */ -+ YYSTYPE yyvsa[YYINITDEPTH]; -+ YYSTYPE *yyvs = yyvsa; -+ register YYSTYPE *yyvsp; -+ -+ -+ -+#define YYPOPSTACK (yyvsp--, yyssp--) - -- if ((yys = getenv("YYDEBUG"))) -+ YYSIZE_T yystacksize = YYINITDEPTH; -+ -+ /* The variables used to return semantic value and location from the -+ action routines. */ -+ YYSTYPE yyval; -+ -+ -+ /* When reducing, the number of symbols on the RHS of the reduced -+ rule. */ -+ int yylen; -+ -+ YYDPRINTF ((stderr, "Starting parse\n")); -+ -+ yystate = 0; -+ yyerrstatus = 0; -+ yynerrs = 0; -+ yychar = YYEMPTY; /* Cause a token to be read. */ -+ -+ /* Initialize stack pointers. -+ Waste one element of value and location stack -+ so that they stay on the same level as the state stack. -+ The wasted elements are never initialized. */ -+ -+ yyssp = yyss; -+ yyvsp = yyvs; -+ -+ goto yysetstate; -+ -+/*------------------------------------------------------------. -+| yynewstate -- Push a new state, which is found in yystate. | -+`------------------------------------------------------------*/ -+ yynewstate: -+ /* In all cases, when you get here, the value and location stacks -+ have just been pushed. so pushing a state here evens the stacks. -+ */ -+ yyssp++; -+ -+ yysetstate: -+ *yyssp = yystate; -+ -+ if (yyss + yystacksize - 1 <= yyssp) - { -- yyn = *yys; -- if (yyn >= '0' && yyn <= '9') -- yydebug = yyn - '0'; -+ /* Get the current used size of the three stacks, in elements. */ -+ YYSIZE_T yysize = yyssp - yyss + 1; -+ -+#ifdef yyoverflow -+ { -+ /* Give user a chance to reallocate the stack. Use copies of -+ these so that the &'s don't force the real ones into -+ memory. */ -+ YYSTYPE *yyvs1 = yyvs; -+ short *yyss1 = yyss; -+ -+ -+ /* Each stack pointer address is followed by the size of the -+ data in use in that stack, in bytes. This used to be a -+ conditional around just the two extra args, but that might -+ be undefined if yyoverflow is a macro. */ -+ yyoverflow ("parser stack overflow", -+ &yyss1, yysize * sizeof (*yyssp), -+ &yyvs1, yysize * sizeof (*yyvsp), -+ -+ &yystacksize); -+ -+ yyss = yyss1; -+ yyvs = yyvs1; -+ } -+#else /* no yyoverflow */ -+# ifndef YYSTACK_RELOCATE -+ goto yyoverflowlab; -+# else -+ /* Extend the stack our own way. */ -+ if (YYMAXDEPTH <= yystacksize) -+ goto yyoverflowlab; -+ yystacksize *= 2; -+ if (YYMAXDEPTH < yystacksize) -+ yystacksize = YYMAXDEPTH; -+ -+ { -+ short *yyss1 = yyss; -+ union yyalloc *yyptr = -+ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); -+ if (! yyptr) -+ goto yyoverflowlab; -+ YYSTACK_RELOCATE (yyss); -+ YYSTACK_RELOCATE (yyvs); -+ -+# undef YYSTACK_RELOCATE -+ if (yyss1 != yyssa) -+ YYSTACK_FREE (yyss1); -+ } -+# endif -+#endif /* no yyoverflow */ -+ -+ yyssp = yyss + yysize - 1; -+ yyvsp = yyvs + yysize - 1; -+ -+ -+ YYDPRINTF ((stderr, "Stack size increased to %lu\n", -+ (unsigned long int) yystacksize)); -+ -+ if (yyss + yystacksize - 1 <= yyssp) -+ YYABORT; - } --#endif - -- yynerrs = 0; -- yyerrflag = 0; -- yychar = (-1); -+ YYDPRINTF ((stderr, "Entering state %d\n", yystate)); -+ -+ goto yybackup; -+ -+/*-----------. -+| yybackup. | -+`-----------*/ -+yybackup: -+ -+/* Do appropriate processing given the current state. */ -+/* Read a lookahead token if we need one and don't already have one. */ -+/* yyresume: */ - -- if (yyss == NULL && yygrowstack()) goto yyoverflow; -- yyssp = yyss; -- yyvsp = yyvs; -- *yyssp = yystate = 0; -+ /* First try to decide what to do without reference to lookahead token. */ - --yyloop: -- if ((yyn = yydefred[yystate])) goto yyreduce; -- if (yychar < 0) -+ yyn = yypact[yystate]; -+ if (yyn == YYPACT_NINF) -+ goto yydefault; -+ -+ /* Not known => get a lookahead token if don't already have one. */ -+ -+ /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ -+ if (yychar == YYEMPTY) - { -- if ((yychar = yylex()) < 0) yychar = 0; --#if YYDEBUG -- if (yydebug) -- { -- yys = 0; -- if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; -- if (!yys) yys = "illegal-symbol"; -- printf("%sdebug: state %d, reading %d (%s)\n", -- YYPREFIX, yystate, yychar, yys); -- } --#endif -+ YYDPRINTF ((stderr, "Reading a token: ")); -+ yychar = YYLEX; - } -- if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 && -- yyn <= YYTABLESIZE && yycheck[yyn] == yychar) -+ -+ if (yychar <= YYEOF) - { --#if YYDEBUG -- if (yydebug) -- printf("%sdebug: state %d, shifting to state %d\n", -- YYPREFIX, yystate, yytable[yyn]); --#endif -- if (yyssp >= yysslim && yygrowstack()) -- { -- goto yyoverflow; -- } -- *++yyssp = yystate = yytable[yyn]; -- *++yyvsp = yylval; -- yychar = (-1); -- if (yyerrflag > 0) --yyerrflag; -- goto yyloop; -- } -- if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 && -- yyn <= YYTABLESIZE && yycheck[yyn] == yychar) -- { -- yyn = yytable[yyn]; -- goto yyreduce; -- } -- if (yyerrflag) goto yyinrecovery; --#if defined(lint) || defined(__GNUC__) -- goto yynewerror; --#endif --yynewerror: -- yyerror("syntax error"); --#if defined(lint) || defined(__GNUC__) -- goto yyerrlab; --#endif --yyerrlab: -- ++yynerrs; --yyinrecovery: -- if (yyerrflag < 3) -+ yychar = yytoken = YYEOF; -+ YYDPRINTF ((stderr, "Now at end of input.\n")); -+ } -+ else - { -- yyerrflag = 3; -- for (;;) -- { -- if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 && -- yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE) -- { --#if YYDEBUG -- if (yydebug) -- printf("%sdebug: state %d, error recovery shifting\ -- to state %d\n", YYPREFIX, *yyssp, yytable[yyn]); --#endif -- if (yyssp >= yysslim && yygrowstack()) -- { -- goto yyoverflow; -- } -- *++yyssp = yystate = yytable[yyn]; -- *++yyvsp = yylval; -- goto yyloop; -- } -- else -- { --#if YYDEBUG -- if (yydebug) -- printf("%sdebug: error recovery discarding state %d\n", -- YYPREFIX, *yyssp); --#endif -- if (yyssp <= yyss) goto yyabort; -- --yyssp; -- --yyvsp; -- } -- } -+ yytoken = YYTRANSLATE (yychar); -+ YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); - } -- else -+ -+ /* If the proper action on seeing token YYTOKEN is to reduce or to -+ detect an error, take that action. */ -+ yyn += yytoken; -+ if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) -+ goto yydefault; -+ yyn = yytable[yyn]; -+ if (yyn <= 0) - { -- if (yychar == 0) goto yyabort; --#if YYDEBUG -- if (yydebug) -- { -- yys = 0; -- if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; -- if (!yys) yys = "illegal-symbol"; -- printf("%sdebug: state %d, error recovery discards token %d (%s)\n", -- YYPREFIX, yystate, yychar, yys); -- } --#endif -- yychar = (-1); -- goto yyloop; -+ if (yyn == 0 || yyn == YYTABLE_NINF) -+ goto yyerrlab; -+ yyn = -yyn; -+ goto yyreduce; - } -+ -+ if (yyn == YYFINAL) -+ YYACCEPT; -+ -+ /* Shift the lookahead token. */ -+ YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); -+ -+ /* Discard the token being shifted unless it is eof. */ -+ if (yychar != YYEOF) -+ yychar = YYEMPTY; -+ -+ *++yyvsp = yylval; -+ -+ -+ /* Count tokens shifted since error; after three, turn off error -+ status. */ -+ if (yyerrstatus) -+ yyerrstatus--; -+ -+ yystate = yyn; -+ goto yynewstate; -+ -+ -+/*-----------------------------------------------------------. -+| yydefault -- do the default action for the current state. | -+`-----------------------------------------------------------*/ -+yydefault: -+ yyn = yydefact[yystate]; -+ if (yyn == 0) -+ goto yyerrlab; -+ goto yyreduce; -+ -+ -+/*-----------------------------. -+| yyreduce -- Do a reduction. | -+`-----------------------------*/ - yyreduce: --#if YYDEBUG -- if (yydebug) -- printf("%sdebug: state %d, reducing by rule %d (%s)\n", -- YYPREFIX, yystate, yyn, yyrule[yyn]); --#endif -- yym = yylen[yyn]; -- yyval = yyvsp[1-yym]; -- switch (yyn) -+ /* yyn is the number of a rule to reduce with. */ -+ yylen = yyr2[yyn]; -+ -+ /* If YYLEN is nonzero, implement the default value of the action: -+ `$$ = $1'. -+ -+ Otherwise, the following line sets YYVAL to garbage. -+ This behavior is undocumented and Bison -+ users should not rely upon it. Assigning to YYVAL -+ unconditionally makes the parser a bit smaller, and it avoids a -+ GCC warning that YYVAL may be used uninitialized. */ -+ yyval = yyvsp[1-yylen]; -+ -+ -+ YY_REDUCE_PRINT (yyn); -+ switch (yyn) - { --case 2: -+ case 3: - #line 130 "jamgram.y" --{ parse_save( yyvsp[0].parse ); } --break; --case 3: -+ { parse_save( yyvsp[0].parse ); } -+ break; -+ -+ case 4: - #line 141 "jamgram.y" --{ yyval.parse = pnull(); } --break; --case 4: -+ { yyval.parse = pnull(); } -+ break; -+ -+ case 5: - #line 143 "jamgram.y" --{ yyval.parse = yyvsp[0].parse; } --break; --case 5: -+ { yyval.parse = yyvsp[0].parse; } -+ break; -+ -+ case 6: - #line 147 "jamgram.y" --{ yyval.parse = yyvsp[0].parse; } --break; --case 6: -+ { yyval.parse = yyvsp[0].parse; } -+ break; -+ -+ case 7: - #line 149 "jamgram.y" --{ yyval.parse = prules( yyvsp[-1].parse, yyvsp[0].parse ); } --break; --case 7: -+ { yyval.parse = prules( yyvsp[-1].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 8: - #line 151 "jamgram.y" --{ yyval.parse = plocal( yyvsp[-2].parse, pnull(), yyvsp[0].parse ); } --break; --case 8: -+ { yyval.parse = plocal( yyvsp[-2].parse, pnull(), yyvsp[0].parse ); } -+ break; -+ -+ case 9: - #line 153 "jamgram.y" --{ yyval.parse = plocal( yyvsp[-4].parse, yyvsp[-2].parse, yyvsp[0].parse ); } --break; --case 9: -+ { yyval.parse = plocal( yyvsp[-4].parse, yyvsp[-2].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 10: - #line 157 "jamgram.y" --{ yyval.parse = yyvsp[-1].parse; } --break; --case 10: -+ { yyval.parse = yyvsp[-1].parse; } -+ break; -+ -+ case 11: - #line 159 "jamgram.y" --{ yyval.parse = pincl( yyvsp[-1].parse ); } --break; --case 11: -+ { yyval.parse = pincl( yyvsp[-1].parse ); } -+ break; -+ -+ case 12: - #line 161 "jamgram.y" --{ yyval.parse = prule( yyvsp[-2].parse, yyvsp[-1].parse ); } --break; --case 12: -+ { yyval.parse = prule( yyvsp[-2].parse, yyvsp[-1].parse ); } -+ break; -+ -+ case 13: - #line 163 "jamgram.y" --{ yyval.parse = pset( yyvsp[-3].parse, yyvsp[-1].parse, yyvsp[-2].number ); } --break; --case 13: -+ { yyval.parse = pset( yyvsp[-3].parse, yyvsp[-1].parse, yyvsp[-2].number ); } -+ break; -+ -+ case 14: - #line 165 "jamgram.y" --{ yyval.parse = pset1( yyvsp[-5].parse, yyvsp[-3].parse, yyvsp[-1].parse, yyvsp[-2].number ); } --break; --case 14: -+ { yyval.parse = pset1( yyvsp[-5].parse, yyvsp[-3].parse, yyvsp[-1].parse, yyvsp[-2].number ); } -+ break; -+ -+ case 15: - #line 167 "jamgram.y" --{ yyval.parse = pbreak( yyvsp[-1].parse, JMP_BREAK ); } --break; --case 15: -+ { yyval.parse = pbreak( yyvsp[-1].parse, JMP_BREAK ); } -+ break; -+ -+ case 16: - #line 169 "jamgram.y" --{ yyval.parse = pbreak( yyvsp[-1].parse, JMP_CONTINUE ); } --break; --case 16: -+ { yyval.parse = pbreak( yyvsp[-1].parse, JMP_CONTINUE ); } -+ break; -+ -+ case 17: - #line 171 "jamgram.y" --{ yyval.parse = pbreak( yyvsp[-1].parse, JMP_RETURN ); } --break; --case 17: -+ { yyval.parse = pbreak( yyvsp[-1].parse, JMP_RETURN ); } -+ break; -+ -+ case 18: - #line 173 "jamgram.y" --{ yyval.parse = pfor( yyvsp[-5].string, yyvsp[-3].parse, yyvsp[-1].parse ); } --break; --case 18: -+ { yyval.parse = pfor( yyvsp[-5].string, yyvsp[-3].parse, yyvsp[-1].parse ); } -+ break; -+ -+ case 19: - #line 175 "jamgram.y" --{ yyval.parse = pswitch( yyvsp[-3].parse, yyvsp[-1].parse ); } --break; --case 19: -+ { yyval.parse = pswitch( yyvsp[-3].parse, yyvsp[-1].parse ); } -+ break; -+ -+ case 20: - #line 177 "jamgram.y" --{ yyval.parse = pif( yyvsp[-3].parse, yyvsp[-1].parse, pnull() ); } --break; --case 20: -+ { yyval.parse = pif( yyvsp[-3].parse, yyvsp[-1].parse, pnull() ); } -+ break; -+ -+ case 21: - #line 179 "jamgram.y" --{ yyval.parse = pif( yyvsp[-5].parse, yyvsp[-3].parse, yyvsp[0].parse ); } --break; --case 21: -+ { yyval.parse = pif( yyvsp[-5].parse, yyvsp[-3].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 22: - #line 181 "jamgram.y" --{ yyval.parse = pwhile( yyvsp[-3].parse, yyvsp[-1].parse ); } --break; --case 22: -+ { yyval.parse = pwhile( yyvsp[-3].parse, yyvsp[-1].parse ); } -+ break; -+ -+ case 23: - #line 183 "jamgram.y" --{ yyval.parse = psetc( yyvsp[-4].string, yyvsp[-3].parse, yyvsp[-1].parse ); } --break; --case 23: -+ { yyval.parse = psetc( yyvsp[-4].string, yyvsp[-3].parse, yyvsp[-1].parse ); } -+ break; -+ -+ case 24: - #line 185 "jamgram.y" --{ yyval.parse = pon( yyvsp[-1].parse, yyvsp[0].parse ); } --break; --case 24: -+ { yyval.parse = pon( yyvsp[-1].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 25: - #line 187 "jamgram.y" --{ yymode( SCAN_STRING ); } --break; --case 25: -+ { yymode( SCAN_STRING ); } -+ break; -+ -+ case 26: - #line 189 "jamgram.y" --{ yymode( SCAN_NORMAL ); } --break; --case 26: -+ { yymode( SCAN_NORMAL ); } -+ break; -+ -+ case 27: - #line 191 "jamgram.y" --{ yyval.parse = psete( yyvsp[-6].string,yyvsp[-5].parse,yyvsp[-2].string,yyvsp[-7].number ); } --break; --case 27: -+ { yyval.parse = psete( yyvsp[-6].string,yyvsp[-5].parse,yyvsp[-2].string,yyvsp[-7].number ); } -+ break; -+ -+ case 28: - #line 199 "jamgram.y" --{ yyval.number = VAR_SET; } --break; --case 28: -+ { yyval.number = VAR_SET; } -+ break; -+ -+ case 29: - #line 201 "jamgram.y" --{ yyval.number = VAR_APPEND; } --break; --case 29: -+ { yyval.number = VAR_APPEND; } -+ break; -+ -+ case 30: - #line 203 "jamgram.y" --{ yyval.number = VAR_DEFAULT; } --break; --case 30: -+ { yyval.number = VAR_DEFAULT; } -+ break; -+ -+ case 31: - #line 205 "jamgram.y" --{ yyval.number = VAR_DEFAULT; } --break; --case 31: -+ { yyval.number = VAR_DEFAULT; } -+ break; -+ -+ case 32: - #line 213 "jamgram.y" --{ yyval.parse = peval( EXPR_EXISTS, yyvsp[0].parse, pnull() ); } --break; --case 32: -+ { yyval.parse = peval( EXPR_EXISTS, yyvsp[0].parse, pnull() ); } -+ break; -+ -+ case 33: - #line 215 "jamgram.y" --{ yyval.parse = peval( EXPR_EQUALS, yyvsp[-2].parse, yyvsp[0].parse ); } --break; --case 33: -+ { yyval.parse = peval( EXPR_EQUALS, yyvsp[-2].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 34: - #line 217 "jamgram.y" --{ yyval.parse = peval( EXPR_NOTEQ, yyvsp[-2].parse, yyvsp[0].parse ); } --break; --case 34: -+ { yyval.parse = peval( EXPR_NOTEQ, yyvsp[-2].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 35: - #line 219 "jamgram.y" --{ yyval.parse = peval( EXPR_LESS, yyvsp[-2].parse, yyvsp[0].parse ); } --break; --case 35: -+ { yyval.parse = peval( EXPR_LESS, yyvsp[-2].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 36: - #line 221 "jamgram.y" --{ yyval.parse = peval( EXPR_LESSEQ, yyvsp[-2].parse, yyvsp[0].parse ); } --break; --case 36: -+ { yyval.parse = peval( EXPR_LESSEQ, yyvsp[-2].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 37: - #line 223 "jamgram.y" --{ yyval.parse = peval( EXPR_MORE, yyvsp[-2].parse, yyvsp[0].parse ); } --break; --case 37: -+ { yyval.parse = peval( EXPR_MORE, yyvsp[-2].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 38: - #line 225 "jamgram.y" --{ yyval.parse = peval( EXPR_MOREEQ, yyvsp[-2].parse, yyvsp[0].parse ); } --break; --case 38: -+ { yyval.parse = peval( EXPR_MOREEQ, yyvsp[-2].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 39: - #line 227 "jamgram.y" --{ yyval.parse = peval( EXPR_AND, yyvsp[-2].parse, yyvsp[0].parse ); } --break; --case 39: -+ { yyval.parse = peval( EXPR_AND, yyvsp[-2].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 40: - #line 229 "jamgram.y" --{ yyval.parse = peval( EXPR_AND, yyvsp[-2].parse, yyvsp[0].parse ); } --break; --case 40: -+ { yyval.parse = peval( EXPR_AND, yyvsp[-2].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 41: - #line 231 "jamgram.y" --{ yyval.parse = peval( EXPR_OR, yyvsp[-2].parse, yyvsp[0].parse ); } --break; --case 41: -+ { yyval.parse = peval( EXPR_OR, yyvsp[-2].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 42: - #line 233 "jamgram.y" --{ yyval.parse = peval( EXPR_OR, yyvsp[-2].parse, yyvsp[0].parse ); } --break; --case 42: -+ { yyval.parse = peval( EXPR_OR, yyvsp[-2].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 43: - #line 235 "jamgram.y" --{ yyval.parse = peval( EXPR_IN, yyvsp[-2].parse, yyvsp[0].parse ); } --break; --case 43: -+ { yyval.parse = peval( EXPR_IN, yyvsp[-2].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 44: - #line 237 "jamgram.y" --{ yyval.parse = peval( EXPR_NOT, yyvsp[0].parse, pnull() ); } --break; --case 44: -+ { yyval.parse = peval( EXPR_NOT, yyvsp[0].parse, pnull() ); } -+ break; -+ -+ case 45: - #line 239 "jamgram.y" --{ yyval.parse = yyvsp[-1].parse; } --break; --case 45: -+ { yyval.parse = yyvsp[-1].parse; } -+ break; -+ -+ case 46: - #line 249 "jamgram.y" --{ yyval.parse = P0; } --break; --case 46: -+ { yyval.parse = P0; } -+ break; -+ -+ case 47: - #line 251 "jamgram.y" --{ yyval.parse = pnode( yyvsp[-1].parse, yyvsp[0].parse ); } --break; --case 47: -+ { yyval.parse = pnode( yyvsp[-1].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 48: - #line 255 "jamgram.y" --{ yyval.parse = psnode( yyvsp[-2].string, yyvsp[0].parse ); } --break; --case 48: -+ { yyval.parse = psnode( yyvsp[-2].string, yyvsp[0].parse ); } -+ break; -+ -+ case 49: - #line 264 "jamgram.y" --{ yyval.parse = P0; } --break; --case 49: -+ { yyval.parse = P0; } -+ break; -+ -+ case 50: - #line 266 "jamgram.y" --{ yyval.parse = psnode( yyvsp[-2].string, yyvsp[0].parse ); } --break; --case 50: -+ { yyval.parse = psnode( yyvsp[-2].string, yyvsp[0].parse ); } -+ break; -+ -+ case 51: - #line 268 "jamgram.y" --{ yyval.parse = psnode( yyvsp[0].string, P0 ); } --break; --case 51: -+ { yyval.parse = psnode( yyvsp[0].string, P0 ); } -+ break; -+ -+ case 52: - #line 277 "jamgram.y" --{ yyval.parse = pnode( P0, yyvsp[0].parse ); } --break; --case 52: -+ { yyval.parse = pnode( P0, yyvsp[0].parse ); } -+ break; -+ -+ case 53: - #line 279 "jamgram.y" --{ yyval.parse = pnode( yyvsp[0].parse, yyvsp[-2].parse ); } --break; --case 53: -+ { yyval.parse = pnode( yyvsp[0].parse, yyvsp[-2].parse ); } -+ break; -+ -+ case 54: - #line 289 "jamgram.y" --{ yyval.parse = yyvsp[0].parse; yymode( SCAN_NORMAL ); } --break; --case 54: -+ { yyval.parse = yyvsp[0].parse; yymode( SCAN_NORMAL ); } -+ break; -+ -+ case 55: - #line 293 "jamgram.y" --{ yyval.parse = pnull(); yymode( SCAN_PUNCT ); } --break; --case 55: -+ { yyval.parse = pnull(); yymode( SCAN_PUNCT ); } -+ break; -+ -+ case 56: - #line 295 "jamgram.y" --{ yyval.parse = pappend( yyvsp[-1].parse, yyvsp[0].parse ); } --break; --case 56: -+ { yyval.parse = pappend( yyvsp[-1].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 57: - #line 299 "jamgram.y" --{ yyval.parse = plist( yyvsp[0].string ); } --break; --case 57: -+ { yyval.parse = plist( yyvsp[0].string ); } -+ break; -+ -+ case 58: - #line 300 "jamgram.y" --{ yymode( SCAN_NORMAL ); } --break; --case 58: -+ { yymode( SCAN_NORMAL ); } -+ break; -+ -+ case 59: - #line 301 "jamgram.y" --{ yyval.parse = yyvsp[-1].parse; } --break; --case 59: -+ { yyval.parse = yyvsp[-1].parse; } -+ break; -+ -+ case 60: - #line 310 "jamgram.y" --{ yyval.parse = prule( yyvsp[-1].parse, yyvsp[0].parse ); } --break; --case 60: -+ { yyval.parse = prule( yyvsp[-1].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 61: - #line 312 "jamgram.y" --{ yyval.parse = pon( yyvsp[-2].parse, prule( yyvsp[-1].parse, yyvsp[0].parse ) ); } --break; --case 61: -+ { yyval.parse = pon( yyvsp[-2].parse, prule( yyvsp[-1].parse, yyvsp[0].parse ) ); } -+ break; -+ -+ case 62: - #line 314 "jamgram.y" --{ yyval.parse = pon( yyvsp[-2].parse, yyvsp[0].parse ); } --break; --case 62: -+ { yyval.parse = pon( yyvsp[-2].parse, yyvsp[0].parse ); } -+ break; -+ -+ case 63: - #line 323 "jamgram.y" --{ yyval.number = 0; } --break; --case 63: -+ { yyval.number = 0; } -+ break; -+ -+ case 64: - #line 325 "jamgram.y" --{ yyval.number = yyvsp[-1].number | yyvsp[0].number; } --break; --case 64: -+ { yyval.number = yyvsp[-1].number | yyvsp[0].number; } -+ break; -+ -+ case 65: - #line 329 "jamgram.y" --{ yyval.number = RULE_UPDATED; } --break; --case 65: -+ { yyval.number = RULE_UPDATED; } -+ break; -+ -+ case 66: - #line 331 "jamgram.y" --{ yyval.number = RULE_TOGETHER; } --break; --case 66: -+ { yyval.number = RULE_TOGETHER; } -+ break; -+ -+ case 67: - #line 333 "jamgram.y" --{ yyval.number = RULE_IGNORE; } --break; --case 67: -+ { yyval.number = RULE_IGNORE; } -+ break; -+ -+ case 68: - #line 335 "jamgram.y" --{ yyval.number = RULE_QUIETLY; } --break; --case 68: -+ { yyval.number = RULE_QUIETLY; } -+ break; -+ -+ case 69: - #line 337 "jamgram.y" --{ yyval.number = RULE_PIECEMEAL; } --break; --case 69: -+ { yyval.number = RULE_PIECEMEAL; } -+ break; -+ -+ case 70: - #line 339 "jamgram.y" --{ yyval.number = RULE_EXISTING; } --break; --case 70: -+ { yyval.number = RULE_EXISTING; } -+ break; -+ -+ case 71: - #line 341 "jamgram.y" --{ yyval.number = atoi( yyvsp[0].string ) * RULE_MAXLINE; } --break; --case 71: -+ { yyval.number = atoi( yyvsp[0].string ) * RULE_MAXLINE; } -+ break; -+ -+ case 72: - #line 350 "jamgram.y" --{ yyval.parse = pnull(); } --break; --case 72: -+ { yyval.parse = pnull(); } -+ break; -+ -+ case 73: - #line 352 "jamgram.y" --{ yyval.parse = yyvsp[0].parse; } --break; --#line 877 "y.tab.c" -- } -- yyssp -= yym; -- yystate = *yyssp; -- yyvsp -= yym; -- yym = yylhs[yyn]; -- if (yystate == 0 && yym == 0) -+ { yyval.parse = yyvsp[0].parse; } -+ break; -+ -+ -+ } -+ -+/* Line 999 of yacc.c. */ -+#line 1614 "y.tab.c" -+ -+ yyvsp -= yylen; -+ yyssp -= yylen; -+ -+ -+ YY_STACK_PRINT (yyss, yyssp); -+ -+ *++yyvsp = yyval; -+ -+ -+ /* Now `shift' the result of the reduction. Determine what state -+ that goes to, based on the state we popped back to and the rule -+ number reduced by. */ -+ -+ yyn = yyr1[yyn]; -+ -+ yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; -+ if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) -+ yystate = yytable[yystate]; -+ else -+ yystate = yydefgoto[yyn - YYNTOKENS]; -+ -+ goto yynewstate; -+ -+ -+/*------------------------------------. -+| yyerrlab -- here on detecting error | -+`------------------------------------*/ -+yyerrlab: -+ /* If not already recovering from an error, report this error. */ -+ if (!yyerrstatus) - { --#if YYDEBUG -- if (yydebug) -- printf("%sdebug: after reduction, shifting from state 0 to\ -- state %d\n", YYPREFIX, YYFINAL); --#endif -- yystate = YYFINAL; -- *++yyssp = YYFINAL; -- *++yyvsp = yyval; -- if (yychar < 0) -+ ++yynerrs; -+#if YYERROR_VERBOSE -+ yyn = yypact[yystate]; -+ -+ if (YYPACT_NINF < yyn && yyn < YYLAST) -+ { -+ YYSIZE_T yysize = 0; -+ int yytype = YYTRANSLATE (yychar); -+ char *yymsg; -+ int yyx, yycount; -+ -+ yycount = 0; -+ /* Start YYX at -YYN if negative to avoid negative indexes in -+ YYCHECK. */ -+ for (yyx = yyn < 0 ? -yyn : 0; -+ yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++) -+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) -+ yysize += yystrlen (yytname[yyx]) + 15, yycount++; -+ yysize += yystrlen ("syntax error, unexpected ") + 1; -+ yysize += yystrlen (yytname[yytype]); -+ yymsg = (char *) YYSTACK_ALLOC (yysize); -+ if (yymsg != 0) -+ { -+ char *yyp = yystpcpy (yymsg, "syntax error, unexpected "); -+ yyp = yystpcpy (yyp, yytname[yytype]); -+ -+ if (yycount < 5) -+ { -+ yycount = 0; -+ for (yyx = yyn < 0 ? -yyn : 0; -+ yyx < (int) (sizeof (yytname) / sizeof (char *)); -+ yyx++) -+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) -+ { -+ const char *yyq = ! yycount ? ", expecting " : " or "; -+ yyp = yystpcpy (yyp, yyq); -+ yyp = yystpcpy (yyp, yytname[yyx]); -+ yycount++; -+ } -+ } -+ yyerror (yymsg); -+ YYSTACK_FREE (yymsg); -+ } -+ else -+ yyerror ("syntax error; also virtual memory exhausted"); -+ } -+ else -+#endif /* YYERROR_VERBOSE */ -+ yyerror ("syntax error"); -+ } -+ -+ -+ -+ if (yyerrstatus == 3) -+ { -+ /* If just tried and failed to reuse lookahead token after an -+ error, discard it. */ -+ -+ /* Return failure if at end of input. */ -+ if (yychar == YYEOF) - { -- if ((yychar = yylex()) < 0) yychar = 0; --#if YYDEBUG -- if (yydebug) -- { -- yys = 0; -- if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; -- if (!yys) yys = "illegal-symbol"; -- printf("%sdebug: state %d, reading %d (%s)\n", -- YYPREFIX, YYFINAL, yychar, yys); -- } --#endif -+ /* Pop the error token. */ -+ YYPOPSTACK; -+ /* Pop the rest of the stack. */ -+ while (yyss < yyssp) -+ { -+ YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); -+ yydestruct (yystos[*yyssp], yyvsp); -+ YYPOPSTACK; -+ } -+ YYABORT; - } -- if (yychar == 0) goto yyaccept; -- goto yyloop; -+ -+ YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); -+ yydestruct (yytoken, &yylval); -+ yychar = YYEMPTY; -+ - } -- if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 && -- yyn <= YYTABLESIZE && yycheck[yyn] == yystate) -- yystate = yytable[yyn]; -- else -- yystate = yydgoto[yym]; --#if YYDEBUG -- if (yydebug) -- printf("%sdebug: after reduction, shifting from state %d \ --to state %d\n", YYPREFIX, *yyssp, yystate); --#endif -- if (yyssp >= yysslim && yygrowstack()) -- { -- goto yyoverflow; -- } -- *++yyssp = yystate; -- *++yyvsp = yyval; -- goto yyloop; --yyoverflow: -- yyerror("yacc stack overflow"); --yyabort: -- return (1); --yyaccept: -- return (0); -+ -+ /* Else will try to reuse lookahead token after shifting the error -+ token. */ -+ goto yyerrlab1; -+ -+ -+/*----------------------------------------------------. -+| yyerrlab1 -- error raised explicitly by an action. | -+`----------------------------------------------------*/ -+yyerrlab1: -+ yyerrstatus = 3; /* Each real token shifted decrements this. */ -+ -+ for (;;) -+ { -+ yyn = yypact[yystate]; -+ if (yyn != YYPACT_NINF) -+ { -+ yyn += YYTERROR; -+ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) -+ { -+ yyn = yytable[yyn]; -+ if (0 < yyn) -+ break; -+ } -+ } -+ -+ /* Pop the current state because it cannot handle the error token. */ -+ if (yyssp == yyss) -+ YYABORT; -+ -+ YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); -+ yydestruct (yystos[yystate], yyvsp); -+ yyvsp--; -+ yystate = *--yyssp; -+ -+ YY_STACK_PRINT (yyss, yyssp); -+ } -+ -+ if (yyn == YYFINAL) -+ YYACCEPT; -+ -+ YYDPRINTF ((stderr, "Shifting error token, ")); -+ -+ *++yyvsp = yylval; -+ -+ -+ yystate = yyn; -+ goto yynewstate; -+ -+ -+/*-------------------------------------. -+| yyacceptlab -- YYACCEPT comes here. | -+`-------------------------------------*/ -+yyacceptlab: -+ yyresult = 0; -+ goto yyreturn; -+ -+/*-----------------------------------. -+| yyabortlab -- YYABORT comes here. | -+`-----------------------------------*/ -+yyabortlab: -+ yyresult = 1; -+ goto yyreturn; -+ -+#ifndef yyoverflow -+/*----------------------------------------------. -+| yyoverflowlab -- parser overflow comes here. | -+`----------------------------------------------*/ -+yyoverflowlab: -+ yyerror ("parser stack overflow"); -+ yyresult = 2; -+ /* Fall through. */ -+#endif -+ -+yyreturn: -+#ifndef yyoverflow -+ if (yyss != yyssa) -+ YYSTACK_FREE (yyss); -+#endif -+ return yyresult; - } -+ -+ -+ -diff -Naur jam-2.5/jamgram.h jam-2.5-p/jamgram.h ---- jam-2.5/jamgram.h 2004-08-19 20:19:34.000000000 +0200 -+++ jam-2.5-p/jamgram.h 2007-08-19 22:36:55.000000000 +0200 -@@ -1,51 +1,142 @@ --#ifndef YYERRCODE --#define YYERRCODE 256 --#endif -+/* A Bison parser, made by GNU Bison 1.875a. */ -+ -+/* Skeleton parser for Yacc-like parsing with Bison, -+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. - --#define _BANG_t 257 --#define _BANG_EQUALS_t 258 --#define _AMPER_t 259 --#define _AMPERAMPER_t 260 --#define _LPAREN_t 261 --#define _RPAREN_t 262 --#define _PLUS_EQUALS_t 263 --#define _COLON_t 264 -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. */ -+ -+/* As a special exception, when this file is copied by Bison into a -+ Bison output file, you may use that output file without restriction. -+ This special exception was added by the Free Software Foundation -+ in version 1.24 of Bison. */ -+ -+/* Tokens. */ -+#ifndef YYTOKENTYPE -+# define YYTOKENTYPE -+ /* Put the tokens into the symbol table, so that GDB and other debuggers -+ know about them. */ -+ enum yytokentype { -+ _LANGLE_t = 258, -+ _LANGLE_EQUALS_t = 259, -+ _EQUALS_t = 260, -+ _RANGLE_t = 261, -+ _RANGLE_EQUALS_t = 262, -+ _BAR_t = 263, -+ _BARBAR_t = 264, -+ _SEMIC_t = 265, -+ _COLON_t = 266, -+ _BANG_t = 267, -+ _BANG_EQUALS_t = 268, -+ _QUESTION_EQUALS_t = 269, -+ _LPAREN_t = 270, -+ _RPAREN_t = 271, -+ _LBRACKET_t = 272, -+ _RBRACKET_t = 273, -+ _LBRACE_t = 274, -+ _RBRACE_t = 275, -+ _AMPER_t = 276, -+ _AMPERAMPER_t = 277, -+ _PLUS_EQUALS_t = 278, -+ ACTIONS_t = 279, -+ BIND_t = 280, -+ BREAK_t = 281, -+ CASE_t = 282, -+ CONTINUE_t = 283, -+ DEFAULT_t = 284, -+ ELSE_t = 285, -+ EXISTING_t = 286, -+ FOR_t = 287, -+ IF_t = 288, -+ IGNORE_t = 289, -+ IN_t = 290, -+ INCLUDE_t = 291, -+ LOCAL_t = 292, -+ MAXLINE_t = 293, -+ ON_t = 294, -+ PIECEMEAL_t = 295, -+ QUIETLY_t = 296, -+ RETURN_t = 297, -+ RULE_t = 298, -+ SWITCH_t = 299, -+ TOGETHER_t = 300, -+ UPDATED_t = 301, -+ WHILE_t = 302, -+ ARG = 303, -+ STRING = 304 -+ }; -+#endif -+#define _LANGLE_t 258 -+#define _LANGLE_EQUALS_t 259 -+#define _EQUALS_t 260 -+#define _RANGLE_t 261 -+#define _RANGLE_EQUALS_t 262 -+#define _BAR_t 263 -+#define _BARBAR_t 264 - #define _SEMIC_t 265 --#define _LANGLE_t 266 --#define _LANGLE_EQUALS_t 267 --#define _EQUALS_t 268 --#define _RANGLE_t 269 --#define _RANGLE_EQUALS_t 270 --#define _QUESTION_EQUALS_t 271 -+#define _COLON_t 266 -+#define _BANG_t 267 -+#define _BANG_EQUALS_t 268 -+#define _QUESTION_EQUALS_t 269 -+#define _LPAREN_t 270 -+#define _RPAREN_t 271 - #define _LBRACKET_t 272 - #define _RBRACKET_t 273 --#define ACTIONS_t 274 --#define BIND_t 275 --#define BREAK_t 276 --#define CASE_t 277 --#define CONTINUE_t 278 --#define DEFAULT_t 279 --#define ELSE_t 280 --#define EXISTING_t 281 --#define FOR_t 282 --#define IF_t 283 --#define IGNORE_t 284 --#define IN_t 285 --#define INCLUDE_t 286 --#define LOCAL_t 287 --#define MAXLINE_t 288 --#define ON_t 289 --#define PIECEMEAL_t 290 --#define QUIETLY_t 291 --#define RETURN_t 292 --#define RULE_t 293 --#define SWITCH_t 294 --#define TOGETHER_t 295 --#define UPDATED_t 296 --#define WHILE_t 297 --#define _LBRACE_t 298 --#define _BAR_t 299 --#define _BARBAR_t 300 --#define _RBRACE_t 301 --#define ARG 302 --#define STRING 303 -+#define _LBRACE_t 274 -+#define _RBRACE_t 275 -+#define _AMPER_t 276 -+#define _AMPERAMPER_t 277 -+#define _PLUS_EQUALS_t 278 -+#define ACTIONS_t 279 -+#define BIND_t 280 -+#define BREAK_t 281 -+#define CASE_t 282 -+#define CONTINUE_t 283 -+#define DEFAULT_t 284 -+#define ELSE_t 285 -+#define EXISTING_t 286 -+#define FOR_t 287 -+#define IF_t 288 -+#define IGNORE_t 289 -+#define IN_t 290 -+#define INCLUDE_t 291 -+#define LOCAL_t 292 -+#define MAXLINE_t 293 -+#define ON_t 294 -+#define PIECEMEAL_t 295 -+#define QUIETLY_t 296 -+#define RETURN_t 297 -+#define RULE_t 298 -+#define SWITCH_t 299 -+#define TOGETHER_t 300 -+#define UPDATED_t 301 -+#define WHILE_t 302 -+#define ARG 303 -+#define STRING 304 -+ -+ -+ -+ -+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -+typedef int YYSTYPE; -+# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -+# define YYSTYPE_IS_DECLARED 1 -+# define YYSTYPE_IS_TRIVIAL 1 -+#endif -+ -+extern YYSTYPE yylval; -+ -+ -+ -diff -Naur jam-2.5/jamgram.y jam-2.5-p/jamgram.y ---- jam-2.5/jamgram.y 2003-04-23 06:57:07.000000000 +0200 -+++ jam-2.5-p/jamgram.y 2007-08-19 22:36:55.000000000 +0200 -@@ -1,20 +1,24 @@ --%token _BANG_t --%token _BANG_EQUALS_t --%token _AMPER_t --%token _AMPERAMPER_t --%token _LPAREN_t --%token _RPAREN_t --%token _PLUS_EQUALS_t --%token _COLON_t --%token _SEMIC_t - %token _LANGLE_t - %token _LANGLE_EQUALS_t - %token _EQUALS_t - %token _RANGLE_t - %token _RANGLE_EQUALS_t -+%token _BAR_t -+%token _BARBAR_t -+%token _SEMIC_t -+%token _COLON_t -+%token _BANG_t -+%token _BANG_EQUALS_t - %token _QUESTION_EQUALS_t -+%token _LPAREN_t -+%token _RPAREN_t - %token _LBRACKET_t - %token _RBRACKET_t -+%token _LBRACE_t -+%token _RBRACE_t -+%token _AMPER_t -+%token _AMPERAMPER_t -+%token _PLUS_EQUALS_t - %token ACTIONS_t - %token BIND_t - %token BREAK_t -@@ -39,10 +43,6 @@ - %token TOGETHER_t - %token UPDATED_t - %token WHILE_t --%token _LBRACE_t --%token _BAR_t --%token _BARBAR_t --%token _RBRACE_t - /* - * Copyright 1993-2002 Christopher Seiwald and Perforce Software, Inc. - * -diff -Naur jam-2.5/jamgramtab.h jam-2.5-p/jamgramtab.h ---- jam-2.5/jamgramtab.h 2003-04-23 06:57:07.000000000 +0200 -+++ jam-2.5-p/jamgramtab.h 2007-08-19 22:36:55.000000000 +0200 -@@ -1,20 +1,24 @@ -- { "!", _BANG_t }, -- { "!=", _BANG_EQUALS_t }, -- { "&", _AMPER_t }, -- { "&&", _AMPERAMPER_t }, -- { "(", _LPAREN_t }, -- { ")", _RPAREN_t }, -- { "+=", _PLUS_EQUALS_t }, -- { ":", _COLON_t }, -- { ";", _SEMIC_t }, - { "<", _LANGLE_t }, - { "<=", _LANGLE_EQUALS_t }, - { "=", _EQUALS_t }, - { ">", _RANGLE_t }, - { ">=", _RANGLE_EQUALS_t }, -+ { "|", _BAR_t }, -+ { "||", _BARBAR_t }, -+ { ";", _SEMIC_t }, -+ { ":", _COLON_t }, -+ { "!", _BANG_t }, -+ { "!=", _BANG_EQUALS_t }, - { "?=", _QUESTION_EQUALS_t }, -+ { "(", _LPAREN_t }, -+ { ")", _RPAREN_t }, - { "[", _LBRACKET_t }, - { "]", _RBRACKET_t }, -+ { "{", _LBRACE_t }, -+ { "}", _RBRACE_t }, -+ { "&", _AMPER_t }, -+ { "&&", _AMPERAMPER_t }, -+ { "+=", _PLUS_EQUALS_t }, - { "actions", ACTIONS_t }, - { "bind", BIND_t }, - { "break", BREAK_t }, -@@ -39,7 +43,3 @@ - { "together", TOGETHER_t }, - { "updated", UPDATED_t }, - { "while", WHILE_t }, -- { "{", _LBRACE_t }, -- { "|", _BAR_t }, -- { "||", _BARBAR_t }, -- { "}", _RBRACE_t }, diff --git a/source/devel/jam/jam-2.5-amd64.patch b/source/devel/jam/jam-2.5-amd64.patch deleted file mode 100644 index dfc7155..0000000 --- a/source/devel/jam/jam-2.5-amd64.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nru jam-2.5.original/jam.h jam-2.5/jam.h ---- jam-2.5.original/jam.h 2003-04-23 06:45:51.000000000 +0200 -+++ jam-2.5/jam.h 2005-07-01 23:45:53.000000000 +0200 -@@ -449,6 +449,10 @@ - # define OSPLAT "OSPLAT=390" - # endif - -+# ifdef __amd64__ -+# define OSPLAT "OSPLAT=AMD64" -+# endif -+ - # ifndef OSPLAT - # define OSPLAT "" - # endif diff --git a/source/devel/jam/jam-2.5-cxx.patch b/source/devel/jam/jam-2.5-cxx.patch deleted file mode 100644 index 4159294..0000000 --- a/source/devel/jam/jam-2.5-cxx.patch +++ /dev/null @@ -1,43 +0,0 @@ -Use the C++ compiler to build C++ code by default. - -Patch by Krzysiek Pawlik -http://bugs.gentoo.org/show_bug.cgi?id=87974 - ---- jam-2.5/Jambase -+++ jam-2.5/Jambase -@@ -533,7 +533,7 @@ - ASFLAGS ?= ; - AWK ?= awk ; - BINDIR ?= /usr/local/bin ; -- C++ ?= cc ; -+ C++ ?= c++ ; - C++FLAGS ?= ; - CC ?= cc ; - CCFLAGS ?= ; -@@ -1070,6 +1070,7 @@ - case .C : C++ $(<) : $(>) ; - case .cc : C++ $(<) : $(>) ; - case .cpp : C++ $(<) : $(>) ; -+ case .cxx : C++ $(<) : $(>) ; - case .f : Fortran $(<) : $(>) ; - case .l : Cc $(<) : $(<:S=.c) ; - Lex $(<:S=.c) : $(>) ; ---- jam-2.5/jambase.c -+++ jam-2.5/jambase.c -@@ -325,7 +325,7 @@ - "ASFLAGS ?= ;\n", - "AWK ?= awk ;\n", - "BINDIR ?= /usr/local/bin ;\n", --"C++ ?= cc ;\n", -+"C++ ?= c++ ;\n", - "C++FLAGS ?= ;\n", - "CC ?= cc ;\n", - "CCFLAGS ?= ;\n", -@@ -658,6 +658,7 @@ - "case .C : C++ $(<) : $(>) ;\n", - "case .cc : C++ $(<) : $(>) ;\n", - "case .cpp : C++ $(<) : $(>) ;\n", -+"case .cxx : C++ $(<) : $(>) ;\n", - "case .f : Fortran $(<) : $(>) ;\n", - "case .l : Cc $(<) : $(<:S=.c) ;\n", - "Lex $(<:S=.c) : $(>) ;\n", diff --git a/source/devel/jam/jam-2.5-dependency.patch b/source/devel/jam/jam-2.5-dependency.patch deleted file mode 100644 index eba137b..0000000 --- a/source/devel/jam/jam-2.5-dependency.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- jam-2.5/Jambase -+++ jam-2.5/Jambase -@@ -710,7 +710,7 @@ - local s = $(>:G=$(HDRGRIST:E)) ; - - Includes $(<) : $(s) ; -- SEARCH on $(s) = $(HDRSEARCH) ; -+ SEARCH on $(s) = $(3:D) $(HDRSEARCH) ; - NoCare $(s) ; - - # Propagate on $(<) to $(>) ---- jam-2.5/headers.c -+++ jam-2.5/headers.c -@@ -71,7 +71,13 @@ - lol_add( &lol, headers1( t->boundname, hdrscan ) ); - - if( lol_get( &lol, 1 ) ) -+ { -+ /* The third argument to HDRRULE is the bound name of -+ * $(<) */ -+ lol_add( &lol, list_new( L0, t->boundname, 1 ) ); -+ - list_free( evaluate_rule( hdrrule->string, &lol, L0 ) ); -+ } - - /* Clean up */ - ---- jam-2.5/jambase.c -+++ jam-2.5/jambase.c -@@ -452,7 +452,7 @@ - "{\n", - "local s = $(>:G=$(HDRGRIST:E)) ;\n", - "Includes $(<) : $(s) ;\n", --"SEARCH on $(s) = $(HDRSEARCH) ;\n", -+"SEARCH on $(s) = $(3:D) $(HDRSEARCH) ;\n", - "NoCare $(s) ;\n", - "HDRSEARCH on $(s) = $(HDRSEARCH) ;\n", - "HDRSCAN on $(s) = $(HDRSCAN) ;\n", From vmiklos at frugalware.org Tue Jun 17 00:57:08 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 17 00:57:10 2008 Subject: [Frugalware-git] frugalware-current: lha-1.14i_ac20050924p1-2-i686 Message-ID: <20080616225708.EC0E611901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=557906a173239d84b6c5be3eb186522a09bd8f95 commit 557906a173239d84b6c5be3eb186522a09bd8f95 Author: Miklos Vajna Date: Tue Jun 17 00:56:56 2008 +0200 lha-1.14i_ac20050924p1-2-i686 - moved to extra diff --git a/source/apps-extra/lha/FrugalBuild b/source/apps-extra/lha/FrugalBuild new file mode 100644 index 0000000..4fe7722 --- /dev/null +++ b/source/apps-extra/lha/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.09 SBU +# Maintainer: VMiklos + +pkgname=lha +pkgver=1.14i_ac20050924p1 +rel_id=22231 +pkgrel=2 +pkgdesc="An archiving and compression utility for LHarc format archives." +url="http://www2m.biglobe.ne.jp/~dolphin/lha/lha-unix.htm" +depends=('glibc>=2.7-3') +groups=('apps-extra') +archs=('i686' 'x86_64' 'ppc') +up2date="elinks -dump http://sourceforge.jp/projects/lha/files/|grep tar.gz$|sed 's/.*lha-\(.*\)\.t.*/\1/;s/-/_/;q'" +source=(http://osdn.dl.sourceforge.jp/$pkgname/$rel_id/$pkgname-${pkgver/_/-}.tar.gz) +_F_cd_path="$pkgname-${pkgver/_/-}" +# optimization OK +sha1sums=('2491c8b584c21759f1d3819f57fa0e1cbc235092') diff --git a/source/base/lha/FrugalBuild b/source/base/lha/FrugalBuild deleted file mode 100644 index 2a21481..0000000 --- a/source/base/lha/FrugalBuild +++ /dev/null @@ -1,17 +0,0 @@ -# Compiling Time: 0.09 SBU -# Maintainer: VMiklos - -pkgname=lha -pkgver=1.14i_ac20050924p1 -rel_id=22231 -pkgrel=2 -pkgdesc="An archiving and compression utility for LHarc format archives." -url="http://www2m.biglobe.ne.jp/~dolphin/lha/lha-unix.htm" -depends=('glibc>=2.7-3') -groups=('base') -archs=('i686' 'x86_64' 'ppc') -up2date="elinks -dump http://sourceforge.jp/projects/lha/files/|grep tar.gz$|sed 's/.*lha-\(.*\)\.t.*/\1/;s/-/_/;q'" -source=(http://osdn.dl.sourceforge.jp/$pkgname/$rel_id/$pkgname-${pkgver/_/-}.tar.gz) -_F_cd_path="$pkgname-${pkgver/_/-}" -# optimization OK -sha1sums=('2491c8b584c21759f1d3819f57fa0e1cbc235092') From vmiklos at frugalware.org Tue Jun 17 00:58:38 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 17 00:58:39 2008 Subject: [Frugalware-git] frugalware-current: gcc-3.3-3.3.6-3-i686 Message-ID: <20080616225838.7F2B011901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=45e838ec2ad9f6664c1152322d72224bfcdf897a commit 45e838ec2ad9f6664c1152322d72224bfcdf897a Author: Miklos Vajna Date: Tue Jun 17 00:58:28 2008 +0200 gcc-3.3-3.3.6-3-i686 - move libstdc++5 to extra diff --git a/source/devel-extra/gcc-3.3/FrugalBuild b/source/devel-extra/gcc-3.3/FrugalBuild index 92a97bd..058f881 100644 --- a/source/devel-extra/gcc-3.3/FrugalBuild +++ b/source/devel-extra/gcc-3.3/FrugalBuild @@ -20,7 +20,7 @@ sha1sums=('2cc43978bb09af6c2ccfdf74797d10d7cc2596fb') subpkgs=('libstdc++5') subdescs=('The GNU Standard C++ Library (Version 3.3.x)') subdepends=('libgcc') -subgroups=('lib') +subgroups=('lib-extra') subarchs=('i686 x86_64') build() From vmiklos at frugalware.org Tue Jun 17 00:59:49 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 17 00:59:50 2008 Subject: [Frugalware-git] frugalware-current: libtunepimp-0.5.3-3-i686 Message-ID: <20080616225949.EC72E11901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f2f4f735a9f2423d55b85971f5198e9be0a308f3 commit f2f4f735a9f2423d55b85971f5198e9be0a308f3 Author: Miklos Vajna Date: Tue Jun 17 00:59:41 2008 +0200 libtunepimp-0.5.3-3-i686 - move libtunepimp-python to extra diff --git a/source/multimedia/libtunepimp/FrugalBuild b/source/multimedia/libtunepimp/FrugalBuild index 43b964d..f2dc8b9 100644 --- a/source/multimedia/libtunepimp/FrugalBuild +++ b/source/multimedia/libtunepimp/FrugalBuild @@ -24,7 +24,7 @@ sha1sums=('1b904cd97ce009588fe57336f40e79b6edf9947e' \ subpkgs=("$pkgname-python") subdescs=("$pkgname python bindings") subdepends=("python>=2.5 $pkgname=$pkgver") -subgroups=('multimedia') +subgroups=('multimedia-extra') subarchs=('i686 x86_64') build() From vmiklos at frugalware.org Tue Jun 17 01:01:19 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 17 01:01:19 2008 Subject: [Frugalware-git] frugalware-current: mpgtx-1.3.1-4-i686 Message-ID: <20080616230119.7BBBF11901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d597d04187f4f677d0676bc0631cfad7df8bc296 commit d597d04187f4f677d0676bc0631cfad7df8bc296 Author: Miklos Vajna Date: Tue Jun 17 01:01:11 2008 +0200 mpgtx-1.3.1-4-i686 - moved to extra diff --git a/source/multimedia-extra/mpgtx/FrugalBuild b/source/multimedia-extra/mpgtx/FrugalBuild new file mode 100644 index 0000000..69aa873 --- /dev/null +++ b/source/multimedia-extra/mpgtx/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 0.07 SBU +# Maintainer: BMH1980 + +pkgname=mpgtx +pkgver=1.3.1 +pkgrel=4 +pkgdesc="Allows you to split, join, demultiplex, manipulate ID3v1 tags" +depends=('libstdc++') +Finclude sourceforge +sha1sums=('58b3d18b6dac968e8dd969a7b33c8a8fc31569cd') +license="GPL2" +groups=('multimedia-extra') +archs=('i686' 'x86_64') + +build() +{ + Fconf + Fsed "CFLAGS=" "CFLAGS=$CFLAGS " Makefile + make || return 1 + Fsed "PREFIX=/usr" "PREFIX=\$(DESTDIR)/usr" Makefile + Fmakeinstall +} + +# optimization OK diff --git a/source/multimedia/mpgtx/FrugalBuild b/source/multimedia/mpgtx/FrugalBuild deleted file mode 100644 index bb8600d..0000000 --- a/source/multimedia/mpgtx/FrugalBuild +++ /dev/null @@ -1,24 +0,0 @@ -# Compiling Time: 0.07 SBU -# Maintainer: BMH1980 - -pkgname=mpgtx -pkgver=1.3.1 -pkgrel=4 -pkgdesc="Allows you to split, join, demultiplex, manipulate ID3v1 tags" -depends=('libstdc++') -Finclude sourceforge -sha1sums=('58b3d18b6dac968e8dd969a7b33c8a8fc31569cd') -license="GPL2" -groups=('multimedia') -archs=('i686' 'x86_64') - -build() -{ - Fconf - Fsed "CFLAGS=" "CFLAGS=$CFLAGS " Makefile - make || return 1 - Fsed "PREFIX=/usr" "PREFIX=\$(DESTDIR)/usr" Makefile - Fmakeinstall -} - -# optimization OK From bouleetbil at frogdev.info Tue Jun 17 09:05:14 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jun 17 09:05:16 2008 Subject: [Frugalware-git] frugalware-current: hippo-canvas-0.2.32-1-i686 Message-ID: <20080617070514.D1AAD11901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aff9a0a5eee40be8676593d1fdd38e74ecf80f44 commit aff9a0a5eee40be8676593d1fdd38e74ecf80f44 Author: bouleetbil Date: Tue Jun 17 08:58:12 2008 +0200 hippo-canvas-0.2.32-1-i686 *version bump diff --git a/source/xlib-extra/hippo-canvas/FrugalBuild b/source/xlib-extra/hippo-canvas/FrugalBuild index dfc411b..5d0d82b 100644 --- a/source/xlib-extra/hippo-canvas/FrugalBuild +++ b/source/xlib-extra/hippo-canvas/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=hippo-canvas -pkgver=0.2.31 +pkgver=0.2.32 pkgrel=1 pkgdesc="Hippocanvas is a canvas library based on GTK+2.0" depends=('gtk+2' 'libcroco' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' \ @@ -12,7 +12,7 @@ options=('scriptlet') groups=('xlib-extra') archs=('i686') Finclude gnome python -sha1sums=('cb44ede5371c5982f830e2f4334dcdf56ac07caf') +sha1sums=('a38fe3a29f6dd258b984dfd68b144329be4e625f') Fconfopts="${Fconfopts[@]} --enable-python" subpkgs=("hippo-canvas-python") subdescs=('python support hippo-canvas') From bouleetbil at frogdev.info Tue Jun 17 10:07:58 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jun 17 10:08:00 2008 Subject: [Frugalware-git] frugalware-current: joda-time-1.5.2-1-i686 Message-ID: <20080617080758.095EF11901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b45a705323605d6f1e4d86aa91d0d84fc48ae09f commit b45a705323605d6f1e4d86aa91d0d84fc48ae09f Author: bouleetbil Date: Tue Jun 17 10:01:37 2008 +0200 joda-time-1.5.2-1-i686 *new package diff --git a/source/devel-extra/joda-time/FrugalBuild b/source/devel-extra/joda-time/FrugalBuild new file mode 100644 index 0000000..6b3db72 --- /dev/null +++ b/source/devel-extra/joda-time/FrugalBuild @@ -0,0 +1,23 @@ +# Compiling Time: 0.43 SBU +# Maintainer: bouleetbil + +pkgname=joda-time +pkgver=1.5.2 +pkgrel=1 +pkgdesc="A quality open-source replacement for the Java Date and Time classes" +_F_sourceforge_ext="-src.tar.gz" +Finclude sourceforge java +depends=(${depends[@]} 'junit') +groups=('devel-extra') +archs=('i686') +sha1sums=('65cece4060f495a43fc1d7229251bc39b11f5fed') +_F_cd_path="$pkgname-$pkgver-src" + +build() { + Fcd + Fjavacleanup + Fant + mv build/$pkgname-$pkgver.jar build/$pkgname.jar || Fdie + #install + Fjar build/$pkgname.jar +} From vmiklos at frugalware.org Tue Jun 17 14:19:31 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 17 14:19:33 2008 Subject: [Frugalware-git] setup: avoid duplicated layout entries in the layout plugin Message-ID: <20080617121931.4F2B611901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=7ee7b4edc2cfa3e94468fa3bfa9794fd8d461c19 commit 7ee7b4edc2cfa3e94468fa3bfa9794fd8d461c19 Author: Miklos Vajna Date: Tue Jun 17 14:19:11 2008 +0200 avoid duplicated layout entries in the layout plugin closes #3157 diff --git a/src/plugins/layout.c b/src/plugins/layout.c index 1ba8003..f8c1823 100644 --- a/src/plugins/layout.c +++ b/src/plugins/layout.c @@ -101,6 +101,11 @@ int run(GList **config) FILE* fp; int ret = 0; + if (layoutl) + { + g_list_free(layoutl); + layoutl = NULL; + } find("/usr/share/keymaps/i386"); layoutl = g_list_sort(layoutl, sort_layouts); array = glist4dialog(layoutl, ""); From vmiklos at frugalware.org Tue Jun 17 14:19:45 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 17 14:19:46 2008 Subject: [Frugalware-git] setup: typo fix in the select plugin Message-ID: <20080617121945.77C6011901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=30c1d7957d3c76f730f1300b3ca26aeba670e4f6 commit 30c1d7957d3c76f730f1300b3ca26aeba670e4f6 Author: Miklos Vajna Date: Tue Jun 17 14:19:42 2008 +0200 typo fix in the select plugin diff --git a/src/plugins/select.c b/src/plugins/select.c index dd3a9cf..4c15c45 100644 --- a/src/plugins/select.c +++ b/src/plugins/select.c @@ -136,7 +136,7 @@ GList* group2pkgs(GList *syncs, char *group, int dialog) // frugalware repo + enable the // language-specific parts from // locale-extra - addpkg = ((strcmp(getenv("LANG", "en_US")) && + addpkg = ((strcmp(getenv("LANG"), "en_US") && !strcmp(group, "locale-extra") && strlen(pkgname) >= strlen(lang) && !strcmp(pkgname + strlen(pkgname) - From vmiklos at frugalware.org Tue Jun 17 15:07:00 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 17 15:07:01 2008 Subject: [Frugalware-git] frugalware-current: galago-sharp-0.5.0-2-i686 Message-ID: <20080617130700.1F5FA11901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a90774677ad4c16a3caa047b107845b9758c4848 commit a90774677ad4c16a3caa047b107845b9758c4848 Author: Miklos Vajna Date: Tue Jun 17 15:06:33 2008 +0200 galago-sharp-0.5.0-2-i686 - moved to extra - depends() fix diff --git a/source/gnome-extra/galago-sharp/FrugalBuild b/source/gnome-extra/galago-sharp/FrugalBuild new file mode 100644 index 0000000..00d4a47 --- /dev/null +++ b/source/gnome-extra/galago-sharp/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling time: 0.79 SBU +# Maintainer: AlexExtreme + +pkgname=galago-sharp +pkgver=0.5.0 +pkgrel=2 +pkgdesc="Galago Desktop Presence Framework - C# Bindings" +url="http://www.galago-project.org" +depends=('libgalago' 'gtk2-sharp>=2.10.0' 'perl-xml-libxml' 'dbus-sharp') +groups=('gnome-extra') +archs=('i686' 'x86_64') +source=($url/files/releases/source/$pkgname/$pkgname-$pkgver.tar.bz2 \ + galago-sharp-0.5.0-fix-nunit-name.patch) +Finclude mono +up2date="lynx -dump http://www.galago-project.org/files/releases/source/$pkgname | Flasttar" +sha1sums=('67ec03129e3ca55c982f0fc3c61825779f80b9f0' \ + '3e4dcbd3fa3f7b5bb1995c3f268ac19e4c9da15f') + +# optimization OK diff --git a/source/gnome-extra/galago-sharp/galago-sharp-0.5.0-fix-nunit-name.patch b/source/gnome-extra/galago-sharp/galago-sharp-0.5.0-fix-nunit-name.patch new file mode 100644 index 0000000..4e298e2 --- /dev/null +++ b/source/gnome-extra/galago-sharp/galago-sharp-0.5.0-fix-nunit-name.patch @@ -0,0 +1,24 @@ +diff -urN galago-sharp-0.5.0.orig/tests/Makefile.am galago-sharp-0.5.0/tests/Makefile.am +--- galago-sharp-0.5.0.orig/tests/Makefile.am 2006-04-05 09:01:54.000000000 +0100 ++++ galago-sharp-0.5.0/tests/Makefile.am 2006-08-21 08:06:38.000000000 +0100 +@@ -23,7 +23,7 @@ + $(CSC) /out:$@ $(REFERENCES) $(srcdir)/$< + + unit-tests.dll: unit-tests.cs $(ASSEMBLIES) +- $(CSC) /out:$@ /target:library $(REFERENCES) -pkg:nunit $(srcdir)/$< ++ $(CSC) /out:$@ /target:library $(REFERENCES) -pkg:mono-nunit $(srcdir)/$< + + EXTRA_DIST = \ + get-presence.cs \ +diff -urN galago-sharp-0.5.0.orig/tests/Makefile.in galago-sharp-0.5.0/tests/Makefile.in +--- galago-sharp-0.5.0.orig/tests/Makefile.in 2006-04-20 21:12:09.000000000 +0100 ++++ galago-sharp-0.5.0/tests/Makefile.in 2006-08-21 08:06:28.000000000 +0100 +@@ -361,7 +361,7 @@ + $(CSC) /out:$@ $(REFERENCES) $(srcdir)/$< + + unit-tests.dll: unit-tests.cs $(ASSEMBLIES) +- $(CSC) /out:$@ /target:library $(REFERENCES) -pkg:nunit $(srcdir)/$< ++ $(CSC) /out:$@ /target:library $(REFERENCES) -pkg:mono-nunit $(srcdir)/$< + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/source/gnome/galago-sharp/FrugalBuild b/source/gnome/galago-sharp/FrugalBuild deleted file mode 100644 index 86aee0b..0000000 --- a/source/gnome/galago-sharp/FrugalBuild +++ /dev/null @@ -1,19 +0,0 @@ -# Compiling time: 0.79 SBU -# Maintainer: AlexExtreme - -pkgname=galago-sharp -pkgver=0.5.0 -pkgrel=2 -pkgdesc="Galago Desktop Presence Framework - C# Bindings" -url="http://www.galago-project.org" -depends=('libgalago' 'gtk2-sharp>=2.10.0' 'perl-xml-libxml' 'dbus-mono') -groups=('gnome') -archs=('i686' 'x86_64') -source=($url/files/releases/source/$pkgname/$pkgname-$pkgver.tar.bz2 \ - galago-sharp-0.5.0-fix-nunit-name.patch) -Finclude mono -up2date="lynx -dump http://www.galago-project.org/files/releases/source/$pkgname | Flasttar" -sha1sums=('67ec03129e3ca55c982f0fc3c61825779f80b9f0' \ - '3e4dcbd3fa3f7b5bb1995c3f268ac19e4c9da15f') - -# optimization OK diff --git a/source/gnome/galago-sharp/galago-sharp-0.5.0-fix-nunit-name.patch b/source/gnome/galago-sharp/galago-sharp-0.5.0-fix-nunit-name.patch deleted file mode 100644 index 4e298e2..0000000 --- a/source/gnome/galago-sharp/galago-sharp-0.5.0-fix-nunit-name.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urN galago-sharp-0.5.0.orig/tests/Makefile.am galago-sharp-0.5.0/tests/Makefile.am ---- galago-sharp-0.5.0.orig/tests/Makefile.am 2006-04-05 09:01:54.000000000 +0100 -+++ galago-sharp-0.5.0/tests/Makefile.am 2006-08-21 08:06:38.000000000 +0100 -@@ -23,7 +23,7 @@ - $(CSC) /out:$@ $(REFERENCES) $(srcdir)/$< - - unit-tests.dll: unit-tests.cs $(ASSEMBLIES) -- $(CSC) /out:$@ /target:library $(REFERENCES) -pkg:nunit $(srcdir)/$< -+ $(CSC) /out:$@ /target:library $(REFERENCES) -pkg:mono-nunit $(srcdir)/$< - - EXTRA_DIST = \ - get-presence.cs \ -diff -urN galago-sharp-0.5.0.orig/tests/Makefile.in galago-sharp-0.5.0/tests/Makefile.in ---- galago-sharp-0.5.0.orig/tests/Makefile.in 2006-04-20 21:12:09.000000000 +0100 -+++ galago-sharp-0.5.0/tests/Makefile.in 2006-08-21 08:06:28.000000000 +0100 -@@ -361,7 +361,7 @@ - $(CSC) /out:$@ $(REFERENCES) $(srcdir)/$< - - unit-tests.dll: unit-tests.cs $(ASSEMBLIES) -- $(CSC) /out:$@ /target:library $(REFERENCES) -pkg:nunit $(srcdir)/$< -+ $(CSC) /out:$@ /target:library $(REFERENCES) -pkg:mono-nunit $(srcdir)/$< - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: From ryuo at frugalware.org Tue Jun 17 15:13:11 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 15:13:13 2008 Subject: [Frugalware-git] frugalware-current: optipng-0.6-1-i686 Message-ID: <20080617131311.D768111901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=68586762f84bfde55a5e590d699e16a497302dbb commit 68586762f84bfde55a5e590d699e16a497302dbb Author: James Buren Date: Tue Jun 17 08:12:00 2008 -0500 optipng-0.6-1-i686 * new package diff --git a/source/apps-extra/optipng/FrugalBuild b/source/apps-extra/optipng/FrugalBuild index af0c78f..d0e8dc5 100644 --- a/source/apps-extra/optipng/FrugalBuild +++ b/source/apps-extra/optipng/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: James Buren pkgname=optipng -pkgver=0.5.5 -pkgrel=2 +pkgver=0.6 +pkgrel=1 pkgdesc="A PNG optimizer that tries to reduce the file size even further." _F_sourceforge_broken_up2date=1 Finclude sourceforge @@ -11,7 +11,7 @@ depends=('glibc') makedepends=('groff') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('670da3b01da903fa04886e4b6e625648570b3d9c') +sha1sums=('7523a7fee5bd7b2208c3596f8074b7fcc94b00d1') build() { From ryuo at frugalware.org Tue Jun 17 15:20:06 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 15:20:07 2008 Subject: [Frugalware-git] frugalware-current: firebox-tools-0.5.0-1-i686 Message-ID: <20080617132006.4111811901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b0af39f51cf61f0ba2c6772e1c39f6495f3d1d2a commit b0af39f51cf61f0ba2c6772e1c39f6495f3d1d2a Author: James Buren Date: Tue Jun 17 08:17:20 2008 -0500 firebox-tools-0.5.0-1-i686 * up2date fix diff --git a/source/xapps-extra/firebox-tools/FrugalBuild b/source/xapps-extra/firebox-tools/FrugalBuild index a6f9cb1..53868f2 100644 --- a/source/xapps-extra/firebox-tools/FrugalBuild +++ b/source/xapps-extra/firebox-tools/FrugalBuild @@ -10,7 +10,7 @@ rodepends=('firebox') depends=('gtk+2' 'glibc' 'freetype2' 'libxau' 'libxdmcp' 'libxml2' 'libxdamage' 'libxext') groups=('xapps-extra') archs=('i686' 'x86_64') -up2date="Flasttar $url/?page=4" +up2date="Flastarchive $url/?page=4 .tar.gz" options=('scriptlet') source=(http://download.gna.org/firebox/tarballs/$pkgname-$pkgver.tar.gz) sha1sums=('43a19ca0874bc7bdda268889c971350066ec2571') From ryuo at frugalware.org Tue Jun 17 15:20:06 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 15:20:11 2008 Subject: [Frugalware-git] frugalware-current: firebox-themes-0.5.0-1-i686 Message-ID: <20080617132006.56E5C11901F0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d3acbaa4d7304b2c3d675cf551ae8393aed92d1e commit d3acbaa4d7304b2c3d675cf551ae8393aed92d1e Author: James Buren Date: Tue Jun 17 08:18:29 2008 -0500 firebox-themes-0.5.0-1-i686 * up2date fix diff --git a/source/xlib-extra/firebox-themes/FrugalBuild b/source/xlib-extra/firebox-themes/FrugalBuild index bf66393..7291aa7 100644 --- a/source/xlib-extra/firebox-themes/FrugalBuild +++ b/source/xlib-extra/firebox-themes/FrugalBuild @@ -10,7 +10,7 @@ rodepends=('firebox') depends=() groups=('xlib-extra') archs=('i686' 'x86_64') -up2date="Flasttar $url/?page=4" +up2date="Flastarchive $url/?page=4 .tar.gz" source=(http://download.gna.org/firebox/tarballs/$pkgname-$pkgver.tar.gz) sha1sums=('059e8436f2945fc85145c72e71bdfc96e4927137') From ryuo at frugalware.org Tue Jun 17 15:20:06 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 15:20:13 2008 Subject: [Frugalware-git] frugalware-current: firebox-0.5.0-1-i686 Message-ID: <20080617132006.668B811901F1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bb80b65edfe70c08329f2a337a07807bfc92c19b commit bb80b65edfe70c08329f2a337a07807bfc92c19b Author: James Buren Date: Tue Jun 17 08:20:03 2008 -0500 firebox-0.5.0-1-i686 * up2date fix diff --git a/source/x11-extra/firebox/FrugalBuild b/source/x11-extra/firebox/FrugalBuild index 5e7150d..484f951 100644 --- a/source/x11-extra/firebox/FrugalBuild +++ b/source/x11-extra/firebox/FrugalBuild @@ -9,7 +9,7 @@ url="http://firebox.intuxication.org" depends=('libxft' 'libxcomposite' 'libpng' 'libjpeg') groups=('x11-extra') archs=('i686' 'x86_64') -up2date="Flasttar $url/?page=4" +up2date="Flastarchive $url/?page=4 .tar.gz" source=(http://download.gna.org/firebox/tarballs/$pkgname-$pkgver.tar.gz) sha1sums=('9286e6adc32e8fbe78ff24ce403003884825e705') From vmiklos at frugalware.org Tue Jun 17 15:32:58 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 17 15:33:00 2008 Subject: [Frugalware-git] pacman-tools: fblint: allow noversrc option Message-ID: <20080617133258.3194B11901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=666dd98bf2fb1777596bbccf4ea4541fa9b5a868 commit 666dd98bf2fb1777596bbccf4ea4541fa9b5a868 Author: Miklos Vajna Date: Tue Jun 17 15:32:54 2008 +0200 fblint: allow noversrc option diff --git a/fblint b/fblint index 9605481..454768e 100755 --- a/fblint +++ b/fblint @@ -123,7 +123,7 @@ check "url" "[ ! -z \"$url\" ]" check "depends" "[ ! -z \"$depends\" -o ! -z \"$rodepends\" ] || set|grep -q ^depends=" check "groups" "[ ! -z \"$groups\" ]" check "valid first group" "! echo $groups |grep -q -- - || echo $groups|grep -q -- -extra$" -check "valid options()" "[ -z \"$(echo ${options[@]}|tr ' ' '\n' |grep -v '\(nodocs\|nostrip\|force\|nobuild\|nofakeroot\|scriptlet\|stick\|nomirror\)')\" ]" +check "valid options()" "[ -z \"$(echo ${options[@]}|tr ' ' '\n' |grep -v '\(nodocs\|nostrip\|force\|nobuild\|nofakeroot\|scriptlet\|stick\|nomirror\|noversrc\)')\" ]" check "archs" "[ ! -z \"$archs\" ]" check "up2date" "[ ! -z \"`echo $up2date|sed 's/\$(/\\\\\$(/g'`\" ]" _fblint_have_remote_source=n From vmiklos at frugalware.org Tue Jun 17 15:34:40 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 17 15:34:42 2008 Subject: [Frugalware-git] frugalware-current: gpm-1.20.5-1-i686 Message-ID: <20080617133440.53B7A11901F0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0e46ee7f55630049916d720323a53531393cf7de commit 0e46ee7f55630049916d720323a53531393cf7de Author: Miklos Vajna Date: Tue Jun 17 15:25:10 2008 +0200 gpm-1.20.5-1-i686 - version bump diff --git a/source/base/gpm/FrugalBuild b/source/base/gpm/FrugalBuild index efdd545..7516134 100644 --- a/source/base/gpm/FrugalBuild +++ b/source/base/gpm/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=gpm -pkgver=1.20.4 +pkgver=1.20.5 pkgrel=1 pkgdesc="General purpose mouse server" url="http://unix.schottelius.org/gpm/" @@ -13,7 +13,7 @@ backup=(etc/sysconfig/gpm) up2date="lynx -dump http://unix.schottelius.org/gpm/archives/|grep -v '\.99'|Flasttar" source=(http://unix.schottelius.org/gpm/archives/gpm-$pkgver.tar.gz rc.gpm \ rc.gpm-de.po gpm) -sha1sums=('5a16db5e4dc39fbf3c53a09d1460ca468ef1af44' \ +sha1sums=('71ee9125414e5a4c3916c5f5f35ee76ca1397f9d' \ '4d799baf9e0b5e5dbe3e34afcd847788c73bb8ed' \ '2f7c697b367ac05c61ec9f09649407be55daee91' \ '2a81304fa5332ee8d9051905c5adcac12b8f68be') From vmiklos at frugalware.org Tue Jun 17 15:34:40 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 17 15:34:43 2008 Subject: [Frugalware-git] frugalware-current: hdparm-8.9-1-i686 Message-ID: <20080617133440.621D111901F1@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=be3ec5e4664998eb67fb6ead1ae6ccbe3b7e2400 commit be3ec5e4664998eb67fb6ead1ae6ccbe3b7e2400 Author: Miklos Vajna Date: Tue Jun 17 15:26:31 2008 +0200 hdparm-8.9-1-i686 - version bump diff --git a/source/apps/hdparm/FrugalBuild b/source/apps/hdparm/FrugalBuild index 0455532..ad66237 100644 --- a/source/apps/hdparm/FrugalBuild +++ b/source/apps/hdparm/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: VMiklos pkgname=hdparm -pkgver=8.8 +pkgver=8.9 pkgrel=1 pkgdesc="Read/set hard drive parameters" depends=('glibc') groups=('apps') archs=('i686' 'x86_64' 'ppc') Finclude sourceforge -sha1sums=('647f018e3a475ef2274fd297a4f77579e6959ceb') +sha1sums=('7991504ded6babe9077040ae1731e60fdc2c00d1') # optimization OK From vmiklos at frugalware.org Tue Jun 17 15:34:40 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 17 15:34:44 2008 Subject: [Frugalware-git] frugalware-current: mako-0.2.1-1-i686 Message-ID: <20080617133440.3911111901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=23731386149d8cfcf0cd44809b336a72cada84ca commit 23731386149d8cfcf0cd44809b336a72cada84ca Author: Miklos Vajna Date: Tue Jun 17 15:22:07 2008 +0200 mako-0.2.1-1-i686 - version bump diff --git a/source/devel-extra/mako/FrugalBuild b/source/devel-extra/mako/FrugalBuild index 6654d8f..ff78e1f 100644 --- a/source/devel-extra/mako/FrugalBuild +++ b/source/devel-extra/mako/FrugalBuild @@ -4,7 +4,7 @@ pkgname=mako _F_archive_name="Mako" -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=1 pkgdesc="Mako is a template library written in Python." url="http://www.makotemplates.org" @@ -14,5 +14,5 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://pypi.python.org/packages/source/M/Mako/ |Flasttar" source=(http://pypi.python.org/packages/source/M/Mako/$_F_archive_name-$pkgver.tar.gz) -sha1sums=('179a121a0142d0c98624e28a4f9d75696a299fa0') +sha1sums=('d43dc2739dbeb2c06ef1cb905147017a713723f5') _F_makepkg_chkdep="python" From vmiklos at frugalware.org Tue Jun 17 15:34:40 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 17 15:34:45 2008 Subject: [Frugalware-git] frugalware-current: rss2email-2.63-1-i686 Message-ID: <20080617133440.6C07F11901F2@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ca5191f6c3de13f93630ed0fa1e1c4a0fa696e54 commit ca5191f6c3de13f93630ed0fa1e1c4a0fa696e54 Author: Miklos Vajna Date: Tue Jun 17 15:34:25 2008 +0200 rss2email-2.63-1-i686 - fix up broken sha1sums() diff --git a/source/network-extra/rss2email/FrugalBuild b/source/network-extra/rss2email/FrugalBuild index 0db5c67..39db926 100644 --- a/source/network-extra/rss2email/FrugalBuild +++ b/source/network-extra/rss2email/FrugalBuild @@ -16,11 +16,12 @@ source=(http://$pkgname.infogami.com/$pkgname.py \ http://feedparser.org/feedparser.py \ http://lindsey.smith.googlepages.com/r2e \ README.Frugalware) -sha1sums=('32091d8cc9378e6346a9589d9783505259564337' \ - 'feb09264045adfb7e4ef12344e446a15e2005a11' \ - 'f9c2a4b3a4b2a586e74da8fdcf1760fe3a96c818' \ - '11eb7b878c30fac548d56aed90c1503143583e3d' \ - 'b7200b4072ffc1ad56b62c94ab284246f73316bc') +sha1sums=('e2224516218187fb3661749040dbd6f104a1109c' \ + '5cd6bb95b0e519a89e212354f82f9e0a6960a3a2' \ + 'f9c2a4b3a4b2a586e74da8fdcf1760fe3a96c818' \ + 'd2b9524e7558bb95ab2bc2c458f4123cfceab7b4' \ + 'b7200b4072ffc1ad56b62c94ab284246f73316bc') +options=('noversrc') build() { mkdir build From priyank at frugalware.org Tue Jun 17 16:02:21 2008 From: priyank at frugalware.org (Priyank) Date: Tue Jun 17 16:02:23 2008 Subject: [Frugalware-git] frugalware-current: compiz.sh Message-ID: <20080617140221.CA0A711901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aa017f55ad914456225ecde0a1584a1a3aca23a2 commit aa017f55ad914456225ecde0a1584a1a3aca23a2 Author: Priyank Date: Tue Jun 17 19:30:59 2008 +0530 compiz.sh * Bump compizver to 0.7.6 diff --git a/source/include/compiz.sh b/source/include/compiz.sh index a3f1cdf..01dcc2a 100644 --- a/source/include/compiz.sh +++ b/source/include/compiz.sh @@ -32,7 +32,7 @@ # to declare the real version ### -compizver=0.7.4 +compizver=0.7.6 if [ -z "$_F_compiz_name" ]; then _F_compiz_name=$pkgname From priyank at frugalware.org Tue Jun 17 16:47:21 2008 From: priyank at frugalware.org (Priyank) Date: Tue Jun 17 16:47:22 2008 Subject: [Frugalware-git] frugalware-current: compiz-0.7.6-1-i686 Message-ID: <20080617144721.0798411901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7416188e82724b6280816dfbc2851a9c97b4dbae commit 7416188e82724b6280816dfbc2851a9c97b4dbae Author: Priyank Date: Tue Jun 17 20:12:43 2008 +0530 compiz-0.7.6-1-i686 * Removed deprecated schema files * Version bump & updated dependencies diff --git a/source/x11-extra/compiz/FrugalBuild b/source/x11-extra/compiz/FrugalBuild index a0aafbe..92fd9bb 100644 --- a/source/x11-extra/compiz/FrugalBuild +++ b/source/x11-extra/compiz/FrugalBuild @@ -5,31 +5,18 @@ pkgname=compiz Finclude compiz pkgrel=1 depends=('libgl' 'libglx' 'libpng' 'libxcomposite' 'libxfixes' 'libxdamage' \ - 'libxrandr' 'libxinerama' 'libice' 'libsm' 'startup-notification' 'libxrender' \ - 'libxslt' 'dbus' 'mesa') -makedepends=('kdebase>=3.5.9' 'perl-xml-parser' 'fixesproto' 'damageproto' 'gnome-control-center>=2.20.3' 'gconf' 'metacity>=2.20.2') + 'libxrandr' 'libxinerama' 'libice' 'libsm' 'startup-notification' \ + 'libxrender' 'libxslt' 'dbus' 'mesa') +makedepends=('kdebase>=3.5.9' 'perl-xml-parser' 'fixesproto' 'damageproto' 'gnome-control-center>=2.22.2.1' 'gconf' 'metacity>=2.22.0') replaces=('beryl' 'beryl-manager' 'beryl-settings' 'beryl-settings-bindings' 'beryl-settings-simple') groups=('x11-extra') archs=('i686' 'x86_64') up2date=$pkgver -sha1sums=('05438ef08a498e4f4ad06c596a57d3d9b50854ea') -_F_gnome_schemas=('/etc/gconf/schemas/gwd.schemas' \ - '/etc/gconf/schemas/compiz-zoom.schemas' \ - '/etc/gconf/schemas/compiz-wobbly.schemas' \ - '/etc/gconf/schemas/compiz-water.schemas' \ - '/etc/gconf/schemas/compiz-video.schemas' \ - '/etc/gconf/schemas/compiz-switcher.schemas' \ - '/etc/gconf/schemas/compiz-svg.schemas' \ - '/etc/gconf/schemas/compiz-screenshot.schemas' \ - '/etc/gconf/schemas/compiz-scale.schemas' \ - '/etc/gconf/schemas/compiz-rotate.schemas' \ - '/etc/gconf/schemas/compiz-resize.schemas' \ - '/etc/gconf/schemas/compiz-regex.schemas' \ - '/etc/gconf/schemas/compiz-png.schemas' \ - '/etc/gconf/schemas/compiz-plane.schemas' \ - '/etc/gconf/schemas/compiz-place.schemas' \ +sha1sums=('a3796864b56fdf2bd871d7154016fdcbb9866943') +_F_gnome_schemas=('/etc/gconf/schemas/compiz-place.schemas' \ '/etc/gconf/schemas/compiz-move.schemas' \ '/etc/gconf/schemas/compiz-minimize.schemas' \ + '/etc/gconf/schemas/compiz-kconfig.schemas' \ '/etc/gconf/schemas/compiz-inotify.schemas' \ '/etc/gconf/schemas/compiz-ini.schemas' \ '/etc/gconf/schemas/compiz-glib.schemas' \ @@ -48,13 +35,12 @@ unset install subpkgs=("$pkgname-gnome" "$pkgname-kde") subdescs=('Compiz for GNOME' 'Compiz for KDE') -subdepends=("$pkgname=$pkgver librsvg metacity>=2.20.2 gnome-control-center>=2.20.3 gconf" \ +subdepends=("$pkgname=$pkgver librsvg metacity>=2.22.0 gnome-control-center>=2.22.2.1 gconf" \ "$pkgname=$pkgver kdebase>=3.5.9") subinstall=("$_F_gnome_scriptlet" "") subgroups=('gnome-extra' 'kde-extra') subarchs=('i686 x86_64' 'i686 x86_64') - build() { Fbuild --enable-gconf --enable-librsvg --enable-metacity --enable-gnome \ --enable-kde --enable-gtk --with-scale-corner=no @@ -62,23 +48,10 @@ build() { Fsplit compiz-gnome usr/share/gnome/ Fsplit compiz-gnome usr/share/gnome-control-center/ Fsplit compiz-gnome usr/bin/gtk-window-decorator - Fsplit compiz-gnome etc/gconf/schemas/gwd.schemas - Fsplit compiz-gnome etc/gconf/schemas/compiz-zoom.schemas - Fsplit compiz-gnome etc/gconf/schemas/compiz-wobbly.schemas - Fsplit compiz-gnome etc/gconf/schemas/compiz-water.schemas - Fsplit compiz-gnome etc/gconf/schemas/compiz-video.schemas - Fsplit compiz-gnome etc/gconf/schemas/compiz-switcher.schemas - Fsplit compiz-gnome etc/gconf/schemas/compiz-svg.schemas - Fsplit compiz-gnome etc/gconf/schemas/compiz-screenshot.schemas - Fsplit compiz-gnome etc/gconf/schemas/compiz-scale.schemas - Fsplit compiz-gnome etc/gconf/schemas/compiz-rotate.schemas - Fsplit compiz-gnome etc/gconf/schemas/compiz-resize.schemas - Fsplit compiz-gnome etc/gconf/schemas/compiz-regex.schemas - Fsplit compiz-gnome etc/gconf/schemas/compiz-png.schemas - Fsplit compiz-gnome etc/gconf/schemas/compiz-plane.schemas Fsplit compiz-gnome etc/gconf/schemas/compiz-place.schemas Fsplit compiz-gnome etc/gconf/schemas/compiz-move.schemas Fsplit compiz-gnome etc/gconf/schemas/compiz-minimize.schemas + Fsplit compiz-gnome etc/gconf/schemas/compiz-kconfig.schemas Fsplit compiz-gnome etc/gconf/schemas/compiz-inotify.schemas Fsplit compiz-gnome etc/gconf/schemas/compiz-ini.schemas Fsplit compiz-gnome etc/gconf/schemas/compiz-glib.schemas From priyank at frugalware.org Tue Jun 17 16:52:55 2008 From: priyank at frugalware.org (Priyank) Date: Tue Jun 17 16:52:56 2008 Subject: [Frugalware-git] frugalware-current: libcompizconfig-0.7.6-1-i686 Message-ID: <20080617145255.D115811901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e543e2d4f3c584163997c1b283cdae17327d68c8 commit e543e2d4f3c584163997c1b283cdae17327d68c8 Author: Priyank Date: Tue Jun 17 20:20:35 2008 +0530 libcompizconfig-0.7.6-1-i686 * Version bump diff --git a/source/xlib-extra/libcompizconfig/FrugalBuild b/source/xlib-extra/libcompizconfig/FrugalBuild index 73a0ef4..91cc4a7 100644 --- a/source/xlib-extra/libcompizconfig/FrugalBuild +++ b/source/xlib-extra/libcompizconfig/FrugalBuild @@ -2,14 +2,13 @@ # Maintainer: Priyank Gosalia pkgname=libcompizconfig -pkgver=0.7.4 +Finclude compiz pkgrel=1 pkgdesc="Compiz configuration system library" -depends=('libxml2' 'compiz>=0.7.4') +depends=('libxml2' 'compiz>=0.7.6') makedepends=('perl-xml-parser') groups=('xlib-extra') archs=('i686' 'x86_64') -Finclude compiz -sha1sums=('30d0de4e6caa7c398aa04733449d5ee7c7a95d87') +sha1sums=('df84fd6ab4aa9f40975af8b526d1e1e27c9dc690') # optimization OK From priyank at frugalware.org Tue Jun 17 16:56:07 2008 From: priyank at frugalware.org (Priyank) Date: Tue Jun 17 16:56:08 2008 Subject: [Frugalware-git] frugalware-current: compiz-bcop-0.7.6-1-i686 Message-ID: <20080617145607.1316611901EE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d5dd045033974aab2de7d19a709b4ac6a716a23c commit d5dd045033974aab2de7d19a709b4ac6a716a23c Author: Priyank Date: Tue Jun 17 20:24:19 2008 +0530 compiz-bcop-0.7.6-1-i686 * Version bump diff --git a/source/apps-extra/compiz-bcop/FrugalBuild b/source/apps-extra/compiz-bcop/FrugalBuild index 8827951..08c9dd3 100644 --- a/source/apps-extra/compiz-bcop/FrugalBuild +++ b/source/apps-extra/compiz-bcop/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Priyank Gosalia pkgname=compiz-bcop -pkgrel=1 Finclude compiz +pkgrel=1 pkgdesc="Options code generator for Compiz Fusion" url="http://www.compiz.org/" depends=('libxslt') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('69b62fb138ad7fe335c70f7f5278ec4053c6fb4f') +sha1sums=('5a4d528311d76f43833a7dce9da427c56aaadcac') From priyank at frugalware.org Tue Jun 17 17:12:56 2008 From: priyank at frugalware.org (Priyank) Date: Tue Jun 17 17:12:58 2008 Subject: [Frugalware-git] frugalware-current: compiz-plugins-main-0.7.6-1-i686 Message-ID: <20080617151256.A7B7C17880AD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=845d05fe4bc81b7c03d66bb5323375f66f1c9cd9 commit 845d05fe4bc81b7c03d66bb5323375f66f1c9cd9 Author: Priyank Date: Tue Jun 17 20:33:46 2008 +0530 compiz-plugins-main-0.7.6-1-i686 * Version bump diff --git a/source/x11-extra/compiz-plugins-main/FrugalBuild b/source/x11-extra/compiz-plugins-main/FrugalBuild index 1fd46ce..4b3b17a 100644 --- a/source/x11-extra/compiz-plugins-main/FrugalBuild +++ b/source/x11-extra/compiz-plugins-main/FrugalBuild @@ -2,15 +2,16 @@ # Maintainer: Priyank Gosalia pkgname=compiz-plugins-main +Finclude compiz pkgrel=1 _F_compiz_name="compiz-fusion-plugins-main" -Finclude compiz pkgdesc="Main plugins for Compiz Fusion" -depends=('compiz>=0.7.4' 'compiz-bcop>=0.7.4' 'cairo' 'libjpeg' 'librsvg') +depends=('compiz>=0.7.6' 'compiz-bcop>=0.7.6' 'cairo' 'libjpeg' 'librsvg') makedepends=('pkgconfig' 'perl-xml-parser') groups=('x11-extra') archs=('i686' 'x86_64') _F_cd_path=$_F_compiz_name-$pkgver -sha1sums=('fd8a9f979490f2f9c183da9b3e531c9168d51527') +source=(${source/plugins/fusion-plugins}) +sha1sums=('5f90a3b8c2402c19ee3a35b0f3904a680eacaa7d') # optimization OK From vmiklos at frugalware.org Tue Jun 17 17:13:28 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jun 17 17:13:30 2008 Subject: [Frugalware-git] frugalwareutils: fwnet_ifup(): fix setting essid containing spaces Message-ID: <20080617151328.BAA3F17880AD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=1815e0d5ab92df8b0d74086ac0a06513ad4dfd04 commit 1815e0d5ab92df8b0d74086ac0a06513ad4dfd04 Author: Miklos Vajna Date: Tue Jun 17 17:13:11 2008 +0200 fwnet_ifup(): fix setting essid containing spaces reported by priyank diff --git a/libfwnetconfig/libfwnetconfig.c b/libfwnetconfig/libfwnetconfig.c index c997f31..ee313f0 100644 --- a/libfwnetconfig/libfwnetconfig.c +++ b/libfwnetconfig/libfwnetconfig.c @@ -440,7 +440,7 @@ int fwnet_ifup(fwnet_interface_t *iface, fwnet_profile_t *profile) } if(strlen(iface->essid)) { - ptr = g_strdup_printf("iwconfig %s essid %s", iface->name, iface->essid); + ptr = g_strdup_printf("iwconfig %s essid \"%s\"", iface->name, iface->essid); ret += fwutil_system(ptr); FWUTIL_FREE(ptr); } From priyank at frugalware.org Tue Jun 17 17:28:41 2008 From: priyank at frugalware.org (Priyank) Date: Tue Jun 17 17:28:44 2008 Subject: [Frugalware-git] frugalware-current: compiz-plugins-extra-0.7.6-1-i686 Message-ID: <20080617152841.5883E17880AD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fc59b891806c82969af604edde30a55dcf4dd372 commit fc59b891806c82969af604edde30a55dcf4dd372 Author: Priyank Date: Tue Jun 17 20:54:47 2008 +0530 compiz-plugins-extra-0.7.6-1-i686 * Version bump diff --git a/source/x11-extra/compiz-plugins-extra/FrugalBuild b/source/x11-extra/compiz-plugins-extra/FrugalBuild index 643e413..e3a54b3 100644 --- a/source/x11-extra/compiz-plugins-extra/FrugalBuild +++ b/source/x11-extra/compiz-plugins-extra/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Priyank Gosalia pkgname=compiz-plugins-extra -pkgrel=1 _F_compiz_name="compiz-fusion-plugins-extra" Finclude compiz +pkgrel=1 pkgdesc="Extra plugins for Compiz Fusion" -depends=('compiz>=0.7.4' 'compiz-bcop>=0.7.4' 'compiz-plugins-main>=0.7.4' \ +depends=('compiz>=0.7.6' 'compiz-bcop>=0.7.6' 'compiz-plugins-main>=0.7.6' \ 'cairo' 'libjpeg' 'librsvg') makedepends=('pkgconfig' 'perl-xml-parser') options=('scriptlet') groups=('x11-extra') archs=('i686' 'x86_64') _F_cd_path=$_F_compiz_name-$pkgver -sha1sums=('2e419f255e6aba100c63ff2261d9cc332ad4d91c') +sha1sums=('4acc3330fa00b4c5e005a70c48971fefe6bf003d') # optimization OK From ryuo at frugalware.org Tue Jun 17 18:57:54 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 18:57:56 2008 Subject: [Frugalware-git] rox: rox.sh Message-ID: <20080617165754.F244C1190A3E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=55285b4c18cbf5f47e8259fa309d1a0f93948154 commit 55285b4c18cbf5f47e8259fa309d1a0f93948154 Author: James Buren Date: Tue Jun 17 11:57:49 2008 -0500 rox.sh * my initial revision diff --git a/source/include/rox.sh b/source/include/rox.sh index b2a821a..b6731a9 100644 --- a/source/include/rox.sh +++ b/source/include/rox.sh @@ -25,49 +25,120 @@ # groups=('rox-extra') # archs=('i686') # depends=('libgtop' 'rox-clib') -# _F_app_dir="Load" +# _F_rox_appname="Load" # Finclude rox # -------------------------------------------------- # # == OPTIONS -# * _F_app_dir: the name of the rox applet +# * _F_rox_appname - name of the rox app to install (mandatory) +# * _F_rox_subdir - used to divide rox apps into group dirs (optional) +# * _F_rox_lib - set to 1 if installing a rox library (optional) +# * _F_rox_updatename - used to finetune the default up2date (optional) +# * _F_rox_updateext - used to finetune the default up2date (optional) +# * _F_rox_seperator - use if you have an unusual directory path to the appdir (optional) ### -[ -z "$_F_app_dir" ] && Fdie +[ -z "$_F_rox_appname" ] && Fdie +[ -z "$_F_rox_lib" ] && _F_rox_lib=0 +[ -z "$_F_rox_subdir" ] && _F_rox_subdir= +[ -z "$_F_rox_updatename" ] && _F_rox_updatename=$pkgname +[ -z "$_F_rox_updateext" ] && _F_rox_updateext=.tar.bz2 +[ -z "$_F_rox_seperator" ] && _F_rox_seperator=- +if [ "$_F_rox_lib" -eq 1 ]; then + _F_rox_installpath=/usr/lib/ +else + _F_rox_installpath=/usr/share/Apps/ +fi +_F_rox_installpath="$_F_rox_installpath$_F_rox_subdir" ### # == OVERWRITTEN VARIABLES -# * options +# * url +# * up2date +# * source +# * archs ### -options=('nobuild') + +archs=('i686' 'x86_64') +url="http://roscidus.com/desktop/software" +up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=7023' | grep $_F_rox_updatename | head -n1 | sed 's|$_F_rox_updateext.*$||' | sed 's|^.*-||'" +source=(http://downloads.sourceforge.net/rox/$pkgname$_F_rox_seperator$pkgver$_F_rox_updateext) ### # == PROVIDED FUNCTIONS -# * Froxbuild() +# * Frox_compile() +# * Frox_mkdir() +# * Frox_setup() +# * Frox_install() +# * Frox_cleanup() +# * Fbuild_rox() ### -Froxbuild() + +Frox_compile() +{ + if [ -d $Fsrcdir/$_F_rox_appdir/src ]; then + ./AppRun --compile CC="gcc $CFLAGS" || Fdie + fi +} + +Frox_mkdir() { - Fcd $_F_app_dir - if [ -d src ] ; then ./AppRun --compile || Fdie ; fi - if [ -f libdir ] ; then Fsed '/usr/apps' '/usr/share/Apps' libdir ; fi - Fmkdir /usr/{bin,share/{Apps,doc}} - Fcpr $_F_app_dir /usr/share/Apps/ - [ -d $Fdestdir/usr/share/Apps/$_F_app_dir/src ] && \ - Frm /usr/share/Apps/$_F_app_dir/src - [ -f $Fdestdir/usr/share/Apps/$_F_app_dir/.cvsignore ] && \ - Frm /usr/share/Apps/$_F_app_dir/.cvsignore - Fln /usr/share/Apps/$F_appdir/Help /usr/share/doc/$pkgname-$pkgver - if [ -f $Fsrcdir/$pkgname ] ; then - Fexe /usr/bin/$pkgname + [ "$_F_rox_lib" -eq 0 ] && Fmkdir /usr/bin + Fmkdir $_F_rox_fullpath /usr/share/doc +} + +Frox_setup() +{ + if [ ! -d "$Fsrcdir/$_F_rox_appname" ]; then + if [ -d "$Fsrcdir/$pkgname$_F_rox_seperator$pkgver/$_F_rox_appname" ]; then + _F_rox_appdir=$pkgname$_F_rox_seperator$pkgver/$_F_rox_appname + else + error "The appdir cannot be found." + Fdie + fi else - Fln /usr/share/Apps/$_F_app_dir/AppRun /usr/bin/$pkgname + _F_rox_appdir=$_F_rox_appname fi + Fcd $_F_rox_appdir + _F_rox_fullpath=$_F_rox_installpath/$_F_rox_appname +} + +Frox_install() +{ + Fcp $_F_rox_appdir $_F_rox_installpath + Fmv $_F_rox_fullpath/Help /usr/share/doc/$pkgname-$pkgver + Fln /usr/share/doc/$pkgname-$pkgver $_F_rox_fullpath/Help + + if [ "$_F_rox_lib" -eq 0 ]; then + if [ -f $Fsrcdir/$pkgname ]; then + Fexe /usr/bin/$pkgname + fi + fi +} + +Frox_cleanup() +{ + [ -d $Fdestdir/$_F_rox_fullpath/src ] && Frm $_F_rox_fullpath/src + [ -d $Fdestdir/$_F_rox_fullpath/build ] && Frm $_F_rox_fullpath/build + [ -f $Fdestdir/$_F_rox_fullpath/.cvsignore ] && Frm $_F_rox_fullpath/.cvsignore + [ -f $Fdestdir/$_F_rox_fullpath/.gitignore ] && Frm $_F_rox_fullpath/.gitignore +} + +Fbuild_rox() +{ + Frox_setup + Frox_compile + Frox_mkdir + Frox_install + Frox_cleanup + Fmessage "Entering final preparation phase..." } ### -# * build() just calls Froxbuild() +# * build() simply calls Fbuild_rox() ### + build() { - Froxbuild + Fbuild_rox } From ryuo at frugalware.org Tue Jun 17 19:19:41 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 19:19:42 2008 Subject: [Frugalware-git] rox: rox.sh Message-ID: <20080617171941.203861190A3E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=16a9b13de5a62dd7f03c4a62b698793732dc36dd commit 16a9b13de5a62dd7f03c4a62b698793732dc36dd Author: James Buren Date: Tue Jun 17 12:19:43 2008 -0500 rox.sh * redesigned url for automatic generation diff --git a/source/include/rox.sh b/source/include/rox.sh index b6731a9..5d229ad 100644 --- a/source/include/rox.sh +++ b/source/include/rox.sh @@ -58,11 +58,9 @@ _F_rox_installpath="$_F_rox_installpath$_F_rox_subdir" # * source # * archs ### - -archs=('i686' 'x86_64') -url="http://roscidus.com/desktop/software" -up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=7023' | grep $_F_rox_updatename | head -n1 | sed 's|$_F_rox_updateext.*$||' | sed 's|^.*-||'" -source=(http://downloads.sourceforge.net/rox/$pkgname$_F_rox_seperator$pkgver$_F_rox_updateext) +_F_rox_index_page="http://roscidus.com/desktop/software" +A=`lynx -dump '$_F_rox_index_page' | grep "$_F_rox_appname --" | sed -n '1p' | sed 's|.*\[\(.*\)].*|\1|'` +url=`lynx -dump '$_F_rox_index_page' | grep ' $A. ' | sed 's|^.* ||'` ### # == PROVIDED FUNCTIONS From devil505linux at gmail.com Tue Jun 17 19:26:27 2008 From: devil505linux at gmail.com (Devil505) Date: Tue Jun 17 19:26:28 2008 Subject: [Frugalware-git] frugalware-current: playonlinux-3.0.4-1-i686 Message-ID: <20080617172627.693071190A3E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d48c04e0615cd3c80d49da42bc3a9b3471872359 commit d48c04e0615cd3c80d49da42bc3a9b3471872359 Author: Devil505 Date: Tue Jun 17 19:26:02 2008 +0200 playonlinux-3.0.4-1-i686 * version bump diff --git a/source/xapps-extra/playonlinux/FrugalBuild b/source/xapps-extra/playonlinux/FrugalBuild index 2bc5f9c..d2005fd 100644 --- a/source/xapps-extra/playonlinux/FrugalBuild +++ b/source/xapps-extra/playonlinux/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=playonlinux -pkgver=3.0.3 +pkgver=3.0.4 pkgrel=1 pkgdesc="GUI for managing Windows and DOS programs under linux" url="http://www.playonlinux.com" @@ -15,7 +15,7 @@ Fpkgversep="_" _F_cd_path="$pkgname" up2date="lynx -dump $url/en/download-generic.html | Flasttar" source=(http://www.playonlinux.com/script_files/$_F_archive_name/$pkgver/PlayOnLinux_$pkgver.tar.gz) -sha1sums=('9222db93bcfbf8405d5f42006a4bb75ecf2e19c0') +sha1sums=('769a002cc77aa668f4b0a6652f734db048d9fdf7') build() { From priyank at frugalware.org Tue Jun 17 19:32:50 2008 From: priyank at frugalware.org (Priyank) Date: Tue Jun 17 19:32:52 2008 Subject: [Frugalware-git] frugalware-current: compiz-emerald-0.7.6-1-i686 Message-ID: <20080617173251.037DD1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d16e964baa93baa9cf0fff0736173a249a14d8f2 commit d16e964baa93baa9cf0fff0736173a249a14d8f2 Author: Priyank Date: Tue Jun 17 23:00:01 2008 +0530 compiz-emerald-0.7.6-1-i686 * Version bump diff --git a/source/x11-extra/compiz-emerald/FrugalBuild b/source/x11-extra/compiz-emerald/FrugalBuild index f1bc1cb..24d7f44 100644 --- a/source/x11-extra/compiz-emerald/FrugalBuild +++ b/source/x11-extra/compiz-emerald/FrugalBuild @@ -4,9 +4,9 @@ pkgname=compiz-emerald _F_compiz_name=emerald Finclude compiz -pkgrel=2 +pkgrel=1 pkgdesc="Emerald window decorator for Compiz Fusion" -depends=('libxrender' 'compiz>=0.7.4' 'gtk+2' 'libwnck') +depends=('libxrender' 'compiz>=0.7.6' 'gtk+2' 'libwnck') makedepends=('perl-xml-parser') replaces=('emerald' 'heliodor') groups=('x11-extra') @@ -14,6 +14,6 @@ archs=('i686' 'x86_64') _F_gnome_iconcache="y" Finclude gnome-scriptlet _F_cd_path="$_F_compiz_name-$pkgver" -sha1sums=('a591ca207531323b57aa5dc86a066d2893f06e83') +sha1sums=('87bf469c71814bda89322872df893ac518cd381f') # optimization OK From priyank at frugalware.org Tue Jun 17 19:38:25 2008 From: priyank at frugalware.org (Priyank) Date: Tue Jun 17 19:38:26 2008 Subject: [Frugalware-git] frugalware-current: compizconfig-python-0.7.6-1-i686 Message-ID: <20080617173825.05F961778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e5be4ab4fb9fd711492ad3506b893cf78f96e5c9 commit e5be4ab4fb9fd711492ad3506b893cf78f96e5c9 Author: Priyank Date: Tue Jun 17 23:06:34 2008 +0530 compizconfig-python-0.7.6-1-i686 * Version bump diff --git a/source/xlib-extra/compizconfig-python/FrugalBuild b/source/xlib-extra/compizconfig-python/FrugalBuild index 42f6be7..f833c32 100644 --- a/source/xlib-extra/compizconfig-python/FrugalBuild +++ b/source/xlib-extra/compizconfig-python/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Priyank Gosalia pkgname=compizconfig-python -pkgrel=1 Finclude compiz +pkgrel=1 pkgdesc="Python bindings for libcompizconfig" -depends=('python' 'pkgconfig' 'pyrex' 'libcompizconfig>=0.7.4') +depends=('python' 'pkgconfig' 'pyrex' 'libcompizconfig>=0.7.6') groups=('xlib-extra') archs=('i686' 'x86_64') -sha1sums=('eff8c4dd28fbf66c05794bcf13c2b74606ea37f4') +sha1sums=('1a08d421511d93a9eb2614e92b3842a6712a3f23') # optimization OK From ryuo at frugalware.org Tue Jun 17 19:38:30 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 19:38:32 2008 Subject: [Frugalware-git] rox: rox.sh Message-ID: <20080617173830.DB6DD1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=b690fb217285438c5dc757501c73f48014c2bd62 commit b690fb217285438c5dc757501c73f48014c2bd62 Author: James Buren Date: Tue Jun 17 12:38:29 2008 -0500 rox.sh * add nodocs * removed library variable and replaced with * autodetection diff --git a/source/include/rox.sh b/source/include/rox.sh index 5d229ad..c949c45 100644 --- a/source/include/rox.sh +++ b/source/include/rox.sh @@ -32,19 +32,17 @@ # == OPTIONS # * _F_rox_appname - name of the rox app to install (mandatory) # * _F_rox_subdir - used to divide rox apps into group dirs (optional) -# * _F_rox_lib - set to 1 if installing a rox library (optional) # * _F_rox_updatename - used to finetune the default up2date (optional) # * _F_rox_updateext - used to finetune the default up2date (optional) # * _F_rox_seperator - use if you have an unusual directory path to the appdir (optional) ### [ -z "$_F_rox_appname" ] && Fdie -[ -z "$_F_rox_lib" ] && _F_rox_lib=0 [ -z "$_F_rox_subdir" ] && _F_rox_subdir= [ -z "$_F_rox_updatename" ] && _F_rox_updatename=$pkgname [ -z "$_F_rox_updateext" ] && _F_rox_updateext=.tar.bz2 [ -z "$_F_rox_seperator" ] && _F_rox_seperator=- -if [ "$_F_rox_lib" -eq 1 ]; then +if [ "`echo $pkgname | grep 'lib'`" != "" ]; then _F_rox_installpath=/usr/lib/ else _F_rox_installpath=/usr/share/Apps/ @@ -61,6 +59,8 @@ _F_rox_installpath="$_F_rox_installpath$_F_rox_subdir" _F_rox_index_page="http://roscidus.com/desktop/software" A=`lynx -dump '$_F_rox_index_page' | grep "$_F_rox_appname --" | sed -n '1p' | sed 's|.*\[\(.*\)].*|\1|'` url=`lynx -dump '$_F_rox_index_page' | grep ' $A. ' | sed 's|^.* ||'` +# disable nodocs since we already handle that +options=(${options[@]} 'nodocs') ### # == PROVIDED FUNCTIONS From ryuo at frugalware.org Tue Jun 17 19:56:48 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 19:56:49 2008 Subject: [Frugalware-git] rox: rox.sh Message-ID: <20080617175648.284C91778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=23f278e61e968d6c8b1128f4ad1f9c488f5998ed commit 23f278e61e968d6c8b1128f4ad1f9c488f5998ed Author: James Buren Date: Tue Jun 17 12:56:49 2008 -0500 rox.sh * if sourceforge is detected as source location, * utilize sourceforge.sh automatically diff --git a/source/include/rox.sh b/source/include/rox.sh index c949c45..5580997 100644 --- a/source/include/rox.sh +++ b/source/include/rox.sh @@ -58,9 +58,16 @@ _F_rox_installpath="$_F_rox_installpath$_F_rox_subdir" ### _F_rox_index_page="http://roscidus.com/desktop/software" A=`lynx -dump '$_F_rox_index_page' | grep "$_F_rox_appname --" | sed -n '1p' | sed 's|.*\[\(.*\)].*|\1|'` -url=`lynx -dump '$_F_rox_index_page' | grep ' $A. ' | sed 's|^.* ||'` +url2=`lynx -dump '$_F_rox_index_page' | grep ' $A. ' | sed 's|^.* ||'` +if [ "`lynx -dump '$url2' | grep 'sourceforge'`" != "" ]; then + _F_sourceforge_dirname=rox + Finclude sourceforge +fi +url=$url2 # disable nodocs since we already handle that options=(${options[@]} 'nodocs') +unset A +unset url2 ### # == PROVIDED FUNCTIONS From priyank at frugalware.org Tue Jun 17 20:03:45 2008 From: priyank at frugalware.org (Priyank) Date: Tue Jun 17 20:03:46 2008 Subject: [Frugalware-git] frugalware-current: ccsm-0.7.6-1-i686 Message-ID: <20080617180345.A5C151778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=86b12c3a8748af1a0a25f3f58fdc381fff11c923 commit 86b12c3a8748af1a0a25f3f58fdc381fff11c923 Author: Priyank Date: Tue Jun 17 23:31:02 2008 +0530 ccsm-0.7.6-1-i686 * Version bump * Added intltool to makedepends() diff --git a/source/gnome-extra/ccsm/FrugalBuild b/source/gnome-extra/ccsm/FrugalBuild index 7398ef4..91c3bbb 100644 --- a/source/gnome-extra/ccsm/FrugalBuild +++ b/source/gnome-extra/ccsm/FrugalBuild @@ -2,16 +2,17 @@ # Maintainer: Priyank Gosalia pkgname=ccsm -pkgrel=1 Finclude compiz +pkgrel=1 pkgdesc="CompizConfig settings manager" -rodepends=('pygtk' 'compizconfig-python>=0.7.4') +makedepends=('intltool') +rodepends=('pygtk' 'compizconfig-python>=0.7.6') groups=('gnome-extra') replaces=('gset-compiz') archs=('i686' 'x86_64') _F_gnome_iconcache=y Finclude gnome-scriptlet -sha1sums=('4db10e6a7da0c0d5bb2982dda2697f3a6588a670') +sha1sums=('4e13a23854fad54ee285b280603c2ba90976a2db') build() { From ryuo at frugalware.org Tue Jun 17 20:13:17 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 20:13:18 2008 Subject: [Frugalware-git] rox: rox.sh Message-ID: <20080617181317.6A1A51778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=9daed2c0195f0c3270c38663efbb69798683b0d5 commit 9daed2c0195f0c3270c38663efbb69798683b0d5 Author: James Buren Date: Tue Jun 17 13:13:20 2008 -0500 rox.sh * cleaned up the variables, removing * the up2date variables diff --git a/source/include/rox.sh b/source/include/rox.sh index 5580997..6b39ff8 100644 --- a/source/include/rox.sh +++ b/source/include/rox.sh @@ -30,17 +30,15 @@ # -------------------------------------------------- # # == OPTIONS -# * _F_rox_appname - name of the rox app to install (mandatory) -# * _F_rox_subdir - used to divide rox apps into group dirs (optional) -# * _F_rox_updatename - used to finetune the default up2date (optional) -# * _F_rox_updateext - used to finetune the default up2date (optional) -# * _F_rox_seperator - use if you have an unusual directory path to the appdir (optional) +# * _F_rox_appname - real name of the rox app, defaults to $pkgname +# * _F_rox_subdir - used to install the rox app to a subdir of the install +# path +# * _F_rox_seperator - used to change the seperator between version and +# $_F_rox_appname, if applicable. ### -[ -z "$_F_rox_appname" ] && Fdie +[ -z "$_F_rox_appname" ] && _F_rox_appname=$pkgname [ -z "$_F_rox_subdir" ] && _F_rox_subdir= -[ -z "$_F_rox_updatename" ] && _F_rox_updatename=$pkgname -[ -z "$_F_rox_updateext" ] && _F_rox_updateext=.tar.bz2 [ -z "$_F_rox_seperator" ] && _F_rox_seperator=- if [ "`echo $pkgname | grep 'lib'`" != "" ]; then _F_rox_installpath=/usr/lib/ @@ -54,7 +52,7 @@ _F_rox_installpath="$_F_rox_installpath$_F_rox_subdir" # * url # * up2date # * source -# * archs +# * options ### _F_rox_index_page="http://roscidus.com/desktop/software" A=`lynx -dump '$_F_rox_index_page' | grep "$_F_rox_appname --" | sed -n '1p' | sed 's|.*\[\(.*\)].*|\1|'` From priyank at frugalware.org Tue Jun 17 20:14:38 2008 From: priyank at frugalware.org (Priyank) Date: Tue Jun 17 20:14:40 2008 Subject: [Frugalware-git] frugalware-current: pcmanfm-0.4.3-1-i686 Message-ID: <20080617181438.68B3B1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9d274d3b391745fe2e90456c1118ce2466189f3f commit 9d274d3b391745fe2e90456c1118ce2466189f3f Author: Priyank Date: Tue Jun 17 23:42:39 2008 +0530 pcmanfm-0.4.3-1-i686 * Version bump diff --git a/source/xapps-extra/pcmanfm/FrugalBuild b/source/xapps-extra/pcmanfm/FrugalBuild index cc9b749..cb7fc5b 100644 --- a/source/xapps-extra/pcmanfm/FrugalBuild +++ b/source/xapps-extra/pcmanfm/FrugalBuild @@ -2,20 +2,18 @@ # Maintainer: Priyank Gosalia pkgname=pcmanfm -pkgver=0.4.1.1 +pkgver=0.4.3 pkgrel=1 pkgdesc="Extremely fast and lightweight file manager." -depends=('gtk+2' 'gamin' 'expat' 'startup-notification' 'hal>=0.5.7.1-3' 'dbus-glib>=0.71') +depends=('gtk+2' 'gamin' 'expat' 'startup-notification' 'hal>=0.5.11' 'dbus-glib>=0.71') groups=('xapps-extra') options=('scriptlet') archs=('i686' 'x86_64') -options=('nostrip') _F_gnome_mime="y" _F_gnome_desktop="y" Finclude gnome-scriptlet Finclude sourceforge up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=156956|grep -m1 tar.gz|sed 's/.*fm-\(.*\).tar.gz .*/\1/' | sed 's/-//'" -sha1sums=('2ade544287c457b98f03d7bb94fc3eb03646a961') -Fconfopts="${Fconfopts[@]} --enable-debug" +sha1sums=('c1e03c50475646720ab16658ced5e9c589859743') # optimization OK From devil505linux at gmail.com Tue Jun 17 20:15:03 2008 From: devil505linux at gmail.com (Devil505) Date: Tue Jun 17 20:15:06 2008 Subject: [Frugalware-git] frugalware-current: gnome-video-arcade-0.6.2-1-i686 Message-ID: <20080617181503.510001778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=32447a92cea7dd5b095cf65070bf9b10c60a4e66 commit 32447a92cea7dd5b095cf65070bf9b10c60a4e66 Author: Devil505 Date: Tue Jun 17 20:14:34 2008 +0200 gnome-video-arcade-0.6.2-1-i686 * version bump diff --git a/source/gnome-extra/gnome-video-arcade/FrugalBuild b/source/gnome-extra/gnome-video-arcade/FrugalBuild index af448f7..df9d4be 100644 --- a/source/gnome-extra/gnome-video-arcade/FrugalBuild +++ b/source/gnome-extra/gnome-video-arcade/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Devil505 pkgname=gnome-video-arcade -pkgver=0.6.1.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="GNOME Video Arcade is a simple xmame front-end for the GNOME Desktop Environment" _F_sourceforge_dirname="gva" Finclude sourceforge -depends=('libglade' 'libgnomeui' 'libsm' 'popt' 'gnome-vfs' 'esd' 'pango' 'gail' 'libart_lgpl' 'atk' 'freetype2' 'libxau' 'libxdmcp' 'sqlite3' 'libjpeg' 'openssl' 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' 'libxcursor' 'xmame') -makedepends=('perl-xml-parser' 'gnome-doc-utils') +depends=('libglade' 'libgnomeui' 'libsm' 'popt' 'gnome-vfs' 'esd' 'pango' 'gail' 'libart_lgpl' 'atk' 'freetype2' 'libxau' 'libxdmcp' 'sqlite3' 'libjpeg' 'openssl' 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' 'libxcursor' 'libwnck' 'xmame') +makedepends=('perl-xml-parser' 'gnome-doc-utils' 'intltool') options=('scriptlet') _F_gnome_schemas=('/etc/gconf/schemas/gnome-video-arcade.schemas') _F_gnome_desktop="y" @@ -16,6 +16,6 @@ _F_gnome_iconcache="y" Finclude gnome-scriptlet groups=('gnome-extra') archs=('i686' 'x86_64') -sha1sums=('19a230d2d2f4ca4c553fb647bc6037b471a0c755') +sha1sums=('6193506b7031c832115320734df732159b7b147e') # optimization OK From priyank at frugalware.org Tue Jun 17 20:31:10 2008 From: priyank at frugalware.org (Priyank) Date: Tue Jun 17 20:31:12 2008 Subject: [Frugalware-git] frugalware-current: phex-3.2.2.104-1-i686 Message-ID: <20080617183110.F35531778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e4436f997cd61b0206cc275bfd900ad16f21a8e2 commit e4436f997cd61b0206cc275bfd900ad16f21a8e2 Author: Priyank Date: Tue Jun 17 23:51:47 2008 +0530 phex-3.2.2.104-1-i686 * Version bump diff --git a/source/xapps-extra/phex/FrugalBuild b/source/xapps-extra/phex/FrugalBuild index 360dbf9..df2e2ef 100644 --- a/source/xapps-extra/phex/FrugalBuild +++ b/source/xapps-extra/phex/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=phex -pkgver=3.2.0.102 +pkgver=3.2.2.104 pkgrel=1 pkgdesc="Phex is a p2p filesharing program running on gnutella network." license="GPL" @@ -17,7 +17,7 @@ source=(${source/$pkgname-/${pkgname}_} phex.png) _F_desktop_name="Phex filesharing client" _F_desktop_categories="Network;" _F_desktop_icon="phex.png" -sha1sums=('cf9a8d3edc09640ad757c5ab8b58b068ddb4bf63' \ +sha1sums=('0da28d0a4a3cbe4897e2c567f539eee328492faf' \ 'c57651f5ebf9be53638f7bb76a5bccb24dcd8b09') build() From ryuo at frugalware.org Tue Jun 17 21:45:38 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 21:45:40 2008 Subject: [Frugalware-git] rox: rox.sh Message-ID: <20080617194538.8E73D1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=90069f4bbe5b9eb3cd0a16c31cfcb4f78c9a9ec7 commit 90069f4bbe5b9eb3cd0a16c31cfcb4f78c9a9ec7 Author: James Buren Date: Tue Jun 17 14:45:37 2008 -0500 rox.sh * further revisions diff --git a/source/include/rox.sh b/source/include/rox.sh index 6b39ff8..f34a192 100644 --- a/source/include/rox.sh +++ b/source/include/rox.sh @@ -2,7 +2,7 @@ ### # = rox.sh(3) -# Marcus Habermehl +# James Buren # # == NAME # rox.sh - for Frugalware @@ -50,9 +50,9 @@ _F_rox_installpath="$_F_rox_installpath$_F_rox_subdir" ### # == OVERWRITTEN VARIABLES # * url -# * up2date -# * source -# * options +# * up2date (only for sourceforge) +# * source (only for sourceforge) +# * options (nodocs appended) ### _F_rox_index_page="http://roscidus.com/desktop/software" A=`lynx -dump '$_F_rox_index_page' | grep "$_F_rox_appname --" | sed -n '1p' | sed 's|.*\[\(.*\)].*|\1|'` @@ -62,7 +62,6 @@ if [ "`lynx -dump '$url2' | grep 'sourceforge'`" != "" ]; then Finclude sourceforge fi url=$url2 -# disable nodocs since we already handle that options=(${options[@]} 'nodocs') unset A unset url2 @@ -79,14 +78,13 @@ unset url2 Frox_compile() { - if [ -d $Fsrcdir/$_F_rox_appdir/src ]; then + if [ -d $Fsrcdir/$_F_rox_appdir/src ]; then ./AppRun --compile CC="gcc $CFLAGS" || Fdie fi } Frox_mkdir() { - [ "$_F_rox_lib" -eq 0 ] && Fmkdir /usr/bin Fmkdir $_F_rox_fullpath /usr/share/doc } @@ -103,7 +101,7 @@ Frox_setup() _F_rox_appdir=$_F_rox_appname fi Fcd $_F_rox_appdir - _F_rox_fullpath=$_F_rox_installpath/$_F_rox_appname + _F_rox_installpath="$_F_rox_installpath$_F_rox_appname" } Frox_install() @@ -111,12 +109,7 @@ Frox_install() Fcp $_F_rox_appdir $_F_rox_installpath Fmv $_F_rox_fullpath/Help /usr/share/doc/$pkgname-$pkgver Fln /usr/share/doc/$pkgname-$pkgver $_F_rox_fullpath/Help - - if [ "$_F_rox_lib" -eq 0 ]; then - if [ -f $Fsrcdir/$pkgname ]; then - Fexe /usr/bin/$pkgname - fi - fi + Fdirschmod $_F_rox_installpath +r } Frox_cleanup() @@ -125,6 +118,11 @@ Frox_cleanup() [ -d $Fdestdir/$_F_rox_fullpath/build ] && Frm $_F_rox_fullpath/build [ -f $Fdestdir/$_F_rox_fullpath/.cvsignore ] && Frm $_F_rox_fullpath/.cvsignore [ -f $Fdestdir/$_F_rox_fullpath/.gitignore ] && Frm $_F_rox_fullpath/.gitignore + if [ -f $Fdestdir/$_F_rox_fullpath/.DirIcon ]; then + if [ "`file .DirIcon | grep SVG`" != "" ]; then + rodepends=(${rodepends[@]} 'librsvg') + fi + fi } Fbuild_rox() @@ -134,7 +132,6 @@ Fbuild_rox() Frox_mkdir Frox_install Frox_cleanup - Fmessage "Entering final preparation phase..." } ### From bouleetbil at frogdev.info Tue Jun 17 21:46:30 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jun 17 21:46:32 2008 Subject: [Frugalware-git] frugalware-current: sbackup-0.10.5-1-i686 Message-ID: <20080617194630.9A2E61778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0788cc4f0f8b7cb282787aaf538532ccfc393bb4 commit 0788cc4f0f8b7cb282787aaf538532ccfc393bb4 Author: bouleetbil Date: Tue Jun 17 21:35:08 2008 +0200 sbackup-0.10.5-1-i686 *version bump diff --git a/source/xapps-extra/sbackup/FrugalBuild b/source/xapps-extra/sbackup/FrugalBuild index d35f260..be35eb2 100644 --- a/source/xapps-extra/sbackup/FrugalBuild +++ b/source/xapps-extra/sbackup/FrugalBuild @@ -1,24 +1,22 @@ -# Compiling Time: 0.05 SBU +# Compiling Time: 0 SBU # Maintainer: bouleetbil pkgname=sbackup -pkgver=1.0 -pkgrel=2 +pkgver=0.10.5 +pkgrel=1 pkgdesc="SBackup is a simple backup solution intended for desktop use" depends=('notify-python' 'fuse' 'libglade') rodepends=('dcron') -makedepends=('gettext' 'intltool' 'gnome-doc-utils') options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') _F_sourceforge_sep="_" _F_sourceforge_broken_up2date="1" Finclude sourceforge -sha1sums=('599c49c19b3ae74b21baea6ccf7884743a4e8d58') +sha1sums=('8956e900580d73c4d31ef0a116090455030f3235') -build(){ - cd sbackupPort || Fdie - sed -i '/crontab/,/fi/d' configure.ac - Fautoreconf - Fbuild +build() { + Fcd + Fsed "su-to-root -X -c" "gksu" *.desktop + Fmakeinstall DESTDIR=$Fdestdir/usr } From boobaa at frugalware.org Tue Jun 17 22:13:27 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Tue Jun 17 22:13:28 2008 Subject: [Frugalware-git] frugalware-current: man-pages-3.00-1-i686 Message-ID: <20080617201327.30D031778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ad48a2270a123e6188c06e41b0ff7c1ac9f24b8a commit ad48a2270a123e6188c06e41b0ff7c1ac9f24b8a Author: CSCSY Lszl Date: Tue Jun 17 22:13:17 2008 +0200 man-pages-3.00-1-i686 version bump diff --git a/source/apps/man-pages/FrugalBuild b/source/apps/man-pages/FrugalBuild index 7d279f4..437f6a5 100644 --- a/source/apps/man-pages/FrugalBuild +++ b/source/apps/man-pages/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=man-pages -pkgver=2.80 +pkgver=3.00 pkgrel=1 pkgdesc="Man pages are online documentation for Linux" url="http://www.win.tue.nl/~aeb/linux/man" @@ -41,4 +41,4 @@ build() Frm /usr/share/man/man4/mouse.4 } -sha1sums=('8efb6478e017250641593440ee26b0ee6c233d7a') +sha1sums=('5dc5959bca6ed2ba7ea83ece20df503bfa0778cf') From ryuo at frugalware.org Tue Jun 17 22:13:35 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 22:13:37 2008 Subject: [Frugalware-git] rox: rox.sh Message-ID: <20080617201335.7DAC11778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=86445b0f52562b3e68ac2ef2eec17b6068cdbeef commit 86445b0f52562b3e68ac2ef2eec17b6068cdbeef Author: James Buren Date: Tue Jun 17 15:13:34 2008 -0500 rox.sh * more revisions diff --git a/source/include/rox.sh b/source/include/rox.sh index f34a192..74237a5 100644 --- a/source/include/rox.sh +++ b/source/include/rox.sh @@ -25,22 +25,22 @@ # groups=('rox-extra') # archs=('i686') # depends=('libgtop' 'rox-clib') -# _F_rox_appname="Load" +# _F_rox_name="Load" # Finclude rox # -------------------------------------------------- # # == OPTIONS -# * _F_rox_appname - real name of the rox app, defaults to $pkgname +# * _F_rox_name - real name of the rox app, defaults to $pkgname # * _F_rox_subdir - used to install the rox app to a subdir of the install # path -# * _F_rox_seperator - used to change the seperator between version and -# $_F_rox_appname, if applicable. +# * _F_rox_sep - used to change the seperator between version and +# $_F_rox_name, if applicable. ### -[ -z "$_F_rox_appname" ] && _F_rox_appname=$pkgname +[ -z "$_F_rox_name" ] && _F_rox_name=$pkgname [ -z "$_F_rox_subdir" ] && _F_rox_subdir= -[ -z "$_F_rox_seperator" ] && _F_rox_seperator=- -if [ "`echo $pkgname | grep 'lib'`" != "" ]; then +[ -z "$_F_rox_sep" ] && _F_rox_sep=- +if echo $pkgname | grep -q lib; then _F_rox_installpath=/usr/lib/ else _F_rox_installpath=/usr/share/Apps/ @@ -55,9 +55,9 @@ _F_rox_installpath="$_F_rox_installpath$_F_rox_subdir" # * options (nodocs appended) ### _F_rox_index_page="http://roscidus.com/desktop/software" -A=`lynx -dump '$_F_rox_index_page' | grep "$_F_rox_appname --" | sed -n '1p' | sed 's|.*\[\(.*\)].*|\1|'` -url2=`lynx -dump '$_F_rox_index_page' | grep ' $A. ' | sed 's|^.* ||'` -if [ "`lynx -dump '$url2' | grep 'sourceforge'`" != "" ]; then +A=`lynx -dump "$_F_rox_index_page" | grep "$_F_rox_name --" | sed -n '1p' | sed 's|.*\[\(.*\)].*|\1|'` +url2=`lynx -dump "$_F_rox_index_page" | grep ' $A. ' | sed 's|^.* ||'` +if lynx -dump "$url2" | grep -q sourceforge.net; then _F_sourceforge_dirname=rox Finclude sourceforge fi @@ -90,18 +90,18 @@ Frox_mkdir() Frox_setup() { - if [ ! -d "$Fsrcdir/$_F_rox_appname" ]; then - if [ -d "$Fsrcdir/$pkgname$_F_rox_seperator$pkgver/$_F_rox_appname" ]; then - _F_rox_appdir=$pkgname$_F_rox_seperator$pkgver/$_F_rox_appname + if [ ! -d "$Fsrcdir/$_F_rox_name" ]; then + if [ -d "$Fsrcdir/$pkgname$_F_rox_sep$pkgver/$_F_rox_name" ]; then + _F_rox_appdir=$pkgname$_F_rox_sep$pkgver/$_F_rox_name else error "The appdir cannot be found." Fdie fi else - _F_rox_appdir=$_F_rox_appname + _F_rox_appdir=$_F_rox_name fi Fcd $_F_rox_appdir - _F_rox_installpath="$_F_rox_installpath$_F_rox_appname" + _F_rox_installpath="$_F_rox_installpath$_F_rox_name" } Frox_install() @@ -119,7 +119,7 @@ Frox_cleanup() [ -f $Fdestdir/$_F_rox_fullpath/.cvsignore ] && Frm $_F_rox_fullpath/.cvsignore [ -f $Fdestdir/$_F_rox_fullpath/.gitignore ] && Frm $_F_rox_fullpath/.gitignore if [ -f $Fdestdir/$_F_rox_fullpath/.DirIcon ]; then - if [ "`file .DirIcon | grep SVG`" != "" ]; then + if file .DirIcon | grep -q SVG; then rodepends=(${rodepends[@]} 'librsvg') fi fi From ryuo at frugalware.org Tue Jun 17 22:18:47 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 22:18:48 2008 Subject: [Frugalware-git] rox: rox.sh Message-ID: <20080617201847.4E8D01778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=69c548d39c1f64547ba691c2f62f9cded53b471c commit 69c548d39c1f64547ba691c2f62f9cded53b471c Author: James Buren Date: Tue Jun 17 15:18:34 2008 -0500 rox.sh * added groups array diff --git a/source/include/rox.sh b/source/include/rox.sh index 74237a5..cb60922 100644 --- a/source/include/rox.sh +++ b/source/include/rox.sh @@ -63,6 +63,7 @@ if lynx -dump "$url2" | grep -q sourceforge.net; then fi url=$url2 options=(${options[@]} 'nodocs') +groups=('rox-extra') unset A unset url2 From ryuo at frugalware.org Tue Jun 17 22:26:18 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 22:26:20 2008 Subject: [Frugalware-git] rox: rox-extra Message-ID: <20080617202618.833001778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=d0a1e565ffd187ceb60626cb19305d26eaec2679 commit d0a1e565ffd187ceb60626cb19305d26eaec2679 Author: James Buren Date: Tue Jun 17 15:26:02 2008 -0500 rox-extra * cleaned out group for preparation of * a complete rebuild bottom to top diff --git a/source/rox-extra/battery/FrugalBuild b/source/rox-extra/battery/FrugalBuild deleted file mode 100644 index fed91c7..0000000 --- a/source/rox-extra/battery/FrugalBuild +++ /dev/null @@ -1,30 +0,0 @@ -# Compiling Time: ~0.03 SBU -# Maintainer: BMH1980 - -pkgname=battery -pkgver=0.1 -pkgrel=1 -pkgdesc="A simple ROX applet to monitor battery charge" -url="http://www.csai.unipa.it/peri/" -license="GPL2" -up2date="$pkgver" -source=($url/Battery/Battery.tgz) -groups=('rox-extra') -archs=('i686') -depends=('gtk+2' 'python') -options=('nobuild') -sha1sums=('6fa22f15ce8e7cc15a7313b9e773b5f4afd8a477') - - -build() -{ - Fmkdir /usr/share/Apps - Battery/AppRun --compile || return 1 - cp -rv Battery $Fdestdir/usr/share/Apps/ || return 1 - Fmv /usr/share/Apps/Battery/COPYING /usr/share/Apps/Battery/Help - Frm /usr/share/Apps/Battery/src - Fdoc Battery/COPYING Battery/Help/* -} - -# optimization OK - diff --git a/source/rox-extra/contacts/FrugalBuild b/source/rox-extra/contacts/FrugalBuild deleted file mode 100644 index 480ddc3..0000000 --- a/source/rox-extra/contacts/FrugalBuild +++ /dev/null @@ -1,31 +0,0 @@ -# Compiling Time: ~0.01 SBU -# Maintainer: BMH1980 - -pkgname=contacts -pkgver=0.8.3 -pkgrel=2 -pkgdesc="Contacts is a stand-alone address book application for the ROX Desktop." -url="http://roxos.sunsite.dk/dev-contrib/guido/Contacts/" -license="GPL2" -up2date="lynx -dump $url | grep Current | cut -d ' ' -f 7 | sed 's|.$||'" -source=($url/Contacts-$pkgver.tar.gz rox-contacts) -groups=('rox-extra') -archs=('i686') -depends=('pygtk' 'rox-lib') -options=('nobuild') -sha1sums=('7ac7ee8b18aff4868a0e361bc862f762fe75fdea' \ - '02848ca68cff2c980006c2606430307a4df5a74e') -build() -{ - Fmkdir /usr/bin /usr/share/Apps /usr/share/applications \ - /usr/share/pixmaps - cp -rv Contacts $Fdestdir/usr/share/Apps/ || return 1 - Fdoc Contacts/Help/* - Fmv /usr/share/Apps/Contacts/Contacts.desktop \ - /usr/share/applications/Contacts.desktop - Fcp /usr/share/Apps/Contacts/.DirIcon \ - /usr/share/pixmaps/rox-contacts.png - Fexe rox-contacts /usr/bin -} - - diff --git a/source/rox-extra/contacts/contacts.install b/source/rox-extra/contacts/contacts.install deleted file mode 100644 index 2143dcc..0000000 --- a/source/rox-extra/contacts/contacts.install +++ /dev/null @@ -1,26 +0,0 @@ -post_install() -{ - echo -n "updating desktop database..." - if update-desktop-database > /dev/null 2>&1 ; then - echo " done." - else - echo " failed." - fi -} - -post_upgrade() -{ - post_install -} - -post_remove() -{ - post_install -} - -op=$1 -shift - -$op $* - -# vim: ft=sh diff --git a/source/rox-extra/contacts/rox-contacts b/source/rox-extra/contacts/rox-contacts deleted file mode 100644 index 192b49a..0000000 --- a/source/rox-extra/contacts/rox-contacts +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/bash - -exec /usr/share/Apps/Contacts/AppRun diff --git a/source/rox-extra/file-shredder/FrugalBuild b/source/rox-extra/file-shredder/FrugalBuild deleted file mode 100644 index d6db854..0000000 --- a/source/rox-extra/file-shredder/FrugalBuild +++ /dev/null @@ -1,26 +0,0 @@ -# Compiling Time: ~0.02 SBU -# Maintainer: BMH1980 - -pkgname=file-shredder -pkgver=0.1 -pkgrel=1 -pkgdesc="File Shredder is a ROX wrapper for GNU shred." -url="http://gurno.com/adam/software/index.php#file_shredder" -license="GPL2" -up2date="lynx -dump $url | grep -m 1 file_shredder | cut -d '-' -f 2 | tr -d [[:blank:][:alpha:]] | sed 's|\.\.||'" -source=(http://gurno.com/adam/software/file_shredder-$pkgver.tar.gz) -groups=('rox-extra') -archs=('i686') -depends=('coreutils' 'python') -options=('nobuild') -sha1sums=('53796d76498f2ba85398896c478b90d241eb2dea') - -build() -{ - Fmkdir /usr/share/Apps /usr/share/doc/$pkgname-$pkgver - cp -rv File\ Shredder $Fdestdir/usr/share/Apps/ || return 1 - Frm /usr/share/Apps/File\ Shredder/.xvpics - cp -v File\ Shredder/Help/* $Fdestdir/usr/share/doc/$pkgname-$pkgver/ -} - - diff --git a/source/rox-extra/openuri/FrugalBuild b/source/rox-extra/openuri/FrugalBuild deleted file mode 100644 index d5385fe..0000000 --- a/source/rox-extra/openuri/FrugalBuild +++ /dev/null @@ -1,25 +0,0 @@ -# Compiling Time: ~0.00 SBU -# Maintainer: BMH1980 - -pkgname=openuri -pkgver=040110 -pkgrel=1 -pkgdesc="A little application for ROX that handles .uri files." -url="http://kymatica.bitminds.net/software.html" -license="GPL2" -options=('nobuild') -up2date="lynx -dump $url|grep -m 1 -o 'OpenURI-[0-9]\+'|grep -o '[0-9]\+'" -source=(http://kymatica.bitminds.net/rox/OpenURI-$pkgver.tar.bz2) -groups=('rox-extra') -archs=('i686') -depends=('python' 'rox-lib') -sha1sums=('4804c85768d72711783986e1f1baa772e7fef58a') - -build() -{ - Fmkdir /usr/share/Apps - cp -rv OpenURI $Fdestdir/usr/share/Apps/ || return 1 - Fdoc OpenURI/Help/* -} - - diff --git a/source/rox-extra/ripper/FrugalBuild b/source/rox-extra/ripper/FrugalBuild deleted file mode 100644 index 226f6ec..0000000 --- a/source/rox-extra/ripper/FrugalBuild +++ /dev/null @@ -1,30 +0,0 @@ -# Compiling Time: 0.01 SBU -# Contributor: Tuxbubling -# Maintainer: BMH1980 - -pkgname=ripper -pkgver=004 -pkgrel=1 -pkgdesc="A CD to MP3/OGG Ripper/Encoder for the ROX Desktop." -url="http://www.hayber.us/rox/Ripper/" -license="GPL2" -options=('nobuild') -depends=('rox-lib') -groups=('rox-extra') -archs=('i686') -up2date="lynx -dump http://www.hayber.us/rox/ripper/ | grep .tgz | sed -n '$ p' | sed 's/.*-\(.*\)\.t.*/\1/'" -source=(http://www.hayber.us/rox/ripper/Ripper-$pkgver.tgz) -sha1sums=('d08a0e982f5c61dcdd8511f37aca238c262f43a9') - -build() { - Fmkdir usr/share/Apps - cp -r Ripper $Fdestdir/usr/share/Apps/ - Fln /usr/share/Apps/Ripper/AppRun /usr/bin/rox-ripper - Fdoc Ripper/Help/* - Frm usr/share/Apps/Ripper/{tests,Help,.svn,Messages/.svn,messages.pot} - Fln /usr/share/doc/$pkgname-$pkgver/ usr/share/Apps/Ripper/Help -} - - - - diff --git a/source/rox-extra/rox-appfactory/FrugalBuild b/source/rox-extra/rox-appfactory/FrugalBuild deleted file mode 100644 index 505d709..0000000 --- a/source/rox-extra/rox-appfactory/FrugalBuild +++ /dev/null @@ -1,32 +0,0 @@ -# Compiling Time: 0.04 SBU -# Maintainer: BMH1980 - -pkgname=rox-appfactory -pkgver=2.1.5 -pkgrel=1 -pkgdesc="This program automates the creation of ROX wrappers for non-ROX programs." -url="http://www.kerofin.demon.co.uk/rox/appfactory.html" -license="GPL2" -options=('nobuild') -up2date="lynx -dump $url|grep 'AppFactory [0-9\.]\+[0-9]'|tail -n 1|cut -d ' ' -f 8" -source=(http://www.kerofin.demon.co.uk/rox/AppFactory-$pkgver.tar.gz) -sha1sums=('85bb4dce9c554737092c7fd667e60ee9f5e777ab') -groups=('rox-extra') -archs=('i686') -depends=('rox-clib' 'gtk+2') -replaces=('appfactory') - -build() -{ - Fcd "AppFactory" - ./AppRun --compile || Fdie - Fsed '/usr/apps' '/usr/share/Apps' libdir - Fmkdir /usr/share/{Apps,doc} - Fcpr AppFactory /usr/share/Apps/AppFactory - Frm /usr/share/Apps/AppFactory/{.cvsignore,src} - Fln /usr/share/Apps/AppFactory/Help /usr/share/doc/$pkgname-$pkgver -} - -# optimization OK - - diff --git a/source/rox-extra/rox-archive/FrugalBuild b/source/rox-extra/rox-archive/FrugalBuild deleted file mode 100644 index ad532a9..0000000 --- a/source/rox-extra/rox-archive/FrugalBuild +++ /dev/null @@ -1,37 +0,0 @@ -# Compiling Time: 0 SBU -# Maintainer: BMH1980 -# Contributor: Tuxbubling - -pkgname=rox-archive -pkgver=2.0 -pkgrel=3 -pkgdesc="Archive is a very easy to use program for creating and extracting file archives." -url="http://rox.sourceforge.net/phpwiki/index.php/Archive" -rodepends=('rox-lib') -groups=('rox-extra') -archs=('i686') -license="GPL2" -options=('nobuild') -up2date="lynx -dump http://rox.sourceforge.net/phpwiki/index.php/Archive | grep archive- | sed -ne 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=(http://dl.sourceforge.net/sourceforge/rox/archive-$pkgver.tgz \ - $pkgname-1.9.5-fw.patch $pkgname-2.0-lzma_support.patch $pkgname) -sha1sums=('cee34ddd89c808f410ea08632a504d4bf4c25720' \ - '9fffa91aab6b26f5d93b8f0bd28de3ef1f84e640' \ - '4e4cf6b62f441679e399e4a5d2980df2be130180' \ - '6fa07c67131c35f9532a79eef0cdbd590654686c') -replaces=('archive') - -build() -{ - Fmkdir /usr/share/{Apps,doc} - Fcd archive-$pkgver - Fpatchall - Fcpr archive-$pkgver/Archive /usr/share/Apps/Archive - Fexe /usr/bin/$pkgname - Frm /usr/share/Apps/Archive/tests - Fmv /usr/share/Apps/Archive/Help /usr/share/doc/$pkgname-$pkgver - Fln /usr/share/doc/$pkgname-$pkgver /usr/share/Apps/Archive/Help -} - - - diff --git a/source/rox-extra/rox-archive/rox-archive b/source/rox-extra/rox-archive/rox-archive deleted file mode 100644 index c570373..0000000 --- a/source/rox-extra/rox-archive/rox-archive +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env python - -import os, sys - -archive = os.path.abspath(sys.argv[1]) -os.chdir('/usr/share/Apps/Archive') -os.execv('./AppRun', (' ', archive)) diff --git a/source/rox-extra/rox-archive/rox-archive-1.9.5-fw.patch b/source/rox-extra/rox-archive/rox-archive-1.9.5-fw.patch deleted file mode 100644 index 6cedf44..0000000 --- a/source/rox-extra/rox-archive/rox-archive-1.9.5-fw.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -urN archive-1.9.5/Archive/formats.py archive-1.9.5_fw/Archive/formats.py ---- archive-1.9.5/Archive/formats.py 2005-04-17 17:29:31.000000000 +0200 -+++ archive-1.9.5_fw/Archive/formats.py 2005-08-25 17:29:10.000000000 +0200 -@@ -137,7 +137,7 @@ - tgz = Extract('tgz', "gunzip -c - | tar xf -") - tbz = Extract('tar.bz2', "bunzip2 -c - | tar xf -") - tarz = Extract('tar.Z', "uncompress -c - | tar xf -") --rar = Extract('rar', "rar x '%s'") -+rar = Extract('rar', "unrar x '%s'") - ace = Extract('ace', "unace x '%s'") - tar = Extract('tar', "tar xf -") - rpm = Extract('rpm', "rpm2cpio - | cpio -id --quiet") -@@ -267,12 +267,12 @@ - - # Compressed streams - if string(0, '\037\213'): -- if self.path.endswith('.tar.gz') or self.path.endswith('.tgz'): -+ if self.path.endswith('.tar.gz') or self.path.endswith('.tgz') or self.path.endswith('.fpm'): - return tgz - return gz - if string(0, 'BZh') or string(0, 'BZ'): - if self.path.endswith('.tar.bz') or self.path.endswith('.tar.bz2') or \ -- self.path.endswith('.tbz') or self.path.endswith('.tbz2'): -+ self.path.endswith('.tbz') or self.path.endswith('.tbz2') or self.path.endswith('.fpm'): - return tbz - return bz2 - if string(0, 'begin '): diff --git a/source/rox-extra/rox-archive/rox-archive-2.0-lzma_support.patch b/source/rox-extra/rox-archive/rox-archive-2.0-lzma_support.patch deleted file mode 100644 index 5d062d6..0000000 --- a/source/rox-extra/rox-archive/rox-archive-2.0-lzma_support.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -urN archive-2.0/Archive/formats.py archive-2.0_lzma/Archive/formats.py ---- archive-2.0/Archive/formats.py 2005-09-02 17:56:49.787788834 +0200 -+++ archive-2.0_lzma/Archive/formats.py 2005-09-02 17:57:14.805148743 +0200 -@@ -145,6 +145,8 @@ - deb = Extract('deb', "ar x '%s'") - zip = Extract('zip', "unzip -q '%s'") - jar = Extract('jar', "unzip -q '%s'") -+# tar.lzma extraction -+tlza = Extract('tar.lza', "lzma -d < '%s' | tar xf -") - - make_tgz = Archive('tgz', "tar cf - '%s' | gzip", 'application/x-compressed-tar') - Archive('tar.gz', "tar cf - '%s' | gzip", 'application/x-compressed-tar') -@@ -152,16 +154,22 @@ - Archive('zip', "zip -qr - '%s'", 'application/zip'), - Archive('jar', "zip -qr - '%s'", 'application/x-jar') - Archive('tar', "tar cf - '%s'", 'application/x-tar') -+# tar.lzma creation '-x -b64 -s25' is very good compression -+Archive('tar.lza', "tar cf - '%s' | lzma -x -b64 -s25", 'application/x-lzma-compressed-tar') - - # Note: these go afterwards so that .tar.gz matches before .gz - make_gz = Compress('gz', "gzip -c -", 'application/x-gzip') - Compress('bz2', "bzip2 -c -", 'application/x-bzip') - Compress('uue', "uuencode /dev/stdout", 'application/x-uuencoded') -+# '-x -b64 -s25' is very good compression -+Compress('lza', "lzma -x -b64 -s25", 'application/x-lzma') - - gz = Decompress('gz', "gunzip -c -") - bz2 = Decompress('bz2', "bunzip2 -ck -") - uue = Decompress('uue', "uudecode -o /dev/stdout") - z = Decompress('Z', "uncompress -c -") -+# lzma decompression -+lzma = Decompress('lzma', "lzma -d") - - - # Can bzip2 read bzip files? -@@ -281,6 +289,14 @@ - if self.path.endswith('.tar.Z'): - return tarz - return z -+ # Lzma archive checking. I don't know much in python, so feel free to send -+ # me better way to check (by reading first bytes of archive maybe) at: -+ # tuxbubling@tiscali.fr -+ if self.path.endswith('.tlzma') or self.path.endswith('.tar.lzma') or \ -+ self.path.endswith('.tlza') or self.path.endswith('.tar.lza'): -+ return tlza -+ if self.path.endswith('.lzma') or self.path.endswith('.lza'): -+ return lzma - - return make_gz - diff --git a/source/rox-extra/rox-clib/FrugalBuild b/source/rox-extra/rox-clib/FrugalBuild deleted file mode 100644 index 1cb98ef..0000000 --- a/source/rox-extra/rox-clib/FrugalBuild +++ /dev/null @@ -1,31 +0,0 @@ -# Compiling Time: 0.15 SBU -# Maintainer: BMH1980 - -pkgname=rox-clib -pkgver=2.1.8 -pkgrel=1 -pkgdesc="ROX-CLib is a library for C programs that are part of the ROX Desktop." -url="http://www.kerofin.demon.co.uk/rox/ROX-CLib.html" -license="GPL2" -options=('nobuild') -up2date="lynx -dump $url|grep 'ROX-CLib [0-9\.]\+[0-9]'|tail -n 1|cut -d ' ' -f 8" -source=(http://www.kerofin.demon.co.uk/rox/ROX-CLib-$pkgver.tar.gz) -sha1sums=('683ec3b9ed2fe8d17dfeb46a308ba75b84dc7bdb') -groups=('rox-extra') -archs=('i686') -depends=('gtk+2' 'expat' 'libxml2' 'python') - -build() -{ - Fcd ROX-CLib - Fsed "/usr/apps" "/usr/share/Apps" {Help/libdir.html,src/{libdir.sh,rox.c}} - ./AppRun --compile || Fdie - Fmkdir /usr/lib /usr/share/doc - Fcpr ROX-CLib /usr/lib - Fln /usr/lib/ROX-CLib/Help /usr/share/doc/$pkgname-$pkgver - Frm /usr/lib/ROX-CLib/{.cvsignore,Help/latex,src} -} - -# optimization OK - - diff --git a/source/rox-extra/rox-clock/FrugalBuild b/source/rox-extra/rox-clock/FrugalBuild deleted file mode 100644 index 23a3164..0000000 --- a/source/rox-extra/rox-clock/FrugalBuild +++ /dev/null @@ -1,33 +0,0 @@ -# Compiling Time: 0.04 SBU -# Maintainer: BMH1980 - -pkgname=rox-clock -pkgver=2.1.7 -pkgrel=1 -pkgdesc="This is a panel clock, with support for setting alarms." -url="http://www.kerofin.demon.co.uk/rox/clock.html" -license="GPL2" -options=('nobuild') -up2date="lynx -dump $url|grep 'Clock [0-9\.]\+[0-9]'|tail -n 1|cut -d ' ' -f 8" -source=(http://www.kerofin.demon.co.uk/rox/Clock-$pkgver.tar.gz $pkgname) -sha1sums=('fd41d4839077c4909535c736953e8484b216b343' \ - '5deb420851aaf0f8d82b6f8e06649527f7aad8e6') -groups=('rox-extra') -archs=('i686') -depends=('python' 'rox-clib') - -build() -{ - Fcd Clock - ./AppRun --compile || Fdie - Fmkdir /usr/bin /usr/share/{Apps,doc} - Fsed '/usr/apps' '/usr/share/Apps' libdir - Fcpr Clock /usr/share/Apps/ - Frm /usr/share/Apps/Clock/{.cvsignore,src} - Fln /usr/share/Apps/Clock/Help /usr/share/doc/$pkgname-$pkgver - Fexe /usr/bin/$pkgname -} - - - - diff --git a/source/rox-extra/rox-clock/rox-clock b/source/rox-extra/rox-clock/rox-clock deleted file mode 100644 index 801066f..0000000 --- a/source/rox-extra/rox-clock/rox-clock +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -cd /usr/share/Apps/Clock && exec ./AppRun "${@}" diff --git a/source/rox-extra/rox-diff/FrugalBuild b/source/rox-extra/rox-diff/FrugalBuild deleted file mode 100644 index 4b7c306..0000000 --- a/source/rox-extra/rox-diff/FrugalBuild +++ /dev/null @@ -1,22 +0,0 @@ -# Compiling Time: 0.04 SBU -# Maintainer: BMH1980 - -pkgname=rox-diff -pkgver=2.1.4 -pkgrel=1 -pkgdesc="This program displays a coloured context diff between two files." -url="http://www.kerofin.demon.co.uk/rox/diff.html" -license="GPL2" -up2date="lynx -dump $url|grep 'Diff [0-9\.]\+[0-9]'|tail -n 1|cut -d ' ' -f 8" -source=(http://www.kerofin.demon.co.uk/rox/Diff-$pkgver.tar.gz $pkgname) -sha1sums=('6024a85d131b4af0ada80dbf3d1d657ce830dc98' \ - '574d64dc45263541687ee69c4c2ddd5ce8f3081c') -groups=('rox-extra') -archs=('i686') -depends=('rox-clib') -_F_app_dir="Diff" -Finclude rox - -# optimization OK - - diff --git a/source/rox-extra/rox-diff/rox-diff b/source/rox-extra/rox-diff/rox-diff deleted file mode 100644 index e016f01..0000000 --- a/source/rox-extra/rox-diff/rox-diff +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -cd /usr/share/Apps/Diff && exec ./AppRun "${@}" diff --git a/source/rox-extra/rox-edit/FrugalBuild b/source/rox-extra/rox-edit/FrugalBuild deleted file mode 100644 index 825f895..0000000 --- a/source/rox-extra/rox-edit/FrugalBuild +++ /dev/null @@ -1,34 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: Tuxbubling - -pkgname=rox-edit -realname=`echo $pkgname | sed 's|rox-||'` -pkgver=2.0 -pkgrel=1 -pkgdesc="Edit is a simple text editor written in python." -url="http://rox.sourceforge.net/phpwiki/index.php/Edit" -depends=('rox-lib') -groups=('rox-extra') -archs=('i686') -up2date="lynx -dump http://rox.sourceforge.net/phpwiki/index.php/Edit | grep edit- | sed -ne 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=(http://dl.sourceforge.net/sourceforge/rox/$realname-$pkgver.tgz) -sha1sums=('28741374baa1c0e7b09cfde672071599255f69c2') -options=('nobuild') -replaces=('edit') - -build() { - Fmkdir usr/share/Apps - Fcd $realname-$pkgver - find Edit -name CVS -exec rm -rf {} \; - cp -r Edit $Fdestdir/usr/share/Apps/ - Fln /usr/share/Apps/Edit/AppRun /usr/bin/rox-edit - Frm usr/share/Apps/Edit/{tests,Help,.cvsignore} - for i in Edit/Help/* ; do - [ ! -d $i ] && Fdocrel $i - done - Fln /usr/share/doc/$pkgname-$pkgver/ usr/share/Apps/Edit/Help -} - - - - diff --git a/source/rox-extra/rox-filer/FrugalBuild b/source/rox-extra/rox-filer/FrugalBuild deleted file mode 100644 index 8598659..0000000 --- a/source/rox-extra/rox-filer/FrugalBuild +++ /dev/null @@ -1,69 +0,0 @@ -# Compiling Time: 0.2 SBU -# Maintainer: BMH1980 - -pkgname=rox-filer -pkgver=2.4.1 -pkgrel=1 -pkgdesc="ROX-Filer is a fast and powerful graphical file manager for the X Window System." -url="http://rox.sourceforge.net/" -license="GPL 2" -options=('nobuild') -install=$pkgname.install -up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=7023'|grep -m 1 -o 'rox-[0-9\.]\+\.tgz'|grep -o '[0-9\.]\+[0-9]'" -source=(http://dl.sourceforge.net/sourceforge/rox/rox-$pkgver.tgz \ - http://ftp.frugalware.org/pub/other/people/bmh1980/other/rox-open-with/rox-open-with.glade \ - http://ftp.frugalware.org/pub/other/people/bmh1980/other/rox-open-with/rox-open-with.py \ - rox rox.png rox-desktop rox.desktop mime) -sha1sums=('9e2fea71d1eb347200c23b28117651be7fccbcdc' \ - '777357e949b8a8c576920909ea9ba83f785be57d' \ - '4d3ba2bed91d3184ec7a18e574729e85bfd9d07c' \ - 'f43fb70b3c3d2d3025acc70485932dadb5c676c5' \ - 'c01046f1ff0c520f1f5cf7e877300e9d22b0bcb2' \ - '64ed044187a04716e7325fd4f52686a71976c32b' \ - '7b1a6dafe83f50a8e8cb0fad4c0dad0a0fedda37' \ - 'ca67a9ced66e5a1066b7c6a94361762bff7a2830') -groups=('rox-extra') -archs=('i686' 'x86_64') -depends=('pygtk' 'shared-mime-info>=0.16' 'libsm') -rodepends=('pyxdg') - -build() -{ - Fcd rox-$pkgver/ROX-Filer - - # Build and install the App dir for ROX-Filer - ./AppRun --compile || return 1 - cd .. || return 1 - Fmkdir /usr/share/{Apps,doc} - Fcpr rox-$pkgver/ROX-Filer /usr/share/Apps/ROX-Filer - Frm /usr/share/Apps/ROX-Filer/{build,src} - - # Installing documentation - Fmv /usr/share/Apps/ROX-Filer/Help /usr/share/doc/$pkgname-$pkgver - Fln /usr/share/doc/$pkgname-$pkgver /usr/share/Apps/ROX-Filer/Help - - # Installing MIME file - Ffilerel /usr/share/mime/packages/rox.xml - - # Installing man pages - Ffilerel /usr/man/man1/rox.1 - Fln /usr/man/man1/rox.1.gz /usr/man/man1/ROX-Filer.1.gz - - # Installing the rox-open-with system - Ffile /usr/share/Apps/ROX-Filer/rox-open-with.glade - Fexe rox-open-with.py /usr/bin/rox-open-with - for i in application audio image text video ; do - Fexe mime /etc/xdg/rox.sourceforge.net/MIME-types/$i - done - - # Installing extra files - Fexe /usr/bin/rox - Fln /usr/bin/rox /usr/bin/rox-filer - Fexe /usr/bin/rox-desktop - Ffile /usr/share/applications/rox.desktop - Ffile /usr/share/pixmaps/rox.png -} - -# optimization OK - - diff --git a/source/rox-extra/rox-filer/mime b/source/rox-extra/rox-filer/mime deleted file mode 100644 index 4c3971b..0000000 --- a/source/rox-extra/rox-filer/mime +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec rox-open-with "$@" diff --git a/source/rox-extra/rox-filer/rox b/source/rox-extra/rox-filer/rox deleted file mode 100644 index a835ae4..0000000 --- a/source/rox-extra/rox-filer/rox +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/bash - -exec /usr/share/Apps/ROX-Filer/AppRun "$@" diff --git a/source/rox-extra/rox-filer/rox-desktop b/source/rox-extra/rox-filer/rox-desktop deleted file mode 100644 index 27f1c17..0000000 --- a/source/rox-extra/rox-filer/rox-desktop +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/bash - -exec /usr/bin/rox-filer -S diff --git a/source/rox-extra/rox-filer/rox-filer.install b/source/rox-extra/rox-filer/rox-filer.install deleted file mode 100644 index 4b95534..0000000 --- a/source/rox-extra/rox-filer/rox-filer.install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() -{ - update-mime-database /usr/share/mime > /dev/null 2>&1 -} - -post_update() -{ - post_install -} - -post_remove() -{ - post_install -} - -op=$1 -shift - -$op $* - -# vim: ft=sh diff --git a/source/rox-extra/rox-filer/rox.desktop b/source/rox-extra/rox-filer/rox.desktop deleted file mode 100644 index 9e71730..0000000 --- a/source/rox-extra/rox-filer/rox.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Name=ROX-Filer -GenericName=File Manager -Comment=Fast and powerful graphical file manager -Icon=rox -Exec=rox -Terminal=false -MimeType=inode/directory -Categories=Application;FileManager -StartupNotify=true diff --git a/source/rox-extra/rox-filer/rox.png b/source/rox-extra/rox-filer/rox.png deleted file mode 100644 index 06cce06..0000000 Binary files a/source/rox-extra/rox-filer/rox.png and /dev/null differ diff --git a/source/rox-extra/rox-find/FrugalBuild b/source/rox-extra/rox-find/FrugalBuild deleted file mode 100644 index 71a0b17..0000000 --- a/source/rox-extra/rox-find/FrugalBuild +++ /dev/null @@ -1,30 +0,0 @@ -# Compiling Time: 0 SBU -# Maintainer: BMH1980 - -pkgname=rox-find -pkgver=007 -pkgrel=1 -pkgdesc="A Find in Files Utility for ROX." -url="http://www.hayber.us/rox/Find" -license="GPL2" -options=('nobuild') -up2date="lynx -dump $url|grep -o '[0-9]\+\.tgz'|sed 's|.tgz||'" -source=(http://www.hayber.us/rox/find/Find-$pkgver.tgz) -sha1sums=('3d3b88844659f115873eccad2a9930b90fdcb715') -groups=('rox-extra') -archs=('i686') -rodepends=('rox-lib') - -build() -{ - Fmkdir /usr/bin /usr/share/{Apps,doc} - Fcpr Find /usr/share/Apps/ - Fmv /usr/share/Apps/Find/Help /usr/share/doc/$pkgname-$pkgver - Fln /usr/share/doc/$pkgname-$pkgver /usr/share/Apps/Find/Help - Frm /usr/share/Apps/Find/messages.pot - Fln /usr/share/Apps/Find/AppRun /usr/bin/$pkgname -} - - - - diff --git a/source/rox-extra/rox-freefs/FrugalBuild b/source/rox-extra/rox-freefs/FrugalBuild deleted file mode 100644 index 8981901..0000000 --- a/source/rox-extra/rox-freefs/FrugalBuild +++ /dev/null @@ -1,35 +0,0 @@ -# Compiling Time: 0.02 SBU -# Maintainer: BMH1980 - -pkgname=rox-freefs -pkgver=2.1.6 -pkgrel=1 -pkgdesc="Monitor free space on a file system." -url="http://www.kerofin.demon.co.uk/rox/freefs.html" -license="GPL2" -up2date="lynx -dump $url|grep 'FreeFS [0-9\.]\+[0-9]'|tail -n 1|cut -d ' ' -f 8" -source=(http://www.kerofin.demon.co.uk/rox/FreeFS-$pkgver.tar.gz $pkgname) -sha1sums=('74a70516323f23ee3a4335b9b1ed2bebc5f9d809' \ - '7b53d2ae29b15fce7a66e6e3d19980086bc7e0b2') -groups=('rox-extra') -archs=('i686') -depends=('libgtop' 'rox-clib>=2.1.8') -options=('nofakeroot' 'nobuild') - -build() -{ - Fcd FreeFS - Fsed "/usr/apps" "/usr/share/Apps" libdir - [ $CHROOT -eq 1 ] && sudo touch /etc/fstab - ./AppRun --compile || Fdie - Fmkdir /usr/{bin,share/{Apps,doc}} - Fcpr FreeFS /usr/share/Apps/ - Fln /usr/share/Apps/FreeFS/Help /usr/share/doc/$pkgname-$pkgver - Frm /usr/share/Apps/FreeFS/{.cvsignore,src} - Fexe /usr/bin/$pkgname - [ $CHROOT -eq 1 ] && sudo rm /etc/fstab -} - -# optimization OK - - diff --git a/source/rox-extra/rox-freefs/rox-freefs b/source/rox-extra/rox-freefs/rox-freefs deleted file mode 100644 index aa01f67..0000000 --- a/source/rox-extra/rox-freefs/rox-freefs +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -cd /usr/share/Apps/FreeFS -exec /usr/share/Apps/FreeFS/AppRun "${@}" diff --git a/source/rox-extra/rox-lib/FrugalBuild b/source/rox-extra/rox-lib/FrugalBuild deleted file mode 100644 index cb6023d..0000000 --- a/source/rox-extra/rox-lib/FrugalBuild +++ /dev/null @@ -1,31 +0,0 @@ -# Compiling Time: ~0.02 SBU -# Maintainer: BMH1980 - -pkgname=rox-lib -pkgver=2.0.2 -pkgrel=1 -pkgdesc="ROX-Lib contains shared code which can be used by other ROX applications." -url="http://rox.sourceforge.net/" -license="LGPL2.1" -up2date="lynx -dump $url/phpwiki/index.php/ROX-Lib | grep Current | grep -o [0-9].*" -source=(http://dl.sourceforge.net/sourceforge/rox/$pkgname-$pkgver.tgz) -sha1sums=('89cc98a09b294d9756ae6bca80a5287fd053e1df') -options=('nobuild') -groups=('rox-extra') -archs=('i686') -depends=('pygtk') - -build() -{ - Fcd - ROX-Lib2/AppRun --compile || return 1 - Fmkdir /usr/lib/ /usr/share/doc - cp -rav ROX-Lib2 $Fdestdir/usr/lib/ || return 1 - Fmv /usr/lib/ROX-Lib2/Help /usr/share/doc/$pkgname-$pkgver - Fln /usr/share/doc/$pkgname-$pkgver /usr/lib/ROX-Lib2/Help - Frm /usr/lib/ROX-Lib2/tests -} - - - - diff --git a/source/rox-extra/rox-load/FrugalBuild b/source/rox-extra/rox-load/FrugalBuild deleted file mode 100644 index 083bbf6..0000000 --- a/source/rox-extra/rox-load/FrugalBuild +++ /dev/null @@ -1,22 +0,0 @@ -# Compiling Time: 0.06 SBU -# Maintainer: BMH1980 - -pkgname=rox-load -pkgver=2.1.4 -pkgrel=1 -pkgdesc="This applet displays the load average of your system." -url="http://www.kerofin.demon.co.uk/rox/load.html" -license="GPL2" -up2date="lynx -dump $url|grep 'Load [0-9\.]\+[0-9]'|tail -n 1|cut -d ' ' -f 8" -source=(http://www.kerofin.demon.co.uk/rox/Load-$pkgver.tar.gz $pkgname) -sha1sums=('1be4ef2394dbdebaab9ebf7240aae93ee3a13177' \ - 'b181a0765fb3323072aba1dfb4ac7abd6907c9fd') -groups=('rox-extra') -archs=('i686') -depends=('libgtop' 'rox-clib') -_F_app_dir="Load" -Finclude rox - -# optimization OK - - diff --git a/source/rox-extra/rox-load/rox-load b/source/rox-extra/rox-load/rox-load deleted file mode 100644 index b2630c0..0000000 --- a/source/rox-extra/rox-load/rox-load +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -cd /usr/share/Apps/Load && exec ./AppRun "${@}" diff --git a/source/rox-extra/rox-mail/FrugalBuild b/source/rox-extra/rox-mail/FrugalBuild deleted file mode 100644 index c89babd..0000000 --- a/source/rox-extra/rox-mail/FrugalBuild +++ /dev/null @@ -1,30 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: BMH1980 - -pkgname=rox-mail -pkgver=0.3.8 -pkgrel=1 -pkgdesc="This applet provides mail/no mail notification by its icon." -url="http://www.kerofin.demon.co.uk/rox/mail.html" -license="GPL2" -options=('nobuild') -up2date="lynx -dump $url | grep 'Mail [0-9].[0-9].[0-9]' | tail -n 1 | cut -d ' ' -f 8" -source=(http://www.kerofin.demon.co.uk/rox/Mail-$pkgver.tar.gz) -sha1sums=('a862dc2cc002b7a14f9a743cddf22a018195692b') -groups=('rox-extra') -archs=('i686') -depends=('python' 'rox-lib') -replaces=('mail') - -build() -{ - Fmkdir /usr/bin /usr/share/{Apps,doc} - cp -rv Mail $Fdestdir/usr/share/Apps/ || return 1 - Fmv /usr/share/Apps/Mail/Help /usr/share/doc/$pkgname-$pkgver - Fln /usr/share/doc/$pkgname-$pkgver /usr/share/Apps/Mail/Help - Fln /usr/share/Apps/Mail/AppRun /usr/bin/rox-mail -} - - - - diff --git a/source/rox-extra/rox-mem/FrugalBuild b/source/rox-extra/rox-mem/FrugalBuild deleted file mode 100644 index 38b2560..0000000 --- a/source/rox-extra/rox-mem/FrugalBuild +++ /dev/null @@ -1,22 +0,0 @@ -# Compiling Time: 0.05 SBU -# Maintainer: BMH1980 - -pkgname=rox-mem -pkgver=2.1.5 -pkgrel=1 -pkgdesc="This applet displays the current memory usage and the current swap space usage." -url="http://www.kerofin.demon.co.uk/rox/mem.html" -license="GPL2" -up2date="lynx -dump $url|grep -o 'Mem [0-9\.]\+'|tail -n 1|grep -o '[0-9\.]\+'" -source=(http://www.kerofin.demon.co.uk/rox/Mem-$pkgver.tar.gz $pkgname) -sha1sums=('d78608e02213fcad189f7f1cfc8713ccd96746d5' \ - '49ab944340590bc261465434dbca357dcc43edb5') -groups=('rox-extra') -archs=('i686') -depends=('libgtop' 'rox-clib') -_F_app_dir="Mem" -Finclude rox - -# optimization OK - - diff --git a/source/rox-extra/rox-mem/rox-mem b/source/rox-extra/rox-mem/rox-mem deleted file mode 100644 index 5e4d66d..0000000 --- a/source/rox-extra/rox-mem/rox-mem +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -cd /usr/share/Apps/Mem && exec ./AppRun "${@}" diff --git a/source/rox-extra/rox-menu-applet/FrugalBuild b/source/rox-extra/rox-menu-applet/FrugalBuild deleted file mode 100644 index bee090d..0000000 --- a/source/rox-extra/rox-menu-applet/FrugalBuild +++ /dev/null @@ -1,32 +0,0 @@ -# Compiling Time: 0 SBU -# Maintainer: BMH1980 - -pkgname=rox-menu-applet -pkgver=005 -pkgrel=1 -pkgdesc="A Menu applet for the ROX panel." -url="http://www.hayber.us/rox/Menu" -license="GPL2" -up2date="lynx -dump $url|grep -o '[0-9]\+\.tgz'|sed 's|.tgz||'" -source=(http://www.hayber.us/rox/applets/Menu-$pkgver.tgz) -sha1sums=('82fe1b17ed7dc9d4c2438dc1a37fccc5913ef7c8') -groups=('rox-extra') -archs=('i686') -rodepends=('rox-lib') -conflicts=('rox-menu') -options=('nobuild') - -build() -{ - Fmkdir /usr/bin /usr/share/{Apps,doc} - Fcpr Menu /usr/share/Apps/ - Fln /usr/share/Apps/Menu/AppRun /usr/bin/rox-menu - Fln /usr/share/Apps/Menu/AppRun /usr/bin/$pkgname - Fmv /usr/share/Apps/Menu/Help /usr/share/doc/$pkgname-$pkgver - Fln /usr/share/doc/$pkgname-$pkgver /usr/share/Apps/Menu/Help - Frm /usr/share/Apps/Menu/messages.pot -} - - - - diff --git a/source/rox-extra/rox-menu/FrugalBuild b/source/rox-extra/rox-menu/FrugalBuild deleted file mode 100644 index 3462efe..0000000 --- a/source/rox-extra/rox-menu/FrugalBuild +++ /dev/null @@ -1,35 +0,0 @@ -# Compiling Time: 0.11 SBU -# Maintainer: BMH1980 - -pkgname=rox-menu -pkgver=1.0.2 -pkgrel=2 -pkgdesc="ROX-Menu is an application menu for ROX." -url="http://www.skepticats.com/rox/rox-menu.html" -license="GPL2" -options=('nobuild') -up2date="lynx -dump http://www.skepticats.com/rox/rox-menu.html | grep -A 2 'Current Version' | tail -n 1 | cut -d ' ' -f 6" -source=(http://www.skepticats.com/rox/dist/ROX-Menu-$pkgver.tar.bz2 rox-menu_apps-path.diff) -sha1sums=('e8a6d73b86120a21b8842ac0d4e5a3dd82c43ac7' \ - 'ffb40c84708d06d371ab72bad016e4a49560e51d') -groups=('rox-extra') -archs=('i686') -depends=('gtk+2' 'libxml2' 'rox-clib') - -build() -{ - ln -s ROX-Menu $pkgname-$pkgver - chmod 0755 ROX-Menu ROX-Menu/Help ROX-Menu/Help/Icons - Fpatch rox-menu_apps-path.diff - cd .. - ROX-Menu/AppRun --compile || return 1 - Fmkdir /usr/share/{Apps,doc} - Frm ROX-Menu/{makedist.sh,src} ROX-Menu/Help/{mkappdir.sh,wrap-dir.sh} - Fcpr ROX-Menu /usr/share/Apps/ROX-Menu - Fmv /usr/share/Apps/ROX-Menu/Help /usr/share/doc/$pkgname-$pkgver - Fln /usr/share/doc/$pkgname-$pkgver /usr/share/Apps/ROX-Menu/Help -} - -# optimization OK - - diff --git a/source/rox-extra/rox-menu/rox-menu_apps-path.diff b/source/rox-extra/rox-menu/rox-menu_apps-path.diff deleted file mode 100644 index 3834a0d..0000000 --- a/source/rox-extra/rox-menu/rox-menu_apps-path.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ROX-Menu.orig/src/menu_applet.c ROX-Menu/src/menu_applet.c ---- ROX-Menu.orig/src/menu_applet.c 2005-06-04 13:31:53.000000000 +0200 -+++ ROX-Menu/src/menu_applet.c 2005-06-04 13:31:26.000000000 +0200 -@@ -324,7 +324,7 @@ - exit(1); - } - dest_dir = g_build_path(G_DIR_SEPARATOR_S, menu_dir_path, ("SystemApps"), NULL); -- ret = symlink("/usr/apps", dest_dir); -+ ret = symlink("/usr/share/Apps", dest_dir); - if (ret == 0) status = 0; - g_free(dest_dir); - dest_dir = g_build_path(G_DIR_SEPARATOR_S, menu_dir_path, ("LocalApps"), NULL); diff --git a/source/rox-extra/rox-mime-editor/FrugalBuild b/source/rox-extra/rox-mime-editor/FrugalBuild deleted file mode 100644 index fcd1a68..0000000 --- a/source/rox-extra/rox-mime-editor/FrugalBuild +++ /dev/null @@ -1,31 +0,0 @@ -# Compiling Time: 0 SBU -# Maintainer: Tuxbubling - -pkgname=rox-mime-editor -realname=`echo $pkgname | cut -d - -f 2,3` -pkgver=0.5 -pkgrel=1 -pkgdesc="Editor for the Shared MIME Database." -url="http://rox.sourceforge.net/phpwiki/index.php/MIME-Editor" -rodepends=('rox-lib' 'shared-mime-info') -groups=('rox-extra') -archs=('i686') -up2date="lynx -dump http://rox.sourceforge.net/phpwiki/index.php/MIME-Editor | grep mime-editor- | sed -ne 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=(http://dl.sourceforge.net/sourceforge/rox/$realname-$pkgver.tgz) -sha1sums=('1b17ef98f6aeda328db83a4ffd0fcbc481959696') -options=('nobuild') -replaces=('mime-editor') - -build() -{ - Fcd $realname-$pkgver - Fmkdir usr/share/{Apps,doc} - Fcpr $realname-$pkgver/MIME-Editor /usr/share/Apps/MIME-Editor - Fln /usr/share/Apps/MIME-Editor/AppRun /usr/bin/$pkgname - Fmv usr/share/Apps/MIME-Editor/Help /usr/share/doc/$pkgname-$pkgver - Fln /usr/share/doc/$pkgname-$pkgver/ usr/share/Apps/MIME-Editor/Help -} - - - - diff --git a/source/rox-extra/rox-miniclock/FrugalBuild b/source/rox-extra/rox-miniclock/FrugalBuild deleted file mode 100644 index b3c065f..0000000 --- a/source/rox-extra/rox-miniclock/FrugalBuild +++ /dev/null @@ -1,31 +0,0 @@ -# Compiling Time: 0 SBU -# Maintainer: BMH1980 - -pkgname=rox-miniclock -pkgver=2.0.0 -pkgrel=2 -pkgdesc="MiniClock is a rox application that displays a simple text clock." -url="http://pedonzolo.altervista.org/rox.html" -license="GPL 2" -options=('nobuild') -up2date="lynx -dump $url|grep -o '[0-9\.]\+\.tar\.gz'|sed 's/.tar.gz//'" -source=(http://pedonzolo.altervista.org/download/MiniClock-$pkgver.tar.gz) -sha1sums=('748f453dc310933eb945997b26d64a6ec00ba5db') -groups=('rox-extra') -archs=('i686') -rodepends=('rox-lib') -replaces=('miniclock') - -build() -{ - Fmkdir /usr/bin /usr/share/{Apps,doc} - Fcpr MiniClock /usr/share/Apps/ - Frm /usr/share/Apps/MiniClock/findrox.py~ - Fmv /usr/share/Apps/MiniClock/Help /usr/share/doc/$pkgname-$pkgver - Fln /usr/share/doc/$pkgname-$pkgver /usr/share/Apps/MiniClock/Help - Fln /usr/share/Apps/MiniClock/AppRun /usr/bin/$pkgname -} - - - - diff --git a/source/rox-extra/rox-netstat/FrugalBuild b/source/rox-extra/rox-netstat/FrugalBuild deleted file mode 100644 index 5a8b910..0000000 --- a/source/rox-extra/rox-netstat/FrugalBuild +++ /dev/null @@ -1,29 +0,0 @@ -# Compiling Time: ~0.01 SBU -# Maintainer: BMH1980 - -pkgname=rox-netstat -pkgver=0.1.1 -pkgrel=1 -pkgdesc="This applet displays the current network activity." -url="http://www.kerofin.demon.co.uk/rox/netstat.html" -up2date="lynx -dump $url | grep -o 'NetStat-[0-9\.]\+.tar.gz' | tail -n 1 | cut -d - -f 2 | sed 's|.tar.gz||'" -source=(http://www.kerofin.demon.co.uk/rox/NetStat-$pkgver.tar.gz) -sha1sums=('0372966be5c1a380cd6b70ff78557c3de434903b') -options=('nobuild') -groups=('rox-extra') -archs=('i686') -depends=('rox-lib') - -build() -{ - Fmkdir /usr/share/Apps/ - cp -r NetStat $Fdestdir/usr/share/Apps/ || return 1 - Fmkdir /usr/{bin,share/doc} - Fmv /usr/share/Apps/NetStat/Help /usr/share/doc/$pkgname-$pkgver - Fln /usr/share/doc/$pkgname-$pkgver /usr/share/Apps/NetStat/Help - Fln /usr/share/Apps/NetStat/AppRun /usr/bin/$pkgname -} - - - - diff --git a/source/rox-extra/rox-run/FrugalBuild b/source/rox-extra/rox-run/FrugalBuild deleted file mode 100644 index 346d30b..0000000 --- a/source/rox-extra/rox-run/FrugalBuild +++ /dev/null @@ -1,25 +0,0 @@ -# Compiling Time: ~0.00 SBU -# Maintainer: BMH1980 - -pkgname=rox-run -pkgver=1.3 -pkgrel=1 -pkgdesc="A simple dialog to allow you to fire off programs." -url="http://schelcj.avlug.org/rox/" -license="GPL2" -options=('nobuild') -up2date="$pkgver" -source=(http://schelcj.avlug.org/rox/ROX-Run.tar.bz2) -groups=('rox-extra') -archs=('i686') -depends=('python' 'rox-lib') -sha1sums=('47958b4ec28d7e2f9ce88e145f884010c2ed951f') - -build() -{ - Fmkdir /usr/share/Apps - cp -rv ROX-Run $Fdestdir/usr/share/Apps/ || return 1 - Fdoc ROX-Run/Help/* -} - - diff --git a/source/rox-extra/rox-session/FrugalBuild b/source/rox-extra/rox-session/FrugalBuild deleted file mode 100644 index 0185314..0000000 --- a/source/rox-extra/rox-session/FrugalBuild +++ /dev/null @@ -1,37 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: BMH1980 - -pkgname=rox-session -pkgver=0.28 -pkgrel=1 -pkgdesc="ROX-Session is a simple session manager. It loads, runs any programs you asked it to, and then quits when you run it a second time." -url="http://rox.sourceforge.net/desktop/ROX-Session" -license="GPL2" -options=('nobuild') -groups=('rox-extra') -archs=('i686') -up2date="lynx -dump $url|grep -A 1 'Current stable'|grep -o '[0-9\.]\+'|sed 's/0.26/0.26.0/'" -source=(rox.desktop rox-session xinitrc.rox - http://dl.sourceforge.net/sourceforge/rox/$pkgname-$pkgver.tar.bz2) -sha1sums=('d253acc9d8f6693f02dd3850aefbf809c76c60e7' \ - '27b0620c2ae6fe6eb9f85bd7b2ab1881cf8eef54' \ - 'ebaf28356fb99d072b59fa1b943141c12773298f' \ - '12cd08babc01b5de0d4893702efd04e1eda61ca8') -rodepends=('dbus' 'libxml2' 'rox-lib') - -build() -{ - Ffile /etc/X11/sessions/rox.desktop - Ffile /usr/share/apps/kdm/sessions/rox.desktop - Fsed "Application" "XSession" $Fdestdir/usr/share/apps/kdm/sessions/rox.desktop - Fexe /usr/sbin/rox-session - Fexe /etc/X11/xinit/xinitrc.rox - Fmkdir /usr/share/{Apps,doc} - Fcpr $pkgname-$pkgver/ROX-Session /usr/share/Apps/ - Fln /usr/share/Apps/ROX-Session/Help /usr/share/doc/$pkgname-$pkgver - Frm /usr/share/Apps/ROX-Session/tests -} - - - - diff --git a/source/rox-extra/rox-session/rox-session b/source/rox-extra/rox-session/rox-session deleted file mode 100644 index d176a82..0000000 --- a/source/rox-extra/rox-session/rox-session +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# This file was created by ROX-Session. - -if [ -d "$HOME/bin" ]; then - PATH="${HOME}/bin:${PATH}" - export PATH -fi - -# Step 1: Try to run ROX-Session. If it works, stop right here. - -if [ -x "`which 0launch`" ]; then - exec 0launch http://rox.sourceforge.net/2005/interfaces/ROX-Session -w -fi - -if [ -x "/usr/share/Apps/ROX-Session/AppRun" ]; then - exec "/usr/share/Apps/ROX-Session/AppRun" -w -fi - -# Step 2: It didn't work. Try to provide a failsafe login so the user -# can fix things. - -# Load a window manager. Keep trying until we find one that works! - -for wm in xfwm4 sawfish sawmill enlightenment wmaker icewm blackbox fluxbox \ - metacity kwin kwm fvwm2 fvwm 4Dwm twm; do - if [ -x "`which $wm`" ]; then break; fi; -done - -"$wm" & - -xmessage -file - << END -.xsession: failed to run /usr/share/Apps/ROX-Session/AppRun - maybe you moved or deleted it? - -I'll try to give you an xterm and a filer window instead - try to find -and run ROX-Session to fix the problem. Close the xterm to logout. - -If all else fails, delete your .xsession and .xinitrc files to get the -system defaults. - -Report any problems to: -http://rox.sourceforge.net/phpwiki/index.php/MailingLists - -Good luck! -END -rox & -exec xterm diff --git a/source/rox-extra/rox-session/rox.desktop b/source/rox-extra/rox-session/rox.desktop deleted file mode 100644 index f2b342a..0000000 --- a/source/rox-extra/rox-session/rox.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] - -Encoding=UTF-8 -Name=ROX -Comment=This session logs you into the ROX desktop -Exec=/usr/sbin/rox-session -Type=Application diff --git a/source/rox-extra/rox-session/xinitrc.rox b/source/rox-extra/rox-session/xinitrc.rox deleted file mode 100644 index f122b4f..0000000 --- a/source/rox-extra/rox-session/xinitrc.rox +++ /dev/null @@ -1,28 +0,0 @@ -#! /bin/sh -# $XConsortium: xinitrc.cpp,v 1.4.91/08/22 11:41:34 rws Exp $ - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=/usr/X11R6/lib/X11/xinit/.Xresources -sysmodmap=/usr/X11R6/lib/X11/xinit/.Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f $userresources ]; then - xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - xmodmap $usermodmap -fi - -# Start the window manager -/usr/sbin/rox-session diff --git a/source/rox-extra/rox-songer/FrugalBuild b/source/rox-extra/rox-songer/FrugalBuild deleted file mode 100644 index e53f0f3..0000000 --- a/source/rox-extra/rox-songer/FrugalBuild +++ /dev/null @@ -1,27 +0,0 @@ -# Compiling Time: 0 SBU -# Maintainer: BMH1980 - -pkgname=rox-songer -pkgver=0.1.2 -pkgrel=1 -pkgdesc="Songer is an ID3 tagger designed for the ROX desktop" -url="http://songer.sourceforge.net/" -license="GPL2" -options=('nobuild') -up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=82159'|grep -m 1 -o '[0-9\.]\+\.tgz'|sed 's/.tgz//'" -source=(http://dl.sourceforge.net/sourceforge/songer/songer-$pkgver.tgz) -sha1sums=('8e3dcbdfb7421488fdc3d6abb317d0c1eda77aa4') -groups=('rox-extra') -archs=('i686') -rodepends=('rox-lib') - -build() -{ - Fmkdir /usr/share/{Apps,doc} - Fcpr songer-$pkgver/Songer /usr/share/Apps - Fln /usr/share/Apps/Songer/Help /usr/share/doc/$pkgname-$pkgver -} - - - - diff --git a/source/rox-extra/rox-systemtray/FrugalBuild b/source/rox-extra/rox-systemtray/FrugalBuild deleted file mode 100644 index 538aa30..0000000 --- a/source/rox-extra/rox-systemtray/FrugalBuild +++ /dev/null @@ -1,33 +0,0 @@ -# Compiling Time: 0.03 SBU -# Maintainer: BMH1980 - -pkgname=rox-systemtray -pkgver=0.2 -pkgrel=2 -pkgdesc="SystemTray is a system tray applet for ROX-Filer." -url="http://home.comcast.net/~andyhanton/software/" -license="GPL2" -options=('nobuild') -up2date="lynx -dump $url | grep -m 1 released | cut -d ' ' -f 6" -source=($url/SystemTray-$pkgver.tgz rox_systemtray-rox_clib.diff) -sha1sums=('25656998767ffcce4b25d714888b1365da51f612' \ - '919b2f00ca8d52fbe2d605324dc8cb7f75f36a60') -groups=('rox-extra') -archs=('i686') -depends=('python' 'rox-clib') -replaces=('systemtray') - -build() -{ - patch -p0 -i rox_systemtray-rox_clib.diff || return 1 - SystemTray/AppRun --compile || return 1 - Fmkdir /usr/share/{Apps,doc} - Fcpr SystemTray /usr/share/Apps/SystemTray - Frm /usr/share/Apps/SystemTray/src - Fmv /usr/share/Apps/SystemTray/Help /usr/share/doc/$pkgname-$pkgver - Fln /usr/share/doc/$pkgname-$pkgver /usr/share/Apps/SystemTray/Help -} - -# optimization OK - - diff --git a/source/rox-extra/rox-systemtray/rox_systemtray-rox_clib.diff b/source/rox-extra/rox-systemtray/rox_systemtray-rox_clib.diff deleted file mode 100644 index 4906f83..0000000 --- a/source/rox-extra/rox-systemtray/rox_systemtray-rox_clib.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- SystemTray/src/main.c.orig 2005-12-21 12:22:13.000000000 +0100 -+++ SystemTray/src/main.c 2005-12-21 12:36:06.000000000 +0100 -@@ -160,12 +160,6 @@ - return gdk_handler(display, error); - } - --typedef struct applet_info { -- PanelLocation loc; -- int margin; --} AppletInfo; --AppletInfo *get_position(GtkWidget *plug); -- - #define SHORT_OPS "hv" - - #ifdef HAVE_GETOPT_LONG -@@ -231,7 +225,7 @@ - window_id = atol(argv[1]); - plug = gtk_plug_new(window_id); - -- info = get_position(plug); -+ info = rox_applet_get_position(plug); - if (info) - { - location = info->loc; diff --git a/source/rox-extra/rox-tail/FrugalBuild b/source/rox-extra/rox-tail/FrugalBuild deleted file mode 100644 index 73d56bf..0000000 --- a/source/rox-extra/rox-tail/FrugalBuild +++ /dev/null @@ -1,22 +0,0 @@ -# Compiling Time: 0.09 SBU -# Maintainer: BMH1980 - -pkgname=rox-tail -pkgver=2.1.4 -pkgrel=1 -pkgdesc="This program displays the contents of a text file." -url="http://www.kerofin.demon.co.uk/rox/tail.html" -license="GPL2" -up2date="lynx -dump $url|grep 'Tail [0-9\.]\+[0-9]'|tail -n 1|cut -d ' ' -f 8" -source=(http://www.kerofin.demon.co.uk/rox/Tail-$pkgver.tar.gz $pkgname) -sha1sums=('4f7056a2f596baf7d9b285630f322c38b40336b4' \ - '44d8f37451e77a90174af7a996d0baf93ed6887c') -groups=('rox-extra') -archs=('i686') -depends=('rox-clib') -_F_app_dir="Tail" -Finclude rox - -# optimization OK - - diff --git a/source/rox-extra/rox-tail/rox-tail b/source/rox-extra/rox-tail/rox-tail deleted file mode 100644 index 7981b6e..0000000 --- a/source/rox-extra/rox-tail/rox-tail +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -cd /usr/share/Apps/Tail && exec ./AppRun "${@}" diff --git a/source/rox-extra/rox-tasklist/FrugalBuild b/source/rox-extra/rox-tasklist/FrugalBuild deleted file mode 100644 index e37a9e5..0000000 --- a/source/rox-extra/rox-tasklist/FrugalBuild +++ /dev/null @@ -1,34 +0,0 @@ -# Compiling Time: 0.04 SBU -# Maintainer: BMH1980 - -pkgname=rox-tasklist -realname=`echo $pkgname | cut -d - -f 2` -pkgver=0.0.2 -pkgrel=2 -pkgdesc="A simple tasklist applet which can run in a ROX-Filer panel." -url="http://www.intersect-uk.co.uk/soft.rbx/Tasklist/" -license="GPL2" -options=('nobuild') -up2date="lynx -dump $url | grep Version | tr -d [[:blank:][:alpha:]]" -source=(http://www.intersect-uk.co.uk/projects/Tasklist/$realname-$pkgver.tar.bz2) -sha1sums=('4e259304c12833e227e8f2803680f9eec56e710b') -groups=('rox-extra') -archs=('i686') -depends=('libxml2' 'libwnck' 'python') - -build() -{ - Fcd $realname-$pkgver - TaskList/AppRun --compile || return 1 - Fmkdir /usr/share/{Apps,doc} - Fcpr $realname-$pkgver/TaskList /usr/share/Apps/TaskList - Frm /usr/share/Apps/TaskList/{debian,src} - Fmv /usr/share/Apps/TaskList/Help /usr/share/doc/$pkgname-$pkgver - Fln /usr/share/doc/$pkgname-$pkgver /usr/share/Apps/TaskList/Help -} - - - - - -# optimization OK diff --git a/source/rox-extra/rox-tasklist2/FrugalBuild b/source/rox-extra/rox-tasklist2/FrugalBuild deleted file mode 100644 index cb7487f..0000000 --- a/source/rox-extra/rox-tasklist2/FrugalBuild +++ /dev/null @@ -1,31 +0,0 @@ -# Compiling Time: 0.4 SBU -# Maintainer: BMH1980 - -pkgname=rox-tasklist2 -pkgver=0.5 -pkgrel=1 -pkgdesc="A panel applet that shows a list of currently open applications" -url="http://rox.sourceforge.net/desktop/Tasklist" -license="GPL2" -options=('nobuild') -up2date="lynx -dump $url|grep -A 1 'Current.*version'|grep -o '[0-9\.]\+'" -source=(http://sheen.fallingsnow.net/Software/Tasklist-$pkgver.tgz) -sha1sums=('3ca19b2b527576adc48e748c43d2f14ce78ef47e') -groups=('rox-extra') -archs=('i686') -depends=('libwnck' 'expat' 'libxml2') - -build() -{ - Fcd Tasklist-$pkgver - ./AppRun --compile || Fdie - cd .. || Fdie - Fmkdir /usr/share/{Apps,doc} - Fcpr Tasklist-$pkgver /usr/share/Apps - Fln /usr/share/Apps/Tasklist-$pkgver /usr/share/doc/$pkgname-$pkgver - Frm /usr/share/Apps/Tasklist-$pkgver/{Help/README~,src} -} - -# optimization OK - - diff --git a/source/rox-extra/rox-volume/FrugalBuild b/source/rox-extra/rox-volume/FrugalBuild deleted file mode 100644 index ba38a0f..0000000 --- a/source/rox-extra/rox-volume/FrugalBuild +++ /dev/null @@ -1,29 +0,0 @@ -# Compiling Time: 0 SBU -# Maintainer: BMH1980 - -pkgname=rox-volume -pkgver=008 -pkgrel=1 -pkgdesc="A ROX Volume control applet and Mixer" -url="http://www.hayber.us/rox/Volume" -license="GPL 2" -options=('nobuild') -up2date="lynx -dump $url|grep -o 'Volume [0-9]\+'|grep -o '[0-9]\+'" -source=(http://www.hayber.us/rox/applets/Volume-$pkgver.tgz) -sha1sums=('bd09fbce88aecd676fd61ecd600358f7a4045688') -groups=('rox-extra') -archs=('i686') -rodepends=('rox-lib' 'pyalsaaudio') - -build() -{ - Fmkdir /usr/share/{Apps,doc} - Fcpr Volume /usr/share/Apps/ - Fmv /usr/share/Apps/Volume/Help /usr/share/doc/$pkgname-$pkgver - Fln /usr/share/doc/$pkgname-$pkgver /usr/share/Apps/Volume/Help - Frm /usr/share/Apps/Volume/messages.pot -} - - - - diff --git a/source/rox-extra/rox-xdg-menu/FrugalBuild b/source/rox-extra/rox-xdg-menu/FrugalBuild deleted file mode 100644 index eb519c0..0000000 --- a/source/rox-extra/rox-xdg-menu/FrugalBuild +++ /dev/null @@ -1,32 +0,0 @@ -# Compiling Time: 0 SBU -# Maintainer: BMH1980 - -pkgname=rox-xdg-menu -pkgver=1.2 -pkgrel=1 -pkgdesc="XDG-Menu is a ROX panel applet that displays an applications menu button" -url="http://xdg-menu.sourceforge.net/" -license="GPL2" -options=('nobuild') -up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=149020'|grep -o -m 1 '[0-9\.]\+\.tgz'|sed 's/.tgz//'" -source=(http://dl.sourceforge.net/sourceforge/xdg-menu/XDG-Menu-$pkgver.tgz) -sha1sums=('cf399bb4345f8a96be0e8d641da42640727223ab') -groups=('rox-extra') -archs=('i686') -rodepends=('rox-filer' 'rox-lib' 'pyxdg') - -build() -{ - Fcd XDG-Menu - Fmake - cd .. || Fdie - Fmkdir /usr/{bin,share/{Apps,doc}} - Fcpr XDG-Menu /usr/share/Apps - Frm /usr/share/Apps/XDG-Menu/Makefile - Fln /usr/share/Apps/XDG-Menu/AppRun /usr/bin/$pkgname - Fln /usr/share/Apps/XDG-Menu/Help /usr/share/doc/$pkgname-$pkgver -} - - - - diff --git a/source/rox-extra/roxdao/FrugalBuild b/source/rox-extra/roxdao/FrugalBuild deleted file mode 100644 index a777cff..0000000 --- a/source/rox-extra/roxdao/FrugalBuild +++ /dev/null @@ -1,25 +0,0 @@ -# Compiling Time: ~0.01 SBU -# Maintainer: BMH1980 - -pkgname=roxdao -pkgver=0.3 -pkgrel=1 -pkgdesc="A graphical frontend to cdrdao for the ROX Desktop." -url="http://kymatica.com/index.php/Software" -license="GPL2" -options=('nobuild') -depends=('cdrdao' 'python' 'rox-lib') -groups=('rox-extra') -archs=('i686') -up2date="lynx -dump $url | grep -o 'RoxDAO-[0-9\.]\+'| grep -o -m 1 '[0-9\.]\+[0-9]\+'" -source=(http://kymatica.com/uploads/Software/RoxDAO-$pkgver.tar.bz2) -sha1sums=('232eb4a700ddf8f0e8265c7137f0ee882e74d305') - -build() -{ - Fmkdir /usr/share/Apps - cp -rv RoxDAO $Fdestdir/usr/share/Apps/ || return 1 - Fdoc RoxDAO/Help/* -} - - diff --git a/source/rox-extra/roxiso/FrugalBuild b/source/rox-extra/roxiso/FrugalBuild deleted file mode 100644 index c7be14a..0000000 --- a/source/rox-extra/roxiso/FrugalBuild +++ /dev/null @@ -1,25 +0,0 @@ -# Compiling Time: ~0.01 SBU -# Maintainer: BMH1980 - -pkgname=roxiso -pkgver=050508 -pkgrel=1 -pkgdesc="A graphical frontend to mkisofs and cdrecord." -url="http://kymatica.com/index.php/Software" -license="GPL2" -options=('nobuild') -depends=('cdrtools' 'python' 'rox-lib') -groups=('rox-extra') -archs=('i686') -up2date="lynx -dump $url | grep -m 1 -o 'RoxISO-[0-9]\+' | grep -o '[0-9]\+'" -source=(http://kymatica.com/uploads/Software/RoxISO-$pkgver.tar.bz2) -sha1sums=('a910283028c2feefa7550a03e50eeb18431003e0') - -build() -{ - Fmkdir /usr/share/Apps - cp -rv RoxISO $Fdestdir/usr/share/Apps/ || return 1 - Fdoc RoxISO/Help/* -} - - diff --git a/source/rox-extra/trashcan/FrugalBuild b/source/rox-extra/trashcan/FrugalBuild deleted file mode 100644 index 0af98a9..0000000 --- a/source/rox-extra/trashcan/FrugalBuild +++ /dev/null @@ -1,25 +0,0 @@ -# Compiling Time: ~0.01 SBU -# Maintainer: BMH1980 - -pkgname=trashcan -pkgver=031127 -pkgrel=1 -pkgdesc="Yet another simple ROX wrapper for libtrash." -url="http://kymatica.com/index.php/Software" -license="GPL2" -options=('nobuild') -depends=('libtrash' 'python' 'rox-lib') -groups=('rox-extra') -archs=('i686') -up2date="lynx -dump $url | grep -o 'TrashCan-[0-9]\+' | grep -o -m 1 '[0-9]\+'" -source=(http://kymatica.com/uploads/Software/TrashCan-$pkgver.tar.bz2) -sha1sums=('4a7fc798248cba2f9a6d04d7545c2e3feada6b3a') - -build() -{ - Fmkdir /usr/share/Apps - cp -rv TrashCan $Fdestdir/usr/share/Apps/ || return 1 - Fdoc TrashCan/Help/COPYING TrashCan/Help/README -} - - diff --git a/source/rox-extra/winlist/FrugalBuild b/source/rox-extra/winlist/FrugalBuild deleted file mode 100644 index c64f2bf..0000000 --- a/source/rox-extra/winlist/FrugalBuild +++ /dev/null @@ -1,25 +0,0 @@ -# Compiling Time: ~0.01 SBU -# Maintainer: BMH1980 - -pkgname=winlist -pkgver=006 -pkgrel=1 -pkgdesc="Panel applet for the ROX Desktop that gives you a popup menu of all open windows." -url="http://kymatica.bitminds.net/software.html" -license="GPL2" -options=('nobuild') -up2date="lynx -dump $url|grep -m 1 -o 'WinList-[0-9]\+'|grep -o '[0-9]\+'" -source=(http://kymatica.bitminds.net/rox/WinList-$pkgver.tar.bz2) -groups=('rox-extra') -archs=('i686') -depends=('python' 'rox-lib') -sha1sums=('66b22d1a157694759e681d0fe2e361a887184c47') - -build() -{ - Fmkdir /usr/share/Apps - cp -rv WinList $Fdestdir/usr/share/Apps/ || return 1 - Fdoc WinList/Help/* -} - - From boobaa at frugalware.org Tue Jun 17 22:38:16 2008 From: boobaa at frugalware.org (CSCSY Lszl) Date: Tue Jun 17 22:38:17 2008 Subject: [Frugalware-git] frugalware-current: drupal-image-5.x_1.9-1-i686 Message-ID: <20080617203816.D27431778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2f1f395a76b89095c526c92be6bcb730eb715d28 commit 2f1f395a76b89095c526c92be6bcb730eb715d28 Author: CSCSY Lszl Date: Tue Jun 17 22:37:58 2008 +0200 drupal-image-5.x_1.9-1-i686 version bump diff --git a/source/network-extra/drupal-image/FrugalBuild b/source/network-extra/drupal-image/FrugalBuild index 379a8a3..4641fa1 100644 --- a/source/network-extra/drupal-image/FrugalBuild +++ b/source/network-extra/drupal-image/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSCSY Lszl _F_drupal_module=image -pkgver=5.x_1.8 +pkgver=5.x_1.9 pkgrel=1 pkgdesc="Allow users with proper permissions to upload images into Drupal" Finclude drupal -sha1sums=('5b78524a46f6644133e88d14911f062a282166a7') +sha1sums=('9f478e143c7cbf12af74e3ed67e1090cbd480aaf') From ryuo at frugalware.org Tue Jun 17 22:39:43 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 22:39:44 2008 Subject: [Frugalware-git] rox: rox.sh Message-ID: <20080617203943.3117B1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=e2ad32fdfc0e75449bfa7e1117df2c0f371bc3c7 commit e2ad32fdfc0e75449bfa7e1117df2c0f371bc3c7 Author: James Buren Date: Tue Jun 17 15:39:46 2008 -0500 rox.sh * bug fix diff --git a/source/include/rox.sh b/source/include/rox.sh index cb60922..495e8d2 100644 --- a/source/include/rox.sh +++ b/source/include/rox.sh @@ -56,7 +56,7 @@ _F_rox_installpath="$_F_rox_installpath$_F_rox_subdir" ### _F_rox_index_page="http://roscidus.com/desktop/software" A=`lynx -dump "$_F_rox_index_page" | grep "$_F_rox_name --" | sed -n '1p' | sed 's|.*\[\(.*\)].*|\1|'` -url2=`lynx -dump "$_F_rox_index_page" | grep ' $A. ' | sed 's|^.* ||'` +url2=`lynx -dump "$_F_rox_index_page" | grep " $A. " | sed 's|^.* ||'` if lynx -dump "$url2" | grep -q sourceforge.net; then _F_sourceforge_dirname=rox Finclude sourceforge From ryuo at frugalware.org Tue Jun 17 22:48:35 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 22:48:37 2008 Subject: [Frugalware-git] rox: rox.sh Message-ID: <20080617204835.CA86C1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=9d8c4768c734e555dc157d0cfded89090091624f commit 9d8c4768c734e555dc157d0cfded89090091624f Author: James Buren Date: Tue Jun 17 15:48:36 2008 -0500 rox.sh * more bug fixes diff --git a/source/include/rox.sh b/source/include/rox.sh index 495e8d2..513ea39 100644 --- a/source/include/rox.sh +++ b/source/include/rox.sh @@ -64,8 +64,8 @@ fi url=$url2 options=(${options[@]} 'nodocs') groups=('rox-extra') -unset A -unset url2 +A= +url2= ### # == PROVIDED FUNCTIONS @@ -86,7 +86,7 @@ Frox_compile() Frox_mkdir() { - Fmkdir $_F_rox_fullpath /usr/share/doc + Fmkdir $_F_rox_installpath /usr/share/doc } Frox_setup() @@ -108,18 +108,18 @@ Frox_setup() Frox_install() { Fcp $_F_rox_appdir $_F_rox_installpath - Fmv $_F_rox_fullpath/Help /usr/share/doc/$pkgname-$pkgver - Fln /usr/share/doc/$pkgname-$pkgver $_F_rox_fullpath/Help + Fmv $_F_rox_installpath/Help /usr/share/doc/$pkgname-$pkgver + Fln /usr/share/doc/$pkgname-$pkgver $_F_rox_installpath/Help Fdirschmod $_F_rox_installpath +r } Frox_cleanup() { - [ -d $Fdestdir/$_F_rox_fullpath/src ] && Frm $_F_rox_fullpath/src - [ -d $Fdestdir/$_F_rox_fullpath/build ] && Frm $_F_rox_fullpath/build - [ -f $Fdestdir/$_F_rox_fullpath/.cvsignore ] && Frm $_F_rox_fullpath/.cvsignore - [ -f $Fdestdir/$_F_rox_fullpath/.gitignore ] && Frm $_F_rox_fullpath/.gitignore - if [ -f $Fdestdir/$_F_rox_fullpath/.DirIcon ]; then + [ -d $Fdestdir/$_F_rox_installpath/src ] && Frm $_F_rox_installpath/src + [ -d $Fdestdir/$_F_rox_installpath/build ] && Frm $_F_rox_installpath/build + [ -f $Fdestdir/$_F_rox_installpath/.cvsignore ] && Frm $_F_rox_installpath/.cvsignore + [ -f $Fdestdir/$_F_rox_installpath/.gitignore ] && Frm $_F_rox_installpath/.gitignore + if [ -f $Fdestdir/$_F_rox_installpath/.DirIcon ]; then if file .DirIcon | grep -q SVG; then rodepends=(${rodepends[@]} 'librsvg') fi From ryuo at frugalware.org Tue Jun 17 22:56:39 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 22:56:40 2008 Subject: [Frugalware-git] rox: rox.sh Message-ID: <20080617205639.944531778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=97d0a8478c02eb3ca08e55c133d7d250d3ac8fd4 commit 97d0a8478c02eb3ca08e55c133d7d250d3ac8fd4 Author: James Buren Date: Tue Jun 17 15:56:35 2008 -0500 rox.sh * even more bug fixes diff --git a/source/include/rox.sh b/source/include/rox.sh index 513ea39..97aa50d 100644 --- a/source/include/rox.sh +++ b/source/include/rox.sh @@ -107,7 +107,7 @@ Frox_setup() Frox_install() { - Fcp $_F_rox_appdir $_F_rox_installpath + Fcp $_F_rox_appdir `echo "$_F_rox_installpath" | sed 's|\(.*\)/.*|\1|'` Fmv $_F_rox_installpath/Help /usr/share/doc/$pkgname-$pkgver Fln /usr/share/doc/$pkgname-$pkgver $_F_rox_installpath/Help Fdirschmod $_F_rox_installpath +r From ryuo at frugalware.org Tue Jun 17 23:09:35 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 23:09:37 2008 Subject: [Frugalware-git] rox: rox-filer-2.8-1-i686 Message-ID: <20080617210935.35E061778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=f24dbdbb94678e9f5b225924d7843524a9bc9ddf commit f24dbdbb94678e9f5b225924d7843524a9bc9ddf Author: James Buren Date: Tue Jun 17 16:09:37 2008 -0500 rox-filer-2.8-1-i686 * initial redraft diff --git a/source/rox-extra/rox-filer/FrugalBuild b/source/rox-extra/rox-filer/FrugalBuild new file mode 100644 index 0000000..897fa92 --- /dev/null +++ b/source/rox-extra/rox-filer/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0.1 SBU +# Maintainer: James Buren + +pkgname=rox-filer +pkgver=2.8 +pkgrel=1 +pkgdesc="ROX-Filer is a fast and powerful graphical file manager." +_F_rox_name="ROX-Filer" +_F_sourceforge_ext=.tar.bz2 +options=('scriptlet') +Finclude rox +depends=('libglade' 'glibc' 'freetype2' 'libxau' 'libxdmcp' 'libice' 'libxdamage' 'libxext' 'shared-mime-info') +archs=('i686') +sha1sums=('7eec68a106a2605b2733025e44d890961b52ea1e') + +build() +{ + Fbuild_rox + Fman $pkgname-$pkgver/rox.1 +} + +# optimization OK From ryuo at frugalware.org Tue Jun 17 23:12:34 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 23:12:35 2008 Subject: [Frugalware-git] rox: rox-filer-2.8-1-i686 Message-ID: <20080617211234.5A1011778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=87668cac04b1208ad6e960b558efbd87091e73d8 commit 87668cac04b1208ad6e960b558efbd87091e73d8 Author: James Buren Date: Tue Jun 17 16:12:34 2008 -0500 rox-filer-2.8-1-i686 * groups fixup diff --git a/source/rox-extra/rox-filer/FrugalBuild b/source/rox-extra/rox-filer/FrugalBuild index 897fa92..ac71b7e 100644 --- a/source/rox-extra/rox-filer/FrugalBuild +++ b/source/rox-extra/rox-filer/FrugalBuild @@ -9,6 +9,7 @@ _F_rox_name="ROX-Filer" _F_sourceforge_ext=.tar.bz2 options=('scriptlet') Finclude rox +groups=(${groups[@]} 'rox-core') depends=('libglade' 'glibc' 'freetype2' 'libxau' 'libxdmcp' 'libice' 'libxdamage' 'libxext' 'shared-mime-info') archs=('i686') sha1sums=('7eec68a106a2605b2733025e44d890961b52ea1e') From bouleetbil at frogdev.info Tue Jun 17 23:20:06 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jun 17 23:20:09 2008 Subject: [Frugalware-git] frugalware-current: commons-lang-2.4-1-i686 Message-ID: <20080617212006.7A1041778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=13dade669548460d2dad2f3048772d6ad4ad8918 commit 13dade669548460d2dad2f3048772d6ad4ad8918 Author: bouleetbil Date: Tue Jun 17 23:10:08 2008 +0200 commons-lang-2.4-1-i686 *new package diff --git a/source/devel-extra/commons-lang/FrugalBuild b/source/devel-extra/commons-lang/FrugalBuild new file mode 100644 index 0000000..070c6e7 --- /dev/null +++ b/source/devel-extra/commons-lang/FrugalBuild @@ -0,0 +1,23 @@ +# Compiling Time: 0.03 SBU +# Maintainer: bouleetbil + +pkgname=commons-lang +pkgver=2.4 +pkgrel=1 +pkgdesc="The Lang Component provides a host of helper utilities for the java.lang API" +url="http://commons.apache.org/lang/" +Finclude java +groups=('devel-extra') +archs=('i686') +up2date="Flastarchive http://www.apache.org/dist/commons/lang/source/ -src.tar.gz" +source=(http://www.apache.org/dist/commons/lang/source/$pkgname-$pkgver-src.tar.gz) +sha1sums=('61ec8be8c2cf8f4c4272545666f936dd9f7e2a29') +_F_cd_path="$pkgname-$pkgver-src" + +build() { + Fcd + Fjavacleanup + Fant jar + mv dist/commons-lang{-$pkgver,}.jar || Fdie + Fjar dist/commons-lang.jar +} From ryuo at frugalware.org Tue Jun 17 23:36:53 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 23:36:56 2008 Subject: [Frugalware-git] rox: rox-lib-2.0.5-1-i686 Message-ID: <20080617213653.A645B1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=e1e6759f34d3fd656d3e89517f371030fc7f206f commit e1e6759f34d3fd656d3e89517f371030fc7f206f Author: James Buren Date: Tue Jun 17 16:34:48 2008 -0500 rox-lib-2.0.5-1-i686 * rebuild from scratch diff --git a/source/rox-extra/rox-lib/FrugalBuild b/source/rox-extra/rox-lib/FrugalBuild new file mode 100644 index 0000000..875a462 --- /dev/null +++ b/source/rox-extra/rox-lib/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=rox-lib +pkgver=2.0.5 +pkgrel=1 +pkgdesc="An essential library for ROX Desktop." +_F_rox_name="ROX-Lib" +_F_rox_sep=2- +_F_sourceforge_name=${pkgname}2 +_F_sourceforge_ext=.tar.bz2 +Finclude rox +_F_rox_name=${_F_rox_name}2 +rodepends=('rox-filer' 'pygtk') +groups=(${groups[@]} 'rox-core') +archs=('i686') +sha1sums=('62283301b4f2bb9fda5cafcd0785d4a8aa156914') From ryuo at frugalware.org Tue Jun 17 23:36:53 2008 From: ryuo at frugalware.org (James Buren) Date: Tue Jun 17 23:36:57 2008 Subject: [Frugalware-git] rox: rox.sh Message-ID: <20080617213653.CE92517880AD@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=14a04ff5222e5dd07fa27bc912038c64f2d5dde1 commit 14a04ff5222e5dd07fa27bc912038c64f2d5dde1 Author: James Buren Date: Tue Jun 17 16:36:45 2008 -0500 rox.sh * added a proper example diff --git a/source/include/rox.sh b/source/include/rox.sh index 97aa50d..90302dd 100644 --- a/source/include/rox.sh +++ b/source/include/rox.sh @@ -12,21 +12,20 @@ # # == EXAMPLE # -------------------------------------------------- -# pkgname=rox-load -# pkgver=2.1.4 +# pkgname=rox-lib +# pkgver=2.0.5 # pkgrel=1 -# pkgdesc="This applet displays the load average of your system." -# url="http://www.kerofin.demon.co.uk/rox/load.html" -# license="GPL2" -# up2date="lynx -dump $url|grep 'Load [0-9\.]\+[0-9]'|tail -n 1|cut -d ' ' -f 8" -# source=(http://www.kerofin.demon.co.uk/rox/Load-$pkgver.tar.gz $pkgname) -# sha1sums=('1be4ef2394dbdebaab9ebf7240aae93ee3a13177' \ -# 'b181a0765fb3323072aba1dfb4ac7abd6907c9fd') -# groups=('rox-extra') -# archs=('i686') -# depends=('libgtop' 'rox-clib') -# _F_rox_name="Load" +# pkgdesc="An essential library for ROX Desktop." +# _F_rox_name="ROX-Lib" +# _F_rox_sep=2- +# _F_sourceforge_name=${pkgname}2 +# _F_sourceforge_ext=.tar.bz2 # Finclude rox +# _F_rox_name=${_F_rox_name}2 +# rodepends=('rox-filer' 'pygtk') +# groups=(${groups[@]} 'rox-core') +# archs=('i686') +# sha1sums=('62283301b4f2bb9fda5cafcd0785d4a8aa156914') # -------------------------------------------------- # # == OPTIONS From bouleetbil at frogdev.info Tue Jun 17 23:51:13 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jun 17 23:51:16 2008 Subject: [Frugalware-git] frugalware-current: sbackup-0.10.5-1-i686 Message-ID: <20080617215113.EED271778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4ed3ebee23c34481692cea2be51817e324e78a9d commit 4ed3ebee23c34481692cea2be51817e324e78a9d Author: bouleetbil Date: Tue Jun 17 23:45:06 2008 +0200 sbackup-0.10.5-1-i686 *add unset MAKEFLAGS diff --git a/source/xapps-extra/sbackup/FrugalBuild b/source/xapps-extra/sbackup/FrugalBuild index be35eb2..a220bd2 100644 --- a/source/xapps-extra/sbackup/FrugalBuild +++ b/source/xapps-extra/sbackup/FrugalBuild @@ -16,6 +16,7 @@ Finclude sourceforge sha1sums=('8956e900580d73c4d31ef0a116090455030f3235') build() { + unset MAKEFLAGS Fcd Fsed "su-to-root -X -c" "gksu" *.desktop Fmakeinstall DESTDIR=$Fdestdir/usr From ryuo at frugalware.org Wed Jun 18 00:00:12 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 00:00:15 2008 Subject: [Frugalware-git] rox: rox-clib-2.1.10-1-i686 Message-ID: <20080617220012.B07E11778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=ba75e8ef741e44f0e3391e4e41069f4478bb4d2d commit ba75e8ef741e44f0e3391e4e41069f4478bb4d2d Author: James Buren Date: Tue Jun 17 17:00:13 2008 -0500 rox-clib-2.1.10-1-i686 * redraft from scratch diff --git a/source/rox-extra/rox-clib/FrugalBuild b/source/rox-extra/rox-clib/FrugalBuild new file mode 100644 index 0000000..0e0dd58 --- /dev/null +++ b/source/rox-extra/rox-clib/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0 SBU +# Maintainer: James Buren + +pkgname=rox-clib +pkgver=2.1.10 +pkgrel=1 +pkgdesc="Another essential library for ROX Desktop." +_F_rox_name=ROX-CLib +_F_sourceforge_name=$_F_rox_name +Finclude rox +rodepends=('rox-filer') +depends=('gtk+2' 'glibc' 'freetype2' 'libxau' 'libxdmcp' 'libxml2' 'libxdamage' 'libxext') +groups=(${groups[@]} 'rox-core') +archs=('i686') +sha1sums=('3d9ab2f134ac6dfca6a472df4c1e00048a961536') +unset MAKEFLAGS + +# optimization OK From ryuo at frugalware.org Wed Jun 18 00:28:10 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 00:28:12 2008 Subject: [Frugalware-git] rox: rox-clib-2.1.10-1-i686 Message-ID: <20080617222810.433231778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=e1ee6305b8a6e0f3f8ebe5a59ad9fabf14f3aeb8 commit e1ee6305b8a6e0f3f8ebe5a59ad9fabf14f3aeb8 Author: James Buren Date: Tue Jun 17 17:27:18 2008 -0500 rox-clib-2.1.10-1-i686 * updated SBU * added scriptlet diff --git a/source/rox-extra/rox-clib/FrugalBuild b/source/rox-extra/rox-clib/FrugalBuild index 0e0dd58..3e2e04c 100644 --- a/source/rox-extra/rox-clib/FrugalBuild +++ b/source/rox-extra/rox-clib/FrugalBuild @@ -1,4 +1,4 @@ -# Compiling Time: 0 SBU +# Compiling Time: 0.1 SBU # Maintainer: James Buren pkgname=rox-clib @@ -7,6 +7,7 @@ pkgrel=1 pkgdesc="Another essential library for ROX Desktop." _F_rox_name=ROX-CLib _F_sourceforge_name=$_F_rox_name +options=('scriptlet') Finclude rox rodepends=('rox-filer') depends=('gtk+2' 'glibc' 'freetype2' 'libxau' 'libxdmcp' 'libxml2' 'libxdamage' 'libxext') From ryuo at frugalware.org Wed Jun 18 01:25:04 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 01:25:06 2008 Subject: [Frugalware-git] rox: systemtrayn-0.3.2-1-i686 Message-ID: <20080617232504.646BA1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=1243db60d4e660ebe1a76d85d2f3905409f2aeda commit 1243db60d4e660ebe1a76d85d2f3905409f2aeda Author: James Buren Date: Tue Jun 17 18:24:14 2008 -0500 systemtrayn-0.3.2-1-i686 * redraft from scratch diff --git a/source/rox-extra/systemtrayn/FrugalBuild b/source/rox-extra/systemtrayn/FrugalBuild new file mode 100644 index 0000000..295c84b --- /dev/null +++ b/source/rox-extra/systemtrayn/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 0.02 SBU +# Maintainer: James Buren + +pkgname=systemtrayn +pkgver=0.3.2 +pkgrel=1 +pkgdesc="ROX Applet which acts as a system tray." +_F_rox_name=SystemTrayN +_F_rox_subdir=Applets/ +_F_sourceforge_name=$_F_rox_name +_F_sourceforge_ext=-1.tar.gz +options=('scriptlet') +Finclude rox +depends=('rox-clib') +groups=(${groups[@]} 'rox-applets') +archs=('i686') +sha1sums=('2763fe26d0993918df35b6dd178bb1b195815d4c') + +# optimization OK From ryuo at frugalware.org Wed Jun 18 01:42:28 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 01:42:30 2008 Subject: [Frugalware-git] rox: rox.sh Message-ID: <20080617234228.D1D001778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=b27d90bff892357058f4c5463387a5e8518a1471 commit b27d90bff892357058f4c5463387a5e8518a1471 Author: James Buren Date: Tue Jun 17 18:42:29 2008 -0500 rox.sh * add url fix * tweak sourceforge detection to remove reference to SF that * is on every page diff --git a/source/include/rox.sh b/source/include/rox.sh index 90302dd..a632937 100644 --- a/source/include/rox.sh +++ b/source/include/rox.sh @@ -54,9 +54,9 @@ _F_rox_installpath="$_F_rox_installpath$_F_rox_subdir" # * options (nodocs appended) ### _F_rox_index_page="http://roscidus.com/desktop/software" -A=`lynx -dump "$_F_rox_index_page" | grep "$_F_rox_name --" | sed -n '1p' | sed 's|.*\[\(.*\)].*|\1|'` +A=`lynx -dump "$_F_rox_index_page" | grep "]$_F_rox_name --" | sed -n '1p' | sed 's|.*\[\(.*\)].*|\1|'` url2=`lynx -dump "$_F_rox_index_page" | grep " $A. " | sed 's|^.* ||'` -if lynx -dump "$url2" | grep -q sourceforge.net; then +if lynx -dump "$url2" | grep -v http://sourceforge.net/projects/rox | grep -q sourceforge.net; then _F_sourceforge_dirname=rox Finclude sourceforge fi From ryuo at frugalware.org Wed Jun 18 01:52:34 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 01:52:36 2008 Subject: [Frugalware-git] rox: clock-2.1.7-1-i686 Message-ID: <20080617235234.D99A51778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=8c0871da582c16dd76c5adacec9e38b8dfd152bf commit 8c0871da582c16dd76c5adacec9e38b8dfd152bf Author: James Buren Date: Tue Jun 17 18:51:42 2008 -0500 clock-2.1.7-1-i686 * redraft from scratch diff --git a/source/rox-extra/clock/FrugalBuild b/source/rox-extra/clock/FrugalBuild new file mode 100644 index 0000000..43b6a3a --- /dev/null +++ b/source/rox-extra/clock/FrugalBuild @@ -0,0 +1,20 @@ +# Compiling Time: 0.02 SBU +# Maintainer: James Buren + +pkgname=clock +pkgver=2.1.7 +pkgrel=1 +pkgdesc="ROX Applet for displaying the current time." +_F_rox_name=Clock +_F_rox_subdir=Applets/ +options=('scriptlet') +Finclude rox +depends=('rox-clib') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=$_F_rox_name +up2date="Flasttar http://www.kerofin.demon.co.uk/rox/clock.html" +source=(http://www.kerofin.demon.co.uk/rox/$_F_rox_name-$pkgver.tar.gz) +archs=('i686') +sha1sums=('fd41d4839077c4909535c736953e8484b216b343') + +# optimization OK From ryuo at frugalware.org Wed Jun 18 02:01:45 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 02:01:46 2008 Subject: [Frugalware-git] rox: panelclock-0.1.3-1-i686 Message-ID: <20080618000145.045541778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=1b2259818cc6de2279dc7036575bd125eec51d71 commit 1b2259818cc6de2279dc7036575bd125eec51d71 Author: James Buren Date: Tue Jun 17 19:01:02 2008 -0500 panelclock-0.1.3-1-i686 * redraft from scratch diff --git a/source/rox-extra/panelclock/FrugalBuild b/source/rox-extra/panelclock/FrugalBuild new file mode 100644 index 0000000..9e55325 --- /dev/null +++ b/source/rox-extra/panelclock/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=panelclock +pkgver=0.1.3 +pkgrel=1 +pkgdesc="ROX Applet for displaying the current time, text format." +_F_rox_name=PanelClock +_F_rox_subdir=Applets/ +Finclude rox +rodepends=('rox-lib') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=$_F_rox_name +up2date="Flasttar http://hayber.us/rox/misc/" +source=(http://hayber.us/rox/misc/$_F_rox_name-$pkgver.tgz) +archs=('i686') +sha1sums=('59c80c74c66a958845be26432660b645de611c2f') + +# optimization OK From ryuo at frugalware.org Wed Jun 18 02:03:24 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 02:03:26 2008 Subject: [Frugalware-git] rox: clock-2.1.7-1-i686 Message-ID: <20080618000324.18C6D1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=dfea84d1b5d2de42744dfa0b6750dfb1b9a966ed commit dfea84d1b5d2de42744dfa0b6750dfb1b9a966ed Author: James Buren Date: Tue Jun 17 19:03:31 2008 -0500 clock-2.1.7-1-i686 * adjusted pkgdesc diff --git a/source/rox-extra/clock/FrugalBuild b/source/rox-extra/clock/FrugalBuild index 43b6a3a..cc9a120 100644 --- a/source/rox-extra/clock/FrugalBuild +++ b/source/rox-extra/clock/FrugalBuild @@ -4,7 +4,7 @@ pkgname=clock pkgver=2.1.7 pkgrel=1 -pkgdesc="ROX Applet for displaying the current time." +pkgdesc="ROX Applet for displaying the current time, analog format." _F_rox_name=Clock _F_rox_subdir=Applets/ options=('scriptlet') From ryuo at frugalware.org Wed Jun 18 02:16:34 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 02:16:34 2008 Subject: [Frugalware-git] rox: pager-1.2-1-i686 Message-ID: <20080618001634.276DE1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=9b71d6cf5dd475171f76625b8da836d79a8203e5 commit 9b71d6cf5dd475171f76625b8da836d79a8203e5 Author: James Buren Date: Tue Jun 17 19:16:15 2008 -0500 pager-1.2-1-i686 * redraft from scratch diff --git a/source/rox-extra/pager/FrugalBuild b/source/rox-extra/pager/FrugalBuild new file mode 100644 index 0000000..e87903b --- /dev/null +++ b/source/rox-extra/pager/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.02 SBU +# Maintainer: James Buren + +pkgname=pager +pkgver=1.2 +pkgrel=1 +pkgdesc="ROX Applet for managing your virtual workspaces/desktops." +_F_rox_name=Pager +_F_rox_subdir=Applets/ +_F_sourceforge_name=$_F_rox_name +options=('scriptlet') +Finclude rox +depends=('rox-clib' 'libwnck') +groups=(${groups[@]} 'rox-applets') +archs=('i686') +sha1sums=('bc1882d6ae2f32fff92e40390f45f5fc0dffc383') + +# optimization OK From ryuo at frugalware.org Wed Jun 18 02:37:09 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 02:37:10 2008 Subject: [Frugalware-git] rox: weather-0.3.2-1-i686 Message-ID: <20080618003709.3D7A51778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=0b21191d88c24920d8135f3a7f9431184b0f10bc commit 0b21191d88c24920d8135f3a7f9431184b0f10bc Author: James Buren Date: Tue Jun 17 19:37:02 2008 -0500 weather-0.3.2-1-i686 * redraft diff --git a/source/rox-extra/weather/FrugalBuild b/source/rox-extra/weather/FrugalBuild new file mode 100644 index 0000000..f3d69db --- /dev/null +++ b/source/rox-extra/weather/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=weather +pkgver=0.3.2 +pkgrel=1 +pkgdesc="ROX Applet for displaying weather data." +_F_rox_name=Weather +_F_rox_subdir=Applets/ +Finclude rox +rodepends=('rox-lib') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=$_F_rox_name +up2date="Flasttar ftp://ftp.berlios.de/pub/rox4debian/apps" +source=(ftp://ftp.berlios.de/pub/rox4debian/apps/$_F_rox_name-$pkgver.tgz) +archs=('i686') +sha1sums=('dd5ad69c04bbb07bb6b4d8fb15dd0e0d7b7f8271') + +# optimization OK From ryuo at frugalware.org Wed Jun 18 02:46:45 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 02:46:47 2008 Subject: [Frugalware-git] rox: lithium-006-1-i686 Message-ID: <20080618004645.D60311778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=c8ddaff9cb5f40da279e39e98c8c4881871af554 commit c8ddaff9cb5f40da279e39e98c8c4881871af554 Author: James Buren Date: Tue Jun 17 19:46:20 2008 -0500 lithium-006-1-i686 * redraft diff --git a/source/rox-extra/lithium/FrugalBuild b/source/rox-extra/lithium/FrugalBuild new file mode 100644 index 0000000..8403a8c --- /dev/null +++ b/source/rox-extra/lithium/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=lithium +pkgver=006 +pkgrel=1 +pkgdesc="ROX Applet for displaying the current battery power." +_F_rox_name=Lithium +_F_rox_subdir=Applets/ +Finclude rox +rodepends=('rox-lib') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=$_F_rox_name +up2date="Flasttar http://hayber.us/rox/applets/" +source=(http://hayber.us/rox/applets/$_F_rox_name-$pkgver.tgz) +archs=('i686') +sha1sums=('96cd1239ebdf019ae8f636d5aea23245d918ef7e') + +build() +{ + mkdir $_F_rox_name || Fdie + tar -xf $_F_rox_name-$pkgver.tgz -C $_F_rox_name || Fdie + Fbuild_rox +} From ryuo at frugalware.org Wed Jun 18 02:55:16 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 02:55:17 2008 Subject: [Frugalware-git] rox: tasklist-0.5-1-i686 Message-ID: <20080618005516.A06131778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=7a47a4da8751c54ebe5de4cb4cfd91e6df265a3b commit 7a47a4da8751c54ebe5de4cb4cfd91e6df265a3b Author: James Buren Date: Tue Jun 17 19:54:58 2008 -0500 tasklist-0.5-1-i686 * redraft diff --git a/source/rox-extra/tasklist/FrugalBuild b/source/rox-extra/tasklist/FrugalBuild new file mode 100644 index 0000000..ba935ce --- /dev/null +++ b/source/rox-extra/tasklist/FrugalBuild @@ -0,0 +1,21 @@ +# Compiling Time: 0.02 SBU +# Maintainer: James Buren + +pkgname=tasklist +pkgver=0.5 +pkgrel=1 +pkgdesc="ROX Applet for displaying a list of windows." +_F_rox_name=Tasklist +_F_rox_subdir=Applets/ +options=('scriptlet') +Finclude rox +rodepends=('rox-lib') +depends=('libwnck') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=$_F_rox_name +up2date="Flasttar ftp://ftp.berlios.de/pub/rox4debian/apps" +source=(ftp://ftp.berlios.de/pub/rox4debian/apps/$_F_rox_name-$pkgver.tgz) +archs=('i686') +sha1sums=('695f75ea14abb48949722a7f1d56d0f873c2152a') + +# optimization OK From ryuo at frugalware.org Wed Jun 18 03:04:28 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 03:04:29 2008 Subject: [Frugalware-git] rox: volume-009-1-i686 Message-ID: <20080618010428.A15431778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=bf9e39c203fdd2f6127cf9d035ed6cb1046f80c6 commit bf9e39c203fdd2f6127cf9d035ed6cb1046f80c6 Author: James Buren Date: Tue Jun 17 20:04:10 2008 -0500 volume-009-1-i686 * redraft diff --git a/source/rox-extra/volume/FrugalBuild b/source/rox-extra/volume/FrugalBuild new file mode 100644 index 0000000..e33f774 --- /dev/null +++ b/source/rox-extra/volume/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=volume +pkgver=009 +pkgrel=1 +pkgdesc="ROX Applet for managing your alsa configuration." +_F_rox_name=Volume +_F_rox_subdir=Applets/ +Finclude rox +rodepends=('rox-lib' 'pyalsaaudio') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=$_F_rox_name +up2date="Flasttar http://hayber.us/rox/applets/" +source=(http://hayber.us/rox/applets/$_F_rox_name-$pkgver.tgz) +archs=('i686') +sha1sums=('e9aa4306f0d23156266cf8642b94c6353c4dc50c') From bouleetbil at frogdev.info Wed Jun 18 07:34:16 2008 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jun 18 07:34:18 2008 Subject: [Frugalware-git] frugalware-current: sbackup-0.10.5-2-i686 Message-ID: <20080618053416.559F51778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8f54efb7b55a7b5366c86ec313b148cef33901ef commit 8f54efb7b55a7b5366c86ec313b148cef33901ef Author: bouleetbil Date: Wed Jun 18 07:26:57 2008 +0200 sbackup-0.10.5-2-i686 *fixe packages with invalid /usr/etc path diff --git a/source/xapps-extra/sbackup/FrugalBuild b/source/xapps-extra/sbackup/FrugalBuild index a220bd2..224ec0c 100644 --- a/source/xapps-extra/sbackup/FrugalBuild +++ b/source/xapps-extra/sbackup/FrugalBuild @@ -3,7 +3,7 @@ pkgname=sbackup pkgver=0.10.5 -pkgrel=1 +pkgrel=2 pkgdesc="SBackup is a simple backup solution intended for desktop use" depends=('notify-python' 'fuse' 'libglade') rodepends=('dcron') @@ -20,4 +20,6 @@ build() { Fcd Fsed "su-to-root -X -c" "gksu" *.desktop Fmakeinstall DESTDIR=$Fdestdir/usr + #delete empty dir, sbackup use /etc/sbackup.conf + Frm usr/etc } From voroskoi at frugalware.org Wed Jun 18 10:27:25 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 18 10:27:28 2008 Subject: [Frugalware-git] frugalware-current: scons-0.98.5-1-i686 Message-ID: <20080618082725.DC2ED1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=25cc23ee0f61df7b4298f659287d78321b901ae5 commit 25cc23ee0f61df7b4298f659287d78321b901ae5 Author: voroskoi Date: Wed Jun 18 10:27:13 2008 +0200 scons-0.98.5-1-i686 version bump diff --git a/source/devel-extra/scons/FrugalBuild b/source/devel-extra/scons/FrugalBuild index 9c9960e..ab5e362 100644 --- a/source/devel-extra/scons/FrugalBuild +++ b/source/devel-extra/scons/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=scons -pkgver=0.98.4 +pkgver=0.98.5 pkgrel=1 pkgdesc="SCons is an Open Source software construction tool, a next-generation build tool." _F_sourceforge_broken_up2date=1 @@ -12,4 +12,4 @@ url="http://www.scons.org/" depends=('python') groups=('devel-extra') archs=('i686' 'x86_64') -sha1sums=('b61764fe6fc7562f5034b71885323604cd6c74f5') +sha1sums=('d2ab8835fe850c6aea1ae22fb3f4eea777feee14') From voroskoi at frugalware.org Wed Jun 18 10:31:19 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 18 10:31:21 2008 Subject: [Frugalware-git] frugalware-current: pyrex-0.9.8.4-1-i686 Message-ID: <20080618083119.E374E1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d72328361714d8dbcbe80d2282cfbe9fb3894f34 commit d72328361714d8dbcbe80d2282cfbe9fb3894f34 Author: voroskoi Date: Wed Jun 18 10:31:02 2008 +0200 pyrex-0.9.8.4-1-i686 version bump diff --git a/source/devel-extra/pyrex/FrugalBuild b/source/devel-extra/pyrex/FrugalBuild index ee16284..3909b45 100644 --- a/source/devel-extra/pyrex/FrugalBuild +++ b/source/devel-extra/pyrex/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=pyrex -pkgver=0.9.8.2 +pkgver=0.9.8.4 pkgrel=1 pkgextraver= pkgdesc="A language for writing Python extension modules" @@ -13,7 +13,7 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep tar |sed -ne 's/.*-\(.*\).ta.*/\1/;1p' -e s/$pkgextraver//" source=($url/Pyrex-$pkgver$pkgextraver.tar.gz) -sha1sums=('eabb373ebaf11891e76328fa29181572d8e0c8f3') +sha1sums=('e5f5e14f06c930901c2125055456decf3e4b11ac') build() { From voroskoi at frugalware.org Wed Jun 18 10:32:09 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 18 10:32:10 2008 Subject: [Frugalware-git] frugalware-current: ruby-bdb-0.6.4-1-x86_64 Message-ID: <20080618083209.082F91778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d88a0e49875c8a9afe0cf3bfb22c7ad5805bf5f8 commit d88a0e49875c8a9afe0cf3bfb22c7ad5805bf5f8 Author: voroskoi Date: Wed Jun 18 10:31:52 2008 +0200 ruby-bdb-0.6.4-1-x86_64 version bump diff --git a/source/devel-extra/ruby-bdb/FrugalBuild b/source/devel-extra/ruby-bdb/FrugalBuild index eceb1cd..6c6f17c 100644 --- a/source/devel-extra/ruby-bdb/FrugalBuild +++ b/source/devel-extra/ruby-bdb/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=ruby-bdb -pkgver=0.6.3 +pkgver=0.6.4 pkgrel=1 pkgdesc="This is an interface to Berkeley DB for Ruby." url="http://moulon.inra.fr/ruby/bdb.html" @@ -13,7 +13,6 @@ _F_archive_name="bdb" _F_archive_nosort=1 up2date="lynx -dump ftp://moulon.inra.fr/pub/ruby/ |Flasttar" source=(ftp://moulon.inra.fr/pub/ruby/bdb-${pkgver}.tar.gz) -sha1sums=('61eeae1523f5117dcbc68aa2fbba8ee9c2a99863') +sha1sums=('6355d70ac953b3d35e46afe51f09278b930f6288') _F_cd_path="bdb-${pkgver}" - -# optimization OK +unset MAKEFLAGS From voroskoi at frugalware.org Wed Jun 18 10:36:52 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 18 10:36:53 2008 Subject: [Frugalware-git] frugalware-current: rxvt-unicode-9.05-1-i686 Message-ID: <20080618083652.8DDF21778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=015af621e23fa674d7903f2e815f77e727e1ce2a commit 015af621e23fa674d7903f2e815f77e727e1ce2a Author: voroskoi Date: Wed Jun 18 10:36:37 2008 +0200 rxvt-unicode-9.05-1-i686 version bump diff --git a/source/x11-extra/rxvt-unicode/FrugalBuild b/source/x11-extra/rxvt-unicode/FrugalBuild index 6c4ce74..1e3d422 100644 --- a/source/x11-extra/rxvt-unicode/FrugalBuild +++ b/source/x11-extra/rxvt-unicode/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: voroskoi pkgname=rxvt-unicode -pkgver=9.02 -pkgrel=2 +pkgver=9.05 +pkgrel=1 pkgdesc="rxvt-unicode is a clone of the well known terminal emulator rxvt" url="http://software.schmorp.de/" depends=('perl>=5.10.0-2' 'libxft' 'libgcc') @@ -13,7 +13,7 @@ up2date="Flasttar http://dist.schmorp.de/rxvt-unicode/" source=(http://dist.schmorp.de/rxvt-unicode/$pkgname-$pkgver.tar.bz2 \ CVE-2008-1142.patch) Fconfopts="${Fconfopts[@]} --enable-everything" -sha1sums=('f58a851ab4bf2da60a926a4885749302e73a92ed' \ +sha1sums=('758d57a88c3521f780bcd21c70d3995f53a2f6e3' \ 'de0ef44bdf799c7a41469f1082f7981348379faa') build() { From voroskoi at frugalware.org Wed Jun 18 10:54:34 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 18 10:54:36 2008 Subject: [Frugalware-git] frugalware-current: net-snmp-5.4.1.1-1-x86_64 Message-ID: <20080618085434.4F75C1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=60b0549a43d73d93b1be2ebca61427226540b9b6 commit 60b0549a43d73d93b1be2ebca61427226540b9b6 Author: voroskoi Date: Wed Jun 18 10:54:14 2008 +0200 net-snmp-5.4.1.1-1-x86_64 version bump diff --git a/source/network-extra/net-snmp/FrugalBuild b/source/network-extra/net-snmp/FrugalBuild index 7cab0f8..6a6dca2 100644 --- a/source/network-extra/net-snmp/FrugalBuild +++ b/source/network-extra/net-snmp/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: voroskoi pkgname=net-snmp -pkgver=5.4.1 -pkgrel=5 +pkgver=5.4.1.1 +pkgrel=1 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" depends=('openssl' 'perl>=5.10.0') groups=('network-extra') @@ -13,13 +13,14 @@ Finclude sourceforge url="http://www.net-snmp.org/" up2date="lynx -dump http://www.net-snmp.org/download.html |grep Supported -A 2 |sed -ne 's/.* \([0-9.]\+\) .*/\1/;$ p'" source=(${source[@]} CVE-2008-2292.patch CVE-2008-0960.patch rc.snmpd) -sha1sums=('ac5ba033c10d53d3057415121f8c4936c643c208' \ +sha1sums=('cfeef748f242a7b25ad8eea95977ff277984e368' \ '7f7f770fcebdeb8bb19515937895c9c545cc0609' \ 'bfb79ccb4db8b524655a78739bbf0e5255c1f14a' \ 'df7a817499d12c53e9d2809f68c24fea9d3307b0') build() { unset MAKEFLAGS + export NETSNMP_DONT_CHECK_VERSION=1 Fsed "tail -1" "tail -n 1" configure Fbuild --with-default-snmp-version="3" \ --with-sys-contact="root at localhost" --with-sys-location="Unknown" \ From voroskoi at frugalware.org Wed Jun 18 10:57:02 2008 From: voroskoi at frugalware.org (voroskoi) Date: Wed Jun 18 10:57:03 2008 Subject: [Frugalware-git] frugalware-current: unrar-3.8.2-1-x86_64 Message-ID: <20080618085702.8A4031778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6fa4648bd3c07f3437d082d15726241ee6bcfbde commit 6fa4648bd3c07f3437d082d15726241ee6bcfbde Author: voroskoi Date: Wed Jun 18 10:56:25 2008 +0200 unrar-3.8.2-1-x86_64 version bump diff --git a/source/apps-extra/unrar/FrugalBuild b/source/apps-extra/unrar/FrugalBuild index 670982d..2b8ea93 100644 --- a/source/apps-extra/unrar/FrugalBuild +++ b/source/apps-extra/unrar/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=unrar -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Uncompress rar files" url="http://www.rarlab.com/" @@ -20,7 +20,7 @@ build() { make -f makefile.unix || Fdie Fexerel /usr/bin/unrar } -sha1sums=('63dc8edb4ae7e9fa904a0b0e267d9a89d1074abb' \ +sha1sums=('9b04dae947a6697d035a08ede0730e932bf6ed81' \ '265050fcbedceafba4ad8aff1cfc4390954e4203') # optimization OK From crazy at frugalware.org Wed Jun 18 11:33:33 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 18 11:33:34 2008 Subject: [Frugalware-git] frugalware-current: eterm-0.9.5-1-x86_64 Message-ID: <20080618093333.8B9F61778050@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a0065e7428303856d47d6cf0f5018b62cef9d008 commit a0065e7428303856d47d6cf0f5018b62cef9d008 Author: crazy Date: Wed Jun 18 11:32:29 2008 +0200 eterm-0.9.5-1-x86_64 * Version bump diff --git a/source/xapps/eterm/CVE-2008-1692.patch b/source/xapps/eterm/CVE-2008-1692.patch deleted file mode 100644 index 1a28fe8..0000000 --- a/source/xapps/eterm/CVE-2008-1692.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ruN eterm-0.9.4.0debian1.original/src/startup.c eterm-0.9.4.0debian1/src/startup.c ---- eterm-0.9.4.0debian1.original/src/startup.c 2006-08-22 20:23:12.000000000 +0200 -+++ eterm-0.9.4.0debian1/src/startup.c 2008-03-28 13:51:44.000000000 +0100 -@@ -95,11 +95,7 @@ - init_libast(); - - /* Open display, get options/resources and create the window */ -- if (getenv("DISPLAY") == NULL) { -- display_name = STRDUP(":0"); -- } else { -- display_name = STRDUP(getenv("DISPLAY")); -- } -+ display_name = NULL; - - /* This MUST be called before any other Xlib functions */ - #ifdef SPIFOPT_SETTING_PREPARSE -@@ -116,7 +112,9 @@ - privileges(REVERT); - #endif - if (!Xdisplay && !(Xdisplay = XOpenDisplay(display_name))) { -- libast_print_error("can't open display %s\n", display_name); -+ libast_print_error("can't open display %s\n", display_name?display_name: -+ getenv("DISPLAY")?getenv("DISPLAY"): -+ "as no --display given and DISPLAY not set"); - exit(EXIT_FAILURE); - } - XSetErrorHandler((XErrorHandler) xerror_handler); diff --git a/source/xapps/eterm/FrugalBuild b/source/xapps/eterm/FrugalBuild index 242b2e7..76f3e78 100644 --- a/source/xapps/eterm/FrugalBuild +++ b/source/xapps/eterm/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Shrift pkgname=eterm -pkgver=0.9.4 -pkgrel=3 +pkgver=0.9.5 +pkgrel=1 pkgdesc="Eterm is a color vt102 terminal emulator intended as a replacement for xterm." depends=('imlib2' 'libast' 'libxres' 'libxmu') groups=('xapps') @@ -13,9 +13,7 @@ _F_sourceforge_dirname="$pkgname" _F_sourceforge_name="Eterm" Finclude sourceforge url="http://eterm.org" -source=($source CVE-2008-1692.patch) -sha1sums=('d63628098b3aa08c8f2bc1bd756683e5fd227995' \ - '4f7ae604afec321a184e27a7a84110d1d3b30139') +sha1sums=('f2d75354a48734f63f018f7173cebee81f2358c7') [ "$CARCH" == "x86_64" ] && mmxo=" --disable-mmx --enable-sse2 " From crazy at frugalware.org Wed Jun 18 11:53:50 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 18 11:53:52 2008 Subject: [Frugalware-git] frugalware-current: wavpack-4.50.0-1-x86_64 Message-ID: <20080618095350.734911778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=24007db5f0ca69c6a82fa50cdf84e30d850728a2 commit 24007db5f0ca69c6a82fa50cdf84e30d850728a2 Author: crazy Date: Wed Jun 18 11:52:56 2008 +0200 wavpack-4.50.0-1-x86_64 * Version bump diff --git a/source/multimedia/wavpack/FrugalBuild b/source/multimedia/wavpack/FrugalBuild index 221843d..ca50ca2 100644 --- a/source/multimedia/wavpack/FrugalBuild +++ b/source/multimedia/wavpack/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=wavpack -pkgver=4.41.0 +pkgver=4.50.0 pkgrel=1 pkgdesc="A completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode." url="http://www.wavpack.com/" @@ -11,6 +11,6 @@ groups=('multimedia') archs=('i686' 'x86_64') up2date="lynx -dump $url/downloads.html|grep -m1 'tar.bz2'|sed 's/.*-\(.*\).tar.bz2/\1/'" source=($url/$pkgname-$pkgver.tar.bz2) -sha1sums=('ddc19302d934bf48ebb8f185441d19e5d3c5bdec') +sha1sums=('8f9e30a148ee354b713431bc4e139a14feefd274') # optimization OK From krics at linuxforum.hu Wed Jun 18 11:54:36 2008 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Jun 18 11:54:38 2008 Subject: [Frugalware-git] frugalware-current: rpm-5.1.3-1-x86_64 Message-ID: <20080618095436.693871778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3debcf70cf3ddea52081871285c7eb00e41b426d commit 3debcf70cf3ddea52081871285c7eb00e41b426d Author: Christian Hamar alias krix Date: Wed Jun 18 11:54:21 2008 +0200 rpm-5.1.3-1-x86_64 * Version bump diff --git a/source/apps-extra/rpm/FrugalBuild b/source/apps-extra/rpm/FrugalBuild index aef362e..338f946 100644 --- a/source/apps-extra/rpm/FrugalBuild +++ b/source/apps-extra/rpm/FrugalBuild @@ -3,8 +3,8 @@ # Maintainer: Christian Hamar alias krix pkgname=rpm -pkgver=5.1.2 -pkgrel=2 +pkgver=5.1.3 +pkgrel=1 pkgdesc="Red Hat Package Manager" url="http://rpm5.org" depends=('heimdal>=1.2' 'pcre' 'sqlite3' 'popt' 'beecrypt' 'bzip2' 'neon' 'sqlite2' 'xfsprogs-acl' 'libxml2') @@ -12,7 +12,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://rpm5.org/|grep Production|sed 's/.*RPM \([0-9.]\+\) .*/\1/'" source=(http://rpm5.org/files/$pkgname/$pkgname-${pkgver%.?}/$pkgname-$pkgver.tar.gz) -sha1sums=('542a5e431ac1f8b2ae1217b78d27b8c8c2d8ad77') +sha1sums=('cef1a30d282d7e4fe75174496d233ddb92570b00') build(){ Fconf \ From crazy at frugalware.org Wed Jun 18 11:55:38 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 18 11:55:39 2008 Subject: [Frugalware-git] frugalware-current: libbash-0.9.10b-1-x86_64 Message-ID: <20080618095538.90E921778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=016973c06574e942f56b3a4c014c5f59a49e2002 commit 016973c06574e942f56b3a4c014c5f59a49e2002 Author: crazy Date: Wed Jun 18 11:54:40 2008 +0200 libbash-0.9.10b-1-x86_64 * Version bump diff --git a/source/lib-extra/libbash/FrugalBuild b/source/lib-extra/libbash/FrugalBuild index db6f4f3..a9e3c8e 100644 --- a/source/lib-extra/libbash/FrugalBuild +++ b/source/lib-extra/libbash/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=libbash -pkgver=0.9.10a +pkgver=0.9.10b pkgrel=1 pkgdesc="libbash is a tool that enables bash dynamic-like shared libraries." depends=('bash') @@ -11,6 +11,6 @@ _F_sourceforge_ext=".tar.bz2" Finclude sourceforge groups=('lib-extra') archs=('i686' 'x86_64') -sha1sums=('5d608f4d7ceb7d347dea53a08d28b92b93a0f7b7') +sha1sums=('efa3c4d3be45d59e526db8f2060bcb74bccacdb2') From krics at linuxforum.hu Wed Jun 18 11:59:36 2008 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Jun 18 11:59:37 2008 Subject: [Frugalware-git] frugalware-current: xchat-2.8.6-1-x86_64 Message-ID: <20080618095936.6D2691778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=81e918af3a11263f879be950654d3b46ab2c360d commit 81e918af3a11263f879be950654d3b46ab2c360d Author: Christian Hamar alias krix Date: Wed Jun 18 11:59:14 2008 +0200 xchat-2.8.6-1-x86_64 * Version bump * Dropped old patches for 2.8.4 diff --git a/source/xapps/xchat/FrugalBuild b/source/xapps/xchat/FrugalBuild index f5de1b9..90ab645 100644 --- a/source/xapps/xchat/FrugalBuild +++ b/source/xapps/xchat/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: VMiklos pkgname=xchat -pkgver=2.8.4 -pkgrel=7 +pkgver=2.8.6 +pkgrel=1 pkgdesc="A GTK+2 based IRC client" url="http://www.xchat.org/" depends=('gtk+2>=2.12.0-3' 'openssl' 'glib2>=2.14.1-5' 'libsexy' 'dbus-glib') @@ -15,9 +15,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url|grep Source: | sed 's/.* \([0-9\.]*\)$/\1/'" source=(http://www.xchat.org/files/source/`echo $pkgver|sed 's/\([0-9].[0-9]\).[0-9]/\1/'`/$pkgname-$pkgver.tar.bz2 \ README.Frugalware \ - xchat-2.6.1-fw.diff \ - http://www.xchat.org/files/source/2.8/patches/xc284-scrollbmkdir.diff \ - http://www.xchat.org/files/source/2.8/patches/xc284-improvescrollback.diff) + xchat-2.6.1-fw.diff) #_F_gnome_schemas=('etc/gconf/schemas/apps_xchat_url_handler.schemas') _F_gnome_desktop="y" options=('scriptlet') @@ -46,9 +44,7 @@ build() Fsplit xchat-plugins usr/lib/xchat/plugins/* } -sha1sums=('6ac509624c241edfac5d53d9d4ece63d917613d6' \ +sha1sums=('7a7463e65cb26c680ed70dd96cec98bcc05435a4' \ 'd3042890e443739f4637ccd289d4a04b7d5b879b' \ - 'f05f3ffc59e0dc9241d31d4786a4cca893592e99' \ - '1f6c5071ffc16f9012c82f3f84739083806285f0' \ - '533bc8d851055ef6dfaa4a01e47e6febd4919192') + 'f05f3ffc59e0dc9241d31d4786a4cca893592e99') # optimization OK From crazy at frugalware.org Wed Jun 18 12:06:57 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 18 12:06:58 2008 Subject: [Frugalware-git] frugalware-current: libprojectm-1.2.0-1-x86_64 Message-ID: <20080618100657.4706F1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=57810cc8d26f97975b97bd00ef80fc8edfa704a1 commit 57810cc8d26f97975b97bd00ef80fc8edfa704a1 Author: crazy Date: Wed Jun 18 12:05:43 2008 +0200 libprojectm-1.2.0-1-x86_64 * Version bump * FB cleanup , use Finclude cmake here diff --git a/source/xlib-extra/libprojectm/FrugalBuild b/source/xlib-extra/libprojectm/FrugalBuild index 901f756..a559ebb 100644 --- a/source/xlib-extra/libprojectm/FrugalBuild +++ b/source/xlib-extra/libprojectm/FrugalBuild @@ -2,33 +2,18 @@ # Maintainer: crazy pkgname=libprojectm -pkgver=1.1 +pkgver=1.2.0 pkgrel=1 pkgdesc="projectM is a reimplementation of Milkdrop under OpenGL." depends=('mesa>=6.5.3' 'ftgl' 'freetype2' 'glew>=1.5.0' 'zlib' 'libstdc++' 'libgcc' 'libxcb' 'libxau' 'libxdmcp') -makedepends=('cmake') groups=('xlib-extra') archs=('i686' 'x86_64') _F_sourceforge_name="libprojectM" _F_sourceforge_dirname="projectm" _F_sourceforge_ext=".tar.bz2" -Finclude sourceforge +Finclude sourceforge cmake url="http://projectm.sourceforge.net/" -Fconfopts="$Fconfopts --disable-static" _F_cd_path="$_F_sourceforge_name-$pkgver" -sha1sums=('34cfef93c480729389ef660e6124467fbb123f70') - - -build() -{ - Fcd - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_COLOR_MAKEFILE=OFF - make || Fdie - make DESTDIR=$Fdestdir install || Fdie -} +sha1sums=('e8264009e7c6c588e6f4f2e51a10498e0b1d07b7') # optimization OK From crazy at frugalware.org Wed Jun 18 13:31:38 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 18 13:31:41 2008 Subject: [Frugalware-git] frugalware-current: cryptopp-5.5.2-1-x86_64 Message-ID: <20080618113138.B65691778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6edad8800cb3dcd2481aac7ffbe4aee295c1f02f commit 6edad8800cb3dcd2481aac7ffbe4aee295c1f02f Author: crazy Date: Wed Jun 18 13:29:44 2008 +0200 cryptopp-5.5.2-1-x86_64 * New package for amule diff --git a/source/lib-extra/cryptopp/FrugalBuild b/source/lib-extra/cryptopp/FrugalBuild new file mode 100644 index 0000000..357a18f --- /dev/null +++ b/source/lib-extra/cryptopp/FrugalBuild @@ -0,0 +1,25 @@ +# Compiling Time: 0.83 SBU +# Maintainer: crazy + +pkgname=cryptopp +pkgver=5.5.2 +pkgrel=1 +pkgdesc="C++ library for cryptography" +groups=('lib-extra') +archs=('i686' 'x86_64') +depends=() +_F_sourceforge_sep="None" +_F_sourceforge_pkgver="`echo $pkgver|tr -d '.'`" +_F_sourceforge_ext=".zip" +Finclude sourceforge +sha1sums=('18efe451b3c682f40db75dc2b09cb448a835e7d6') + +build() +{ + cd $Fsrcdir || Fdie + ## DO NOT USE our C*FLAGS on this one!! + make CXXFLAGS="-O0 -DNDEBUG" PREFIX=/usr || Fdie + make PREFIX=$Fdestdir/usr install || Fdie + Frm usr/bin +} + From crazy at frugalware.org Wed Jun 18 13:47:51 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 18 13:47:52 2008 Subject: [Frugalware-git] frugalware-current: amule-2.2.1-1-x86_64 Message-ID: <20080618114751.0BDBF1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6086f115dcd229f3a96cf60ef8ba5052d88ea6a3 commit 6086f115dcd229f3a96cf60ef8ba5052d88ea6a3 Author: crazy Date: Wed Jun 18 13:45:01 2008 +0200 amule-2.2.1-1-x86_64 * Version bump * depends / FB cleanup * new m8r diff --git a/source/xapps-extra/amule/FrugalBuild b/source/xapps-extra/amule/FrugalBuild index d129e92..ee56959 100644 --- a/source/xapps-extra/amule/FrugalBuild +++ b/source/xapps-extra/amule/FrugalBuild @@ -1,9 +1,10 @@ # Compiling Time: 2.35 SBU -# Maintainer: BMH1980 +# Maintainer: crazy +# Contributor: BMH1980 pkgname=amule -pkgver=2.1.3 -pkgrel=15 +pkgver=2.2.1 +pkgrel=1 pkgdesc="aMule is a file-sharing program, connects to eDonkey2000 network." _F_sourceforge_dirname="$pkgname" _F_sourceforge_name="aMule" @@ -11,27 +12,21 @@ _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://www.amule.org/" replaces=('xmule') -source=($source aMule-wx.patch fix-broken-server.met-link.patch gcc43.patch) -depends=('wxgtk>=2.8.7' 'libxxf86vm' 'binutils=2.18.50.0.6' 'gd' 'curl') +depends=('wxgtk-u8' 'libstdc++' 'gtk+2' 'libxau' 'libxdmcp' 'libxxf86vm' 'libxdamage' 'libxml2' 'libice' 'readline' 'gd' 'binutils=2.18.50.0.6' 'cryptopp') up2date="lynx -dump $url/files/files.php?cat=6 | grep Latest | tail -n 1 | cut -d ' ' -f 10" license="GPL2" groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') -Fconfopts="$Fconfopts --enable-cas --enable-wxcas \ - --disable-amulecmd --disable-amulecmdgui \ - --disable-webserver --disable-webservergui \ - --enable-kad-compile --enable-amule-daemon \ +Fconfopts="$Fconfopts \ + --enable-cas --enable-wxcas \ + --enable-amule-daemon \ + --enable-static=no --disable-static \ --enable-alc --enable-alcc \ - --enable-ccache --disable-debug" -# br0ken gcc43 - will fix soon -- crazy -- -# --enable-webserver --enable-webservergui -# --enable-amulecmd --enable-amulecmdgui + --enable-ccache --disable-debug \ + --enable-webserver --enable-webservergui \ + --enable-amulecmd --enable-amulecmdgui" _F_cd_path="aMule-$pkgver" -sha1sums=('dd47deb38e7a5b823550b85150f5a814c597b273' \ - 'bd048f7b88ff4c19841f606d03c5a9750e6e6945' \ - '5c74fe3e13cad5d40def64e873f3fe6114ecb91a' \ - 'ce6e079ad3422e76d12152d59e992488956f327c') -export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -Wno-deprecated" +sha1sums=('c4a98fd034ae9af9ace632c9bc9f51a75405c271') # optimization OK diff --git a/source/xapps-extra/amule/aMule-wx.patch b/source/xapps-extra/amule/aMule-wx.patch deleted file mode 100644 index 8148d35..0000000 --- a/source/xapps-extra/amule/aMule-wx.patch +++ /dev/null @@ -1,156 +0,0 @@ -diff -urN aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp ---- aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp 2005-12-16 13:09:29.000000000 +0100 -+++ aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp 2006-12-17 20:20:47.151203000 +0100 -@@ -297,7 +297,7 @@ - m_validateButton = - new wxButton ( this, ID_VALIDATE_BUTTON, wxString ( _( "Validate" ) ) ); - m_cancelButton = -- new wxButton ( this, ID_CANCEL_BUTTON, wxString ( _( "Cancel" ) ) ); -+ new wxButton ( this, wxID_CANCEL, wxString ( _( "Cancel" ) ) ); - - m_buttonHBox->Add ( m_validateButton, 0, wxALIGN_CENTER | wxALL, 5 ); - m_buttonHBox->Add ( m_cancelButton, 0, wxALIGN_CENTER | wxALL, 5 ); -@@ -321,7 +321,6 @@ - EVT_BUTTON ( ID_OSPATH_BROWSE_BUTTON, WxCasPrefs::OnOSPathBrowseButton ) - EVT_BUTTON ( ID_AUTOSTATIMG_BROWSE_BUTTON, WxCasPrefs::OnAutoStatImgBrowseButton ) - EVT_BUTTON ( ID_VALIDATE_BUTTON, WxCasPrefs::OnValidateButton ) --EVT_BUTTON ( ID_CANCEL_BUTTON, WxCasPrefs::OnCancel ) // Defined in wxDialog - EVT_CHECKBOX ( ID_AUTOSTATIMG_CHECK, WxCasPrefs::OnAutoStatImgCheck ) - EVT_CHECKBOX ( ID_FTP_UPDATE_CHECK, WxCasPrefs::OnFtpUpdateCheck ) - END_EVENT_TABLE () ---- aMule/src/utils/wxCas/src/wxcasprefs.h.org 2006-12-17 22:17:39.017417250 +0100 -+++ aMule/src/utils/wxCas/src/wxcasprefs.h 2006-12-17 22:18:17.611829250 +0100 -@@ -101,8 +101,7 @@ - ID_AUTOSTATIMG_COMBO, - ID_AUTOSTATIMG_BROWSE_BUTTON, - ID_FTP_UPDATE_CHECK, -- ID_VALIDATE_BUTTON, -- ID_CANCEL_BUTTON -+ ID_VALIDATE_BUTTON - }; - - protected: ---- aMule/src/MuleGifCtrl.cpp 2006-02-03 20:14:05.000000000 +0100 -+++ aMule/src/MuleGifCtrl.cpp 2006-11-19 19:35:33.000000000 +0100 -@@ -24,7 +24,6 @@ - - #include - #include --#include - #include - - #include "MuleGifCtrl.h" -@@ -35,6 +34,50 @@ - EVT_ERASE_BACKGROUND(MuleGifCtrl::OnErase) - END_EVENT_TABLE() - -+#if wxCHECK_VERSION(2, 7, 1) -+// Wrapper that emulates old wxGIFDecoder API -+ -+class MuleGIFDecoder : public wxGIFDecoder { -+public: -+ MuleGIFDecoder(wxInputStream* stream, bool dummy) { -+ m_stream = stream; -+ dummy = dummy; // Unused. -+ m_nframe = 0; -+ } -+ -+ ~MuleGIFDecoder() { /* don't delete the stream! */ } -+ -+ wxGIFErrorCode ReadGIF() { -+ return LoadGIF(*m_stream); -+ } -+ -+ void GoFirstFrame() { m_nframe = 0; } -+ void GoNextFrame(bool dummy) { m_nframe < GetFrameCount() ? m_nframe++ : m_nframe = 0; } -+ void GoLastFrame() { m_nframe = GetFrameCount(); } -+ -+ void ConvertToImage(wxImage* image) { wxGIFDecoder::ConvertToImage(m_nframe, image); } -+ -+ size_t GetLogicalScreenWidth() { return GetAnimationSize().GetWidth(); } -+ size_t GetLogicalScreenHeight() { return GetAnimationSize().GetHeight(); } -+ -+ size_t GetLeft() { return 0; } -+ size_t GetTop() { return 0; } -+ -+ long GetDelay() { return wxGIFDecoder::GetDelay(m_nframe); } -+ -+private: -+ uint32_t m_nframe; -+ wxInputStream* m_stream; -+}; -+ -+#else -+class MuleGIFDecoder : public wxGIFDecoder { -+public: -+ MuleGIFDecoder(wxInputStream* stream, bool flag) : wxGIFDecoder(stream,flag) {}; -+}; -+#endif -+ -+ - - MuleGifCtrl::MuleGifCtrl( wxWindow *parent, wxWindowID id, const wxPoint& pos, - const wxSize& size, long style, const wxValidator& validator, -@@ -66,7 +109,7 @@ - } - - wxMemoryInputStream stream(data, size); -- m_decoder = new wxGIFDecoder(&stream, TRUE); -+ m_decoder = new MuleGIFDecoder(&stream, TRUE); - if ( m_decoder->ReadGIF() != wxGIF_OK ) { - delete m_decoder; - m_decoder = NULL; -@@ -137,3 +180,4 @@ - dc.DrawBitmap( m_frame, x + m_decoder->GetLeft(), y + m_decoder->GetTop(), true); - } - -+// File_checked_for_headers ---- aMule/src/MuleGifCtrl.h 2006-01-01 06:17:25.000000000 +0100 -+++ aMule/src/MuleGifCtrl.h 2006-11-18 05:01:22.000000000 +0100 -@@ -27,11 +27,10 @@ - - #include - #include --#include - - const int GIFTIMERID = 271283; - --class wxGIFDecoder; -+class MuleGIFDecoder; - class wxBitmap; - - /** -@@ -121,7 +120,7 @@ - void OnErase( wxEraseEvent& WXUNUSED(event) ) {} - - //! A pointer to the current gif-animation. -- wxGIFDecoder* m_decoder; -+ MuleGIFDecoder* m_decoder; - //! Timer used for the delay between each frame. - wxTimer m_timer; - //! Current frame. -@@ -133,3 +132,4 @@ - - #endif - -+// File_checked_for_headers ---- aMule-2.1.3/src/MuleTextCtrl.cpp~ 2006-12-17 20:55:37.157820250 +0100 -+++ aMule-2.1.3/src/MuleTextCtrl.cpp 2006-12-17 20:56:21.328580750 +0100 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - /** - * These are the IDs used to identify the different menu-items. ---- amule/src/amule.cpp~ 2006-12-17 21:53:26.474639000 +0100 -+++ amule/src/amule.cpp 2006-12-17 21:55:40.307003000 +0100 -@@ -96,6 +96,7 @@ - #include - #include - #endif -+ #include - #endif - - diff --git a/source/xapps-extra/amule/fix-broken-server.met-link.patch b/source/xapps-extra/amule/fix-broken-server.met-link.patch deleted file mode 100644 index 300faec..0000000 --- a/source/xapps-extra/amule/fix-broken-server.met-link.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur aMule-2.1.3/src/ServerWnd.cpp aMule-2.1.3-p/src/ServerWnd.cpp ---- aMule-2.1.3/src/ServerWnd.cpp 2006-03-17 03:06:48.000000000 +0100 -+++ aMule-2.1.3-p/src/ServerWnd.cpp 2007-12-07 10:09:40.000000000 +0100 -@@ -70,7 +70,7 @@ - - CastChild( ID_SRV_SPLITTER, wxSplitterWindow )->SetSashPosition(splitter_pos, true); - CastChild( ID_SRV_SPLITTER, wxSplitterWindow )->SetSashGravity(0.5f); -- CastChild( IDC_SERVERLISTURL, wxTextCtrl )->SetValue(wxT("http://ocbmaurice.dyns.net/pl/slist.pl?download/server-best.met")); -+ CastChild( IDC_SERVERLISTURL, wxTextCtrl )->SetValue(wxT("http://www.server-met.de/dl.php?load=gz&trace=33250645.6944")); - - // Insert two columns, currently without a header - wxListCtrl* ED2KInfoList = CastChild( ID_ED2KINFO, wxListCtrl ); diff --git a/source/xapps-extra/amule/gcc43.patch b/source/xapps-extra/amule/gcc43.patch deleted file mode 100644 index aea9e00..0000000 --- a/source/xapps-extra/amule/gcc43.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur aMule-2.1.3/src/ED2KLinkParser.cpp aMule-2.1.3-p/src/ED2KLinkParser.cpp ---- aMule-2.1.3/src/ED2KLinkParser.cpp 2006-01-30 19:53:03.000000000 +0100 -+++ aMule-2.1.3-p/src/ED2KLinkParser.cpp 2008-03-13 02:53:08.000000000 +0100 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #ifdef __APPLE__ - #include From crazy at frugalware.org Wed Jun 18 13:55:09 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 18 13:55:12 2008 Subject: [Frugalware-git] frugalware-current: perl-convert-uulib-1.11-1-x86_64 Message-ID: <20080618115509.E78161778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=79d0c56c9bfd816eec8fee9b0fcf24ee58a0adfb commit 79d0c56c9bfd816eec8fee9b0fcf24ee58a0adfb Author: crazy Date: Wed Jun 18 13:54:11 2008 +0200 perl-convert-uulib-1.11-1-x86_64 * Version bump diff --git a/source/devel-extra/perl-convert-uulib/FrugalBuild b/source/devel-extra/perl-convert-uulib/FrugalBuild index 277e603..77d6ede 100644 --- a/source/devel-extra/perl-convert-uulib/FrugalBuild +++ b/source/devel-extra/perl-convert-uulib/FrugalBuild @@ -3,10 +3,10 @@ _F_perl_name=Convert-UUlib _F_perl_author=M/ML/MLEHMANN -pkgver=1.09 -pkgrel=2 +pkgver=1.11 +pkgrel=1 pkgdesc="Perl interface to the uulib library (a.k.a. uudeview/uuenview)." Finclude perl archs=('i686' 'x86_64') # optimization OK -sha1sums=('c8793cdb985034dfc974efc4cf72c631408bd7a9') +sha1sums=('c868e044acf0010671d4a2282d746d0a4dda67d9') From crazy at frugalware.org Wed Jun 18 13:56:28 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 18 13:56:29 2008 Subject: [Frugalware-git] frugalware-current: pngcrush-1.6.7-1-x86_64 Message-ID: <20080618115628.436D81778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4c650e6fd1690abc07271cc5dad4fdb8e45d3e94 commit 4c650e6fd1690abc07271cc5dad4fdb8e45d3e94 Author: crazy Date: Wed Jun 18 13:55:33 2008 +0200 pngcrush-1.6.7-1-x86_64 * Version bump diff --git a/source/apps-extra/pngcrush/FrugalBuild b/source/apps-extra/pngcrush/FrugalBuild index 4576421..8bbaea9 100644 --- a/source/apps-extra/pngcrush/FrugalBuild +++ b/source/apps-extra/pngcrush/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy pkgname=pngcrush -pkgver=1.6.6 +pkgver=1.6.7 pkgrel=1 pkgdesc="Pngcrush is an optimizer for PNG (Portable Network Graphics) files." _F_sourceforge_dirname="pmt" @@ -13,7 +13,7 @@ depends=('glibc') groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=1689|grep -v nolib|grep -m1 'pngcrush-\(.*\).tar.bz2'|sed 's/.*-\(.*\).t.*/\1/'" -sha1sums=('dad490894c34f9d356f98426c02272c96dacde63') +sha1sums=('eb4bbf102fda51a0c01fb256579c1f2492b08998') build() { From crazy at frugalware.org Wed Jun 18 13:59:47 2008 From: crazy at frugalware.org (crazy) Date: Wed Jun 18 13:59:49 2008 Subject: [Frugalware-git] frugalware-current: cherokee-0.7.2-1-x86_64 Message-ID: <20080618115947.325761778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e3e7094f88c29c7e52ed67edde43fc58c044a60a commit e3e7094f88c29c7e52ed67edde43fc58c044a60a Author: crazy Date: Wed Jun 18 13:58:08 2008 +0200 cherokee-0.7.2-1-x86_64 * Version bump diff --git a/source/network-extra/cherokee/FrugalBuild b/source/network-extra/cherokee/FrugalBuild index 8b908b5..35d1a37 100644 --- a/source/network-extra/cherokee/FrugalBuild +++ b/source/network-extra/cherokee/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Laszlo Dvornik pkgname=cherokee -pkgver=0.7.1 +pkgver=0.7.2 pkgrel=1 pkgdesc="A flexible, very fast, lightweight HTTP server" url="http://www.cherokee-project.com/" @@ -21,7 +21,7 @@ source=($pkgurl/0.7/$pkgver/cherokee-$pkgver.tar.gz \ generatessl \ index.html \ http://frugalware.org/images/frugalware.png) -sha1sums=('d45363eb8321fb85388988091b1a16503f07a596' \ +sha1sums=('cb5ec6752737afae3505d1387b52a4230ec21f42' \ '7559de6a098bbc3e460ef396a7aaea27c551311b' \ '90db20b5183c6e22e91488fd6d44df47018b1942' \ 'f3afa484129a065ce22f326ec13104af87a9fca5' \ From ryuo at frugalware.org Wed Jun 18 14:32:18 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 14:32:20 2008 Subject: [Frugalware-git] rox: netstat-0.1.1-1-i686 Message-ID: <20080618123218.796681778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=253d27d33f71320892299012a9a4ef3626afaddf commit 253d27d33f71320892299012a9a4ef3626afaddf Author: James Buren Date: Wed Jun 18 07:31:39 2008 -0500 netstat-0.1.1-1-i686 * redraft diff --git a/source/rox-extra/netstat/FrugalBuild b/source/rox-extra/netstat/FrugalBuild new file mode 100644 index 0000000..6121577 --- /dev/null +++ b/source/rox-extra/netstat/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.02 SBU +# Maintainer: James Buren + +pkgname=netstat +pkgver=0.1.1 +pkgrel=1 +pkgdesc="ROX Applet for displaying your network traffic." +_F_rox_name=NetStat +_F_rox_subdir=Applets/ +Finclude rox +rodepends=('rox-lib') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=$_F_rox_name +up2date="Flasttar http://www.kerofin.demon.co.uk/rox/netstat.html" +source=(http://www.kerofin.demon.co.uk/rox/$_F_rox_name-$pkgver.tar.gz) +archs=('i686') +sha1sums=('0372966be5c1a380cd6b70ff78557c3de434903b') From ryuo at frugalware.org Wed Jun 18 14:41:39 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 14:41:40 2008 Subject: [Frugalware-git] rox: sysbars-0.0.2-1-i686 Message-ID: <20080618124139.217071778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=4c58a62948c69407bf6d546a0088e1333eb82a00 commit 4c58a62948c69407bf6d546a0088e1333eb82a00 Author: James Buren Date: Wed Jun 18 07:41:30 2008 -0500 sysbars-0.0.2-1-i686 * redraft diff --git a/source/rox-extra/sysbars/FrugalBuild b/source/rox-extra/sysbars/FrugalBuild new file mode 100644 index 0000000..9281825 --- /dev/null +++ b/source/rox-extra/sysbars/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.02 SBU +# Maintainer: James Buren + +pkgname=sysbars +pkgver=0.0.2 +pkgrel=1 +pkgdesc="ROX Applet for displaying your system resource usage." +_F_rox_name=SysBars +_F_rox_subdir=Applets/ +Finclude rox +rodepends=('rox-lib') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=$_F_rox_name +up2date="Flasttar http://www.realh.ukfsn.org/rox.shtml" +source=(http://www.realh.ukfsn.org/rox/$_F_rox_name-$pkgver.tar.bz2) +archs=('i686') +sha1sums=('7bf48cad3382e2df3680b8917485d1f0cd4447f7') From ryuo at frugalware.org Wed Jun 18 14:49:35 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 14:49:36 2008 Subject: [Frugalware-git] rox: rox.sh Message-ID: <20080618124935.5A9771778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=6558f7fe1ea21377ab85b595f25862348e6a7c3c commit 6558f7fe1ea21377ab85b595f25862348e6a7c3c Author: James Buren Date: Wed Jun 18 07:49:39 2008 -0500 rox.sh * added a way to override the default * url and such detection scripts diff --git a/source/include/rox.sh b/source/include/rox.sh index a632937..1201f45 100644 --- a/source/include/rox.sh +++ b/source/include/rox.sh @@ -30,6 +30,8 @@ # # == OPTIONS # * _F_rox_name - real name of the rox app, defaults to $pkgname +# * _F_rox_override - set to 1 if you wish to disable automatic detection +# of url, and up2date/source if sourceforge is used. # * _F_rox_subdir - used to install the rox app to a subdir of the install # path # * _F_rox_sep - used to change the seperator between version and @@ -39,6 +41,7 @@ [ -z "$_F_rox_name" ] && _F_rox_name=$pkgname [ -z "$_F_rox_subdir" ] && _F_rox_subdir= [ -z "$_F_rox_sep" ] && _F_rox_sep=- +[ -z "$_F_rox_override" ] && _F_rox_override=0 if echo $pkgname | grep -q lib; then _F_rox_installpath=/usr/lib/ else @@ -53,18 +56,21 @@ _F_rox_installpath="$_F_rox_installpath$_F_rox_subdir" # * source (only for sourceforge) # * options (nodocs appended) ### -_F_rox_index_page="http://roscidus.com/desktop/software" -A=`lynx -dump "$_F_rox_index_page" | grep "]$_F_rox_name --" | sed -n '1p' | sed 's|.*\[\(.*\)].*|\1|'` -url2=`lynx -dump "$_F_rox_index_page" | grep " $A. " | sed 's|^.* ||'` -if lynx -dump "$url2" | grep -v http://sourceforge.net/projects/rox | grep -q sourceforge.net; then - _F_sourceforge_dirname=rox - Finclude sourceforge +if [ "$_F_rox_override" -eq 0 ]; then + _F_rox_index_page="http://roscidus.com/desktop/software" + A=`lynx -dump "$_F_rox_index_page" | grep "]$_F_rox_name --" | sed -n '1p' | sed 's|.*\[\(.*\)].*|\1|'` + url2=`lynx -dump "$_F_rox_index_page" | grep " $A. " | sed 's|^.* ||'` + if lynx -dump "$url2" | grep -v http://sourceforge.net/projects/rox | grep -q sourceforge.net; then + _F_sourceforge_dirname=rox + Finclude sourceforge + fi + url=$url2 + unset A + unset url2 fi -url=$url2 + options=(${options[@]} 'nodocs') groups=('rox-extra') -A= -url2= ### # == PROVIDED FUNCTIONS From ryuo at frugalware.org Wed Jun 18 14:56:08 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 14:56:09 2008 Subject: [Frugalware-git] rox: tasklist-0.6-1-i686 Message-ID: <20080618125608.A259C1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=516f8a8f928b0f43d513c0fdafbf608e5a94ee12 commit 516f8a8f928b0f43d513c0fdafbf608e5a94ee12 Author: James Buren Date: Wed Jun 18 07:55:54 2008 -0500 tasklist-0.6-1-i686 * updated with a fork from original, this is maintained while * other appears to be dormant diff --git a/source/rox-extra/tasklist/FrugalBuild b/source/rox-extra/tasklist/FrugalBuild index ba935ce..e832f21 100644 --- a/source/rox-extra/tasklist/FrugalBuild +++ b/source/rox-extra/tasklist/FrugalBuild @@ -2,20 +2,21 @@ # Maintainer: James Buren pkgname=tasklist -pkgver=0.5 +pkgver=0.6 pkgrel=1 pkgdesc="ROX Applet for displaying a list of windows." -_F_rox_name=Tasklist +_F_rox_name=TaskList _F_rox_subdir=Applets/ +_F_rox_override=1 options=('scriptlet') Finclude rox -rodepends=('rox-lib') -depends=('libwnck') +url="http://www.realh.ukfsn.org/rox.shtml" +depends=('libwnck' 'rox-clib') groups=(${groups[@]} 'rox-applets') _F_archive_name=$_F_rox_name -up2date="Flasttar ftp://ftp.berlios.de/pub/rox4debian/apps" -source=(ftp://ftp.berlios.de/pub/rox4debian/apps/$_F_rox_name-$pkgver.tgz) +up2date="Flasttar $url" +source=(http://www.realh.ukfsn.org/rox/$_F_rox_name-$pkgver.tar.bz2) archs=('i686') -sha1sums=('695f75ea14abb48949722a7f1d56d0f873c2152a') +sha1sums=('cb00134206e624cd8616bf755b12521abd71f8c1') # optimization OK From ryuo at frugalware.org Wed Jun 18 15:04:47 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 15:04:49 2008 Subject: [Frugalware-git] rox: menu-005-1-i686 Message-ID: <20080618130447.2C5EC1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=802b61c40ff21a3b7c8242f0e89a089dbfb3cba4 commit 802b61c40ff21a3b7c8242f0e89a089dbfb3cba4 Author: James Buren Date: Wed Jun 18 08:04:21 2008 -0500 menu-005-1-i686 * redraft diff --git a/source/rox-extra/menu/FrugalBuild b/source/rox-extra/menu/FrugalBuild new file mode 100644 index 0000000..37a73e9 --- /dev/null +++ b/source/rox-extra/menu/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=menu +pkgver=005 +pkgrel=1 +pkgdesc="ROX Applet which creates a menu out of your ROX Apps." +_F_rox_name=Menu +_F_rox_subdir=Applets/ +Finclude rox +rodepends=('rox-lib') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=$_F_rox_name +up2date="Flasttar http://hayber.us/rox/applets/" +source=(http://hayber.us/rox/applets/$_F_rox_name-$pkgver.tgz) +archs=('i686') +sha1sums=('82fe1b17ed7dc9d4c2438dc1a37fccc5913ef7c8') diff --git a/source/rox-extra/menu/Menu/.DirIcon b/source/rox-extra/menu/Menu/.DirIcon new file mode 120000 index 0000000..87a7cc8 --- /dev/null +++ b/source/rox-extra/menu/Menu/.DirIcon @@ -0,0 +1 @@ +images/menu.svg \ No newline at end of file diff --git a/source/rox-extra/menu/Menu/AppInfo.xml b/source/rox-extra/menu/Menu/AppInfo.xml new file mode 100644 index 0000000..34c040f --- /dev/null +++ b/source/rox-extra/menu/Menu/AppInfo.xml @@ -0,0 +1,35 @@ + + + A Panel Menu for ROX + Ein Panelmenü für ROX + ROX 面板选单 + ROX 面板選單 + + Panel applet providing a menu to start ROX apps. + 005 (12-Oct-2005) + + Ken Hayber <ken@hayber.us>, Christopher Arndt <chris@chrisarndt.de> + + GNU General Public License + http://www.hayber.us/rox/Menu + + + Stellt ein Menü, um ROX-Anwendungen zu starten, auf dem Panel bereit. + + + + + ROX 面板上程式选单 + + + + + + + ROX 面板上程式選單集 + + + + + + diff --git a/source/rox-extra/menu/Menu/AppRun b/source/rox-extra/menu/Menu/AppRun new file mode 100755 index 0000000..b8dd8de --- /dev/null +++ b/source/rox-extra/menu/Menu/AppRun @@ -0,0 +1,36 @@ +#!/usr/bin/env python + +import findrox; findrox.version(1, 9, 13) +import rox, os, sys, gtk + +__builtins__._ = rox.i18n.translation(os.path.join(rox.app_dir, 'Messages')) + +import rmenu + +def add_to_panel(): + """Add applet to panel if user confirms """ + + if rox.confirm(_("Menu is meant to be used as a ROX panel applet only. " + "You can drag it to your panel to run it.\n\nDo you want me to add it " + "to the panel now?"), gtk.STOCK_ADD, _("Add to panel")): + import panel, roxsoap + side = panel.get_panel_orientation() + if side: + proxy = roxsoap.RoxSOAPProxy() + proxy.PanelAdd(Side=side, Path=rox.app_dir) + else: + rox.croak(_("You don't seem to have a panel on your default " + "display. Please open a ROX panel and try again")) + +if sys.argv[0].endswith('AppRun'): + add_to_panel() +elif sys.argv[0].endswith('AppletRun'): + try: + main = rmenu.RoxMenu(long(sys.argv[1])) + main.show_all() + except (IndexError, ValueError): + add_to_panel() + except: + rox.report_exception() + +rox.mainloop() diff --git a/source/rox-extra/menu/Menu/AppletRun b/source/rox-extra/menu/Menu/AppletRun new file mode 100755 index 0000000..b8dd8de --- /dev/null +++ b/source/rox-extra/menu/Menu/AppletRun @@ -0,0 +1,36 @@ +#!/usr/bin/env python + +import findrox; findrox.version(1, 9, 13) +import rox, os, sys, gtk + +__builtins__._ = rox.i18n.translation(os.path.join(rox.app_dir, 'Messages')) + +import rmenu + +def add_to_panel(): + """Add applet to panel if user confirms """ + + if rox.confirm(_("Menu is meant to be used as a ROX panel applet only. " + "You can drag it to your panel to run it.\n\nDo you want me to add it " + "to the panel now?"), gtk.STOCK_ADD, _("Add to panel")): + import panel, roxsoap + side = panel.get_panel_orientation() + if side: + proxy = roxsoap.RoxSOAPProxy() + proxy.PanelAdd(Side=side, Path=rox.app_dir) + else: + rox.croak(_("You don't seem to have a panel on your default " + "display. Please open a ROX panel and try again")) + +if sys.argv[0].endswith('AppRun'): + add_to_panel() +elif sys.argv[0].endswith('AppletRun'): + try: + main = rmenu.RoxMenu(long(sys.argv[1])) + main.show_all() + except (IndexError, ValueError): + add_to_panel() + except: + rox.report_exception() + +rox.mainloop() diff --git a/source/rox-extra/menu/Menu/Help/COPYING b/source/rox-extra/menu/Menu/Help/COPYING new file mode 100644 index 0000000..60549be --- /dev/null +++ b/source/rox-extra/menu/Menu/Help/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/source/rox-extra/menu/Menu/Help/Changes b/source/rox-extra/menu/Menu/Help/Changes new file mode 100644 index 0000000..ba8bbab --- /dev/null +++ b/source/rox-extra/menu/Menu/Help/Changes @@ -0,0 +1,60 @@ +* Mon Sep 19 2005 Christopher Arndt +- make symlinks for directories work (replace os.walk() by own version) + +* Sat Sep 17 2005 Christopher Arndt +- scale icons after loading +- icons for normal files +- fixed bug that prevented menu rebuilding after options changed + +* Fri Sep 16 2005 Christopher Arndt +- refactored process_dir() again +- implemented menu and icon caching (needs testing) +- only rebuild menu when option box is closed + +* Tue Sep 13 2005 Christopher Arndt +- options fort sorting and icon display +- delay infowin import until needed +- replace process_dir() fnction with non-recursive version + +* Tue Sep 06 2005 Christopher Arndt +- fix window reference counting error +- let Python >= 2.4 use 'key' keyword to sort() +- new module roxsoap.py + +* Sun Sep 04 2005 Christopher Arndt +- handle multiple email addresses with infowin + +* Sat Sep 03 2005 Christopher Arndt +- infowin refactoring +- fix error handling in App(let)Run +- longer README + +* Fri Sep 02 2005 Christopher Arndt +- new module for infowin +- rescale icon for infowin +- add Help button in infowin +- fixed typo in AppInfo.xml +- fixed code to detect if running as an applet in AppRun +- more docstrings + +* Thu Sep 01 2005 Christopher Arndt +- German translation +- German AppInfo.xml +- rename method "event_callback" to "resize" +- integrate changes from Ken Hayber's version 003 + +* Wed Aug 31 2005 Christopher Arndt +- handle unvalid app dirs gracefully +- recursivley scan directories for menu entries +- sort entries (folders first, case-insensitive) +- change indentation to 4 spaces +- some docstring corrections +- menu option for refreshing app menu to right-click popup +- replaced InfoWin with own version +- added Homepage and better Purpose tags to AppInfo.xml +- middle-mouse click opens App folder in ROX-Filer +- Better applet tooltip +- handle option changes +- destroy infowin (if exists) when quitting +- AppRun with error message +- menu option for opening the apps folder with ROX-Filer diff --git a/source/rox-extra/menu/Menu/Help/README b/source/rox-extra/menu/Menu/Help/README new file mode 100644 index 0000000..2aadf8c --- /dev/null +++ b/source/rox-extra/menu/Menu/Help/README @@ -0,0 +1,65 @@ + Menu + A simple menu applet for the ROX panel. + by Ken Hayber and Christopher Arndt + +Brief +~~~~~ +Menu provides a start menu for all your ROX applications on the ROX panel. + +It will examine the directory containing your ROX applications (default ~/Apps), +recursively reading all subdirectories, and build a matching menu tree. It will +then display an icon on the panel. Click on the icon to access the menu. + +Subdirectories will appear as submenus of your main menu so you can organize +your application collection nicely. Empty directories are ignored and do not +appear in the menu. All other files (excluding those whose names begin with a +dot) appear as normal menu entries. When you choose an item from the menu, the +file it points to will be opened by the ROX filer. This allows you to put any +file type that ROX can handle in the menu, not just applications. + +Conditions +~~~~~~~~~~ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Please report any bugs to me, Ken Hayber + + +Requirements +~~~~~~~~~~~~ +ROX 2.1.0 or higher +ROX-Lib2 2.0.0 or higher +Pygtk 1.9.18 or better? +Python 2.3 or better + + +Instructions +~~~~~~~~~~~~ +Drag the AppIcon to the Panel to run as an applet. +Left click to show the application menu. +Middle click to open the directory with your ROX applications in a filer window. +Middle click + drag to position the applet. +Right click for the options menu. From there you can: + - open the directory with your ROX applications in a filer window. + - request the applet to rebuild the application menu from disk. + - view the program (version number, authors, website etc.) + - open the option edit dialog to set the directory containing your ROX + applications. + - close the applet. + +Email the authors for help :) + Ken Hayber + Christopher Arndt + +Written in Python, pygtk and ROX-Lib2. diff --git a/source/rox-extra/menu/Menu/Help/TODO b/source/rox-extra/menu/Menu/Help/TODO new file mode 100644 index 0000000..2b47337 --- /dev/null +++ b/source/rox-extra/menu/Menu/Help/TODO @@ -0,0 +1,13 @@ +TODO items for Menu + +* Sort the list? - done +* Folders first? - done +* Multiple folder depths (currently only one level deep) - done +* Help menu item (or button in InfoWin?) - done +* resize icon for InfoWin - done + +* Scan multiple Apps directories (e.g. ~ and /usr/) +* Use ROX-Lib to determine if we have an AppDir or not instead of looking for the AppRun file? +* Bigger icons +* options for sort behaviour +* figure out how to have icons on submenus diff --git a/source/rox-extra/menu/Menu/Messages/de.gmo b/source/rox-extra/menu/Menu/Messages/de.gmo new file mode 100644 index 0000000..f909ef9 Binary files /dev/null and b/source/rox-extra/menu/Menu/Messages/de.gmo differ diff --git a/source/rox-extra/menu/Menu/Messages/de.po b/source/rox-extra/menu/Menu/Messages/de.po new file mode 100644 index 0000000..d367c84 --- /dev/null +++ b/source/rox-extra/menu/Menu/Messages/de.po @@ -0,0 +1,127 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR ORGANIZATION +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: Menu 002\n" +"POT-Creation-Date: 2005-09-14 15:38+IST\n" +"PO-Revision-Date: 2005-09-01 01:31+IST\n" +"Last-Translator: Chris Arndt \n" +"Language-Team: Chris Arndt >\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" + +#: infowin.py:91 +msgid "Info" +msgstr "Info" + +#: tips:5 +msgid "Sort the menu entries in alphabetical order." +msgstr "Sortiere die Meneintrge in alphabetischer Reihenfolge." + +#: infowin.py:45 +msgid "About" +msgstr "ber" + +#: rmenu.py:336 +msgid "Options..." +msgstr "Optionen..." + +#: tips:2 +msgid "Path" +msgstr "Pfad" + +#: tips:3 +msgid "" +"The location of your Apps folder. (This should become a path at some point)." +msgstr "Der Pfad zu Ihrem Anwendungsordner." + +#: rmenu.py:247 +msgid "" +"Could not read your application directory.\n" +"\n" +"Please set the path to your Apps folder in the options!" +msgstr "" +"Konnte den Anwendungsordner nicht lesen.\n" +"\n" +"Bitte setzen Sie den Pfad zu Ihrem Anwendungsordner in den Optionen!" + +#: tips:1 +msgid "Menu" +msgstr "Men" + +#: tips:4 +msgid "Sort menu entries" +msgstr "Men sortieren" + +#: AppRun:15 +msgid "Add to panel" +msgstr "Zum Panel hinzufgen" + +#: rmenu.py:334 +msgid "Info..." +msgstr "ber..." + +#: tips:6 +msgid "Use icons" +msgstr "Verwende Symbole" + +#: AppRun:22 +msgid "" +"You don't seem to have a panel on your default display. Please open a ROX " +"panel and try again" +msgstr "" +"Anscheinend haben Sie kein Panel auf Ihrem Standarddisplay. Bitte ffen Sie " +"ein ROX-Panel und versuchen Sie es erneut." + +#: rmenu.py:331 +msgid "Refresh menu" +msgstr "Lese Men erneut ein" + +#: rmenu.py:349 +msgid "" +"Could not open your application directory.\n" +"\n" +"Please set the path to your Apps folder in the options!" +msgstr "" +"Konnte den Anwendungsordner nicht ffnen.\n" +"\n" +"Bitte setzen Sie den Pfad zu Ihrem Anwendungsordner in den Optionen!" + +#: rmenu.py:339 +msgid "Close" +msgstr "Schliee" + +#: rmenu.py:130 +msgid "" +"Application starter - click left to open menu, click right for more options." +msgstr "" +"Anwendungsstarter - klicke links, um das Men zu ffnen, klicke rechts fr " +"weitere Optionen." + +#: tips:7 tips:8 tips:9 +msgid "Display icons next to menu entries for application directories." +msgstr "Zeige Symbole neben den Meneintrgen fr Anwendungen an." + +#: rmenu.py:329 +msgid "Open apps folder" +msgstr "ffne Anwendungsordner" + +#: infowin.py:159 +msgid "Open URL <%s> with the default URL handler." +msgstr "ffne die URL <%s> mit der Standardanwendung fr URLs." + +#: AppRun:13 +msgid "" +"Menu is meant to be used as a ROX panel applet only. You can drag it to your " +"panel to run it.\n" +"\n" +"Do you want me to add it to the panel now?" +msgstr "" +"Menu kann nur als Panelapplet verwendet werden. Sie knnen es auf ein Panel " +"ziehen, um es dort hinzuzufgen.\n" +"\n" +"Wollen Sie, dass ich das Programm jetzt zum Panel hinzufge?" diff --git a/source/rox-extra/menu/Menu/Messages/dist b/source/rox-extra/menu/Menu/Messages/dist new file mode 100755 index 0000000..a637e09 --- /dev/null +++ b/source/rox-extra/menu/Menu/Messages/dist @@ -0,0 +1,8 @@ +#!/bin/sh + +echo Making all .mo files... +echo + +for FILE in *.po; do + msgfmt $FILE -o ${FILE%.po}.gmo && echo Created file $OUT OK +done diff --git a/source/rox-extra/menu/Menu/Messages/make_tips b/source/rox-extra/menu/Menu/Messages/make_tips new file mode 100755 index 0000000..6d5a13c --- /dev/null +++ b/source/rox-extra/menu/Menu/Messages/make_tips @@ -0,0 +1,49 @@ +#!/usr/bin/env python + +from xmllib import * +import string, os + +print "Extracting translatable bits from Options.xml..." + +class Parser(XMLParser): + data = "" + + def unknown_starttag(self, tag, attrs): + for x in ['title', 'label', 'end', 'unit']: + if attrs.has_key(x): + self.trans(attrs[x]) + self.data = "" + + def handle_data(self, data): + self.data = self.data + data + + def unknown_endtag(self, tag): + data = string.strip(self.data) + if data: + self.trans(data) + + def trans(self, data): + data = string.join(string.split(data, '\n'), '\\n') + if data: + out.write('_("%s")\n' % data) + +try: + os.chdir("po") +except OSError: + pass + +file = open('../Options.xml', 'rb') +out = open('../tips', 'wb') +parser = Parser() +parser.feed(file.read()) +file.close() +parser.close() +out.close() + +# file = open('../Mixer.xml', 'rb') +# out = open('../tips', 'wb') +# parser = Parser() +# parser.feed(file.read()) +# file.close() +# parser.close() +# out.close() diff --git a/source/rox-extra/menu/Menu/Messages/update-po b/source/rox-extra/menu/Menu/Messages/update-po new file mode 100755 index 0000000..5a28d44 --- /dev/null +++ b/source/rox-extra/menu/Menu/Messages/update-po @@ -0,0 +1,17 @@ +#!/bin/sh + +echo Extracting messages from source files... +echo + +python ./make_tips +(cd ..; pygettext AppRun *.py tips) + +echo +echo Updating all .po files... +echo + +for FILE in *.po; do + echo -n "Updating '$FILE' translation" + mv $FILE $FILE.old + msgmerge $FILE.old ../messages.pot > $FILE +done diff --git a/source/rox-extra/menu/Menu/Messages/zh_CN.gmo b/source/rox-extra/menu/Menu/Messages/zh_CN.gmo new file mode 100644 index 0000000..49b7205 Binary files /dev/null and b/source/rox-extra/menu/Menu/Messages/zh_CN.gmo differ diff --git a/source/rox-extra/menu/Menu/Messages/zh_CN.po b/source/rox-extra/menu/Menu/Messages/zh_CN.po new file mode 100644 index 0000000..d3cb878 --- /dev/null +++ b/source/rox-extra/menu/Menu/Messages/zh_CN.po @@ -0,0 +1,130 @@ +# Menu Chinese Translation. +# Copyright @ 2003 Free Software Foundation, Inc. +# Current translator: Babyfai Cheung, 2004. +msgid "" +msgstr "" +"Project-Id-Version: Menu-004\n" +"POT-Creation-Date: 2005-09-20 21:35+HKT\n" +"PO-Revision-Date: 2004-12-07 19:43+0300\n" +"Last-Translator: Babyfai Cheung\n" +"Language-Team: none\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: infowin.py:91 +msgid "Info" +msgstr "资讯" + +#: tips:5 +msgid "Sort the menu entries in alphabetical order." +msgstr "" + +#: infowin.py:45 +msgid "About" +msgstr "关於" + +#: rmenu.py:336 +msgid "Options..." +msgstr "选项..." + +#: tips:2 +msgid "Path" +msgstr "路径" + +#: tips:3 +msgid "" +"The location of your Apps folder. (This should become a path at some point)." +msgstr "您的 Apps 文件夹位置. (亦会成为设定的路径)." + +#: rmenu.py:247 +msgid "" +"Could not read your application directory.\n" +"\n" +"Please set the path to your Apps folder in the options!" +msgstr "" +"未能读取您的程式目录\n" +"\n" +"请在选项中，将 Apps 文件夹的路径设定！" + +#: tips:1 +msgid "Menu" +msgstr "菜单" + +#: tips:4 +msgid "Sort menu entries" +msgstr "" + +#: AppRun:15 +msgid "Add to panel" +msgstr "" + +#: rmenu.py:334 +msgid "Info..." +msgstr "资讯..." + +#: tips:6 +msgid "Use icons" +msgstr "" + +#: AppRun:22 +msgid "" +"You don't seem to have a panel on your default display. Please open a ROX " +"panel and try again" +msgstr "" + +#: rmenu.py:331 +msgid "Refresh menu" +msgstr "更新菜单" + +#: rmenu.py:349 +msgid "" +"Could not open your application directory.\n" +"\n" +"Please set the path to your Apps folder in the options!" +msgstr "" +"未能开启您的程式目录\n" +"\n" +"请在选项中，将 Apps 文件夹的路径设定！" + +#: rmenu.py:339 +msgid "Close" +msgstr "关闭" + +#: rmenu.py:130 +msgid "" +"Application starter - click left to open menu, click right for more options." +msgstr "程式开启器 - 左击打开菜单，右击其他选项。" + +#: tips:7 tips:8 tips:9 +msgid "Display icons next to menu entries for application directories." +msgstr "" + +#: rmenu.py:329 +msgid "Open apps folder" +msgstr "开启程式文件夹" + +#: infowin.py:159 +msgid "Open URL <%s> with the default URL handler." +msgstr "以预设浏览器开启 URL <%s>" + +#: AppRun:13 +#, fuzzy +msgid "" +"Menu is meant to be used as a ROX panel applet only. You can drag it to your " +"panel to run it.\n" +"\n" +"Do you want me to add it to the panel now?" +msgstr "" +"此菜单只可放在 ROX 面板上启动\n" +"\n" +"请将程式拖放到面板上！" + +#~ msgid "" +#~ "Run as an applet but got no valid file descriptor.\n" +#~ "\n" +#~ "This should not happen." +#~ msgstr "" +#~ "Run as an applet but got no valid file descriptor.\n" +#~ "\n" +#~ "This should not happen." diff --git a/source/rox-extra/menu/Menu/Messages/zh_TW.gmo b/source/rox-extra/menu/Menu/Messages/zh_TW.gmo new file mode 100644 index 0000000..79fd326 Binary files /dev/null and b/source/rox-extra/menu/Menu/Messages/zh_TW.gmo differ diff --git a/source/rox-extra/menu/Menu/Messages/zh_TW.po b/source/rox-extra/menu/Menu/Messages/zh_TW.po new file mode 100644 index 0000000..9ec5f3a --- /dev/null +++ b/source/rox-extra/menu/Menu/Messages/zh_TW.po @@ -0,0 +1,130 @@ +# Menu Chinese Translation. +# Copyright @ 2003 Free Software Foundation, Inc. +# Current translator: Babyfai Cheung, 2004. +msgid "" +msgstr "" +"Project-Id-Version: Menu-004\n" +"POT-Creation-Date: 2005-09-20 21:35+HKT\n" +"PO-Revision-Date: 2004-12-07 19:43+0300\n" +"Last-Translator: Babyfai Cheung\n" +"Language-Team: none\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: infowin.py:91 +msgid "Info" +msgstr "資訊" + +#: tips:5 +msgid "Sort the menu entries in alphabetical order." +msgstr "" + +#: infowin.py:45 +msgid "About" +msgstr "關於" + +#: rmenu.py:336 +msgid "Options..." +msgstr "選項..." + +#: tips:2 +msgid "Path" +msgstr "路徑" + +#: tips:3 +msgid "" +"The location of your Apps folder. (This should become a path at some point)." +msgstr "您的 Apps 資料夾位置. (亦會成為設定的路徑)." + +#: rmenu.py:247 +msgid "" +"Could not read your application directory.\n" +"\n" +"Please set the path to your Apps folder in the options!" +msgstr "" +"未能讀取您的程式目錄\n" +"\n" +"請在選項中，將 Apps 資料夾的路徑設定！" + +#: tips:1 +msgid "Menu" +msgstr "選單" + +#: tips:4 +msgid "Sort menu entries" +msgstr "" + +#: AppRun:15 +msgid "Add to panel" +msgstr "" + +#: rmenu.py:334 +msgid "Info..." +msgstr "資訊..." + +#: tips:6 +msgid "Use icons" +msgstr "" + +#: AppRun:22 +msgid "" +"You don't seem to have a panel on your default display. Please open a ROX " +"panel and try again" +msgstr "" + +#: rmenu.py:331 +msgid "Refresh menu" +msgstr "更新選單" + +#: rmenu.py:349 +msgid "" +"Could not open your application directory.\n" +"\n" +"Please set the path to your Apps folder in the options!" +msgstr "" +"未能開啟您的程式目錄\n" +"\n" +"請在選項中，將 Apps 資料夾的路徑設定！" + +#: rmenu.py:339 +msgid "Close" +msgstr "關閉" + +#: rmenu.py:130 +msgid "" +"Application starter - click left to open menu, click right for more options." +msgstr "程式開啟器 - 左擊打開選單，右擊其他選項。" + +#: tips:7 tips:8 tips:9 +msgid "Display icons next to menu entries for application directories." +msgstr "" + +#: rmenu.py:329 +msgid "Open apps folder" +msgstr "開啟程式資料夾" + +#: infowin.py:159 +msgid "Open URL <%s> with the default URL handler." +msgstr "以預設瀏覽器開啟 URL <%s>" + +#: AppRun:13 +#, fuzzy +msgid "" +"Menu is meant to be used as a ROX panel applet only. You can drag it to your " +"panel to run it.\n" +"\n" +"Do you want me to add it to the panel now?" +msgstr "" +"此選單只可放在 ROX 面板上啟動\n" +"\n" +"請將程式拖放到面板上！" + +#~ msgid "" +#~ "Run as an applet but got no valid file descriptor.\n" +#~ "\n" +#~ "This should not happen." +#~ msgstr "" +#~ "Run as an applet but got no valid file descriptor.\n" +#~ "\n" +#~ "This should not happen." diff --git a/source/rox-extra/menu/Menu/Options.xml b/source/rox-extra/menu/Menu/Options.xml new file mode 100644 index 0000000..2af9eea --- /dev/null +++ b/source/rox-extra/menu/Menu/Options.xml @@ -0,0 +1,10 @@ + + +
    + + The location of your Apps folder. (This should become a path at some point). + + Sort the menu entries in alphabetical order. + Display icons next to menu entries for application directories. +
    +     diff --git a/source/rox-extra/menu/Menu/cache.py b/source/rox-extra/menu/Menu/cache.py new file mode 100644 index 0000000..7780715 --- /dev/null +++ b/source/rox-extra/menu/Menu/cache.py @@ -0,0 +1,100 @@ +import sys +import time +import shelve +import cPickle +import gtk +from os.path import getmtime + +# exceptions +class CacheMiss(Exception): + pass + +# helper functions +def pixbuf_serialize(pb): + """Serialize a pixbuf instance to a pickle""" + + return cPickle.dumps((pb.get_pixels(), pb.get_colorspace(), + pb.get_has_alpha(), pb.get_bits_per_sample(), pb.get_width(), + pb.get_height(), pb.get_rowstride()), 2) + +def pixbuf_restore(s): + """Create a pixbuf instance from the serialized pixel data""" + + data = cPickle.loads(s) + return gtk.gdk.pixbuf_new_from_data(*data) + +# classes +class CacheManager: + + def __init__(self, cache_file, debug=False): + self.cache_file = cache_file + self.debug = debug + self.open_cache() + + def _debug(self, *msg): + if self.debug: + print >>sys.stderr, " ".join(map(str, msg)) + + def open_cache(self): + self.cache = shelve.open(self.cache_file, protocol=2) + self._debug('CACHE open:', self.cache_file) + + def store_menu(self, root, menu): + """Save menu structure to disk cache.""" + + try: + self.cache[root] = (getmtime(root), menu) + self._debug('CACHE store:', root) + except cPickle.PicklingError: + try: del self.cache[root] + except: pass + + def load_menu(self, root): + """Try to load the menu structure from disk cache.""" + + try: + timestamp, menu = self.cache[root] + if timestamp <= getmtime(root): + self._debug('CACHE hit:', root) + return menu + else: + del self.cache[root] + msg = "Cached menu for '%s' out-of-date" % root + self._debug('CACHE miss:', msg) + raise CacheMiss, msg + except KeyError: + msg = "Directory '%s' not in cache." % root + self._debug('CACHE miss:', msg) + raise CacheMiss, msg + + def store_pixbuf(self, name, pb, timestamp=None): + if timestamp is None: + timestamp = time.time() + self.cache['icon:'+name] = (timestamp, pixbuf_serialize(pb)) + self._debug('CACHE store:', name, timestamp) + + def load_pixbuf(self, name, if_newer=0): + try: + timestamp, data = self.cache['icon:'+name] + if timestamp < if_newer: + del self.cache['icon:'+name] + msg = "Cached icon '%s' out-of-date." % name + self._debug('CACHE miss:', msg, timestamp) + raise CacheMiss, msg + self._debug('CACHE hit:', name) + return pixbuf_restore(data) + except KeyError: + msg = "Icon '%s' not in cache." % name + self._debug('CACHE miss:', msg) + raise CacheMiss, msg + + def sync(self): + try: + self.cache.sync() + self._debug('CACHE sync') + except AttributeError: + self._debug('CACHE sync not supported') + + def __del__(self): + self._debug('CACHE close:', self.cache_file) + self.cache.close() diff --git a/source/rox-extra/menu/Menu/findrox.py b/source/rox-extra/menu/Menu/findrox.py new file mode 100644 index 0000000..823b644 --- /dev/null +++ b/source/rox-extra/menu/Menu/findrox.py @@ -0,0 +1,110 @@ +# Most of the common code needed by ROX applications is in ROX-Lib2. +# Except this code, which is needed to find ROX-Lib2 in the first place! + +# Just make sure you import findrox before importing anything inside +# ROX-Lib2... + +import os, sys +from os.path import exists +import string + +def version(major, minor, micro): + """Find ROX-Lib2, with a version >= (major, minor, micro), and + add it to sys.path. If version is missing or too old, either + prompt the user, or (if possible) upgrade it automatically. + If 'rox' is already in PYTHONPATH, just use that (assume the injector + is being used).""" + try: + import rox + except ImportError: + pass + else: + #print "Using ROX-Lib in PYTHONPATH" + if (major, minor, micro) > rox.roxlib_version: + print >>sys.stderr, "WARNING: ROX-Lib version " \ + "%d.%d.%d requested, but using version " \ + "%d.%d.%d from %s" % \ + (major, minor, micro, + rox.roxlib_version[0], + rox.roxlib_version[1], + rox.roxlib_version[2], + rox.__file__) + return + + if not os.getenv('ROXLIB_DISABLE_ZEROINSTALL') and os.path.exists('/uri/0install/rox.sourceforge.net'): + # We're using ZeroInstall. Good :-) + zpath = '/uri/0install/rox.sourceforge.net/lib/ROX-Lib2/' \ + 'latest' + if os.path.exists(zpath): + vs = os.readlink(zpath).split('-')[-1] + v = map(int, vs.split('.')) + if v[0] < major or v[1] < minor or v[2] < micro: + if os.system('0refresh rox.sourceforge.net'): + report_error('Using ROX-Lib in Zero Install, but cached version (%s) is too old (need %d.%d.%d) and updating failed (is zero-install running?)' % (vs, major, minor, micro)) + sys.path.append(zpath + '/python') + return + print >>sys.stderr, "Using Zero Install, but failed to " \ + "fetch", zpath, "-- trying non-0install system." + + try: + path = os.environ['LIBDIRPATH'] + paths = string.split(path, ':') + except KeyError: + paths = [os.environ['HOME'] + '/lib', + '/usr/local/lib', '/usr/lib' ] + + for p in paths: + p = os.path.join(p, 'ROX-Lib2') + if exists(p): + # TODO: check version is new enough + sys.path.append(os.path.join(p, 'python')) + import rox + if major == 1 and minor == 9 and micro < 10: + return # Can't check version + if not hasattr(rox, 'roxlib_version'): + break + if (major, minor, micro) <= rox.roxlib_version: + return # OK + report_error("This program needs ROX-Lib2 (version %d.%d.%d) " % \ + (major, minor, micro) + "to run.\n" + \ + "I tried all of these places:\n\n" + \ + string.join(paths, '\n') + '\n\n' + \ + "ROX-Lib2 is available from:\n" + \ + "http://rox.sourceforge.net") + +def report_error(err): + "Write 'error' to stderr and, if possible, display a dialog box too." + try: + sys.stderr.write('*** ' + err + '\n') + except: + pass + try: + import pygtk; pygtk.require('2.0') + import gtk; g = gtk + except: + import gtk + win = gtk.GtkDialog() + message = gtk.GtkLabel(err + + '\n\nAlso, pygtk2 needs to be present') + win.set_title('Missing ROX-Lib2') + win.set_position(gtk.WIN_POS_CENTER) + message.set_padding(20, 20) + win.vbox.pack_start(message) + + ok = gtk.GtkButton("OK") + ok.set_flags(gtk.CAN_DEFAULT) + win.action_area.pack_start(ok) + ok.connect('clicked', gtk.mainquit) + ok.grab_default() + + win.connect('destroy', gtk.mainquit) + win.show_all() + gtk.mainloop() + else: + box = g.MessageDialog(None, g.MESSAGE_ERROR, 0, + g.BUTTONS_OK, err) + box.set_title('Missing ROX-Lib2') + box.set_position(g.WIN_POS_CENTER) + box.set_default_response(g.RESPONSE_OK) + box.run() + sys.exit(1) diff --git a/source/rox-extra/menu/Menu/images/menu.svg b/source/rox-extra/menu/Menu/images/menu.svg new file mode 100644 index 0000000..c389464 --- /dev/null +++ b/source/rox-extra/menu/Menu/images/menu.svg @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/rox-extra/menu/Menu/infowin.py b/source/rox-extra/menu/Menu/infowin.py new file mode 100644 index 0000000..4b5bcfb --- /dev/null +++ b/source/rox-extra/menu/Menu/infowin.py @@ -0,0 +1,216 @@ +# infowin.py + +__all__ = ['infowin', 'InfoWin'] + +import os, re + +import rox +from rox import g, AppInfo + +_url_re = re.compile(r'(URL:)?(\w+?://\S+)') + +def _collect_about(ai): + """Extract about information from AppInfo object in the current language.""" + + info = [] + for key in ai.about[''].keys(): + k, v = ai.getAbout(key) + if v == '': + v = ai.getAbout(key, [''])[1] + info.append((k, v.strip())) + return info + +def infowin(pname, info=None): + """Open info window for this program. + + info is a source of an AppInfo.xml file, if None then + APP_DIR/AppInfo.xml is loaded instead. + """ + + if info is None: + info = os.path.join(rox.app_dir, 'AppInfo.xml') + try: + ai = AppInfo.AppInfo(info) + except: + rox.report_exception() + return + + info = _collect_about(ai) + if os.path.isdir(os.path.join(rox.app_dir, 'Help')): + help = True + else: + help = False + try: + iw = InfoWin(pname, fields=info, help=help) + iw.set_title(_("About")) + iw.show() + return iw + except: + rox.report_exception() + +class CommonMixIn: + + def key_event(self, window, kev): + if kev.keyval == g.keysyms.Escape: + self.close() + return True + elif kev.keyval in [g.keysyms.Return, g.keysyms.KP_Enter] \ + and hasattr(self, '_ok_cb'): + self._ok_cb() + return True + return False + + def show(self): + rox.Dialog.show(self) + if self.standalone: + rox.mainloop() + + def close(self, widget=None, *args): + self.hide() + if self.standalone: + self.destroy() + return True + +class InfoWin(CommonMixIn, rox.Dialog): + """A dialog showing information such as author, version, etc.""" + + def __init__(self, pname, fields=None, icon=None, help=False, standalone=False): + rox.Dialog.__init__(self) + + if not fields: + raise ValueError, \ + "'fields' keyword must have at least one label, value pair." + self.urls = {} + self.icon_size = 64 + self.standalone = standalone + + self.set_position(g.WIN_POS_CENTER) + self.set_default_size(350,-1) + self.connect("delete_event", self.close) + self.connect('key-press-event', self.key_event) + self.set_title(_("Info")) + tooltips = g.Tooltips() + + hbox = g.HBox() + self.vbox.pack_start(hbox, False, False, 5) + hbox.show() + + try: + if not icon: + icon = os.path.join(rox.app_dir, '.DirIcon') + pixbuf = g.gdk.pixbuf_new_from_file(icon) + scaled_pixbuf = pixbuf.scale_simple(self.icon_size, + self.icon_size, g.gdk.INTERP_BILINEAR) + ic = g.Image() + ic.set_from_pixbuf(scaled_pixbuf) + hbox.pack_start(ic) + ic.show() + except: + pass + + # program name label + name = g.Label() + name.set_markup('%s' % pname) + hbox.pack_end(name) + + # use table to pack labels and descriptions + table = g.Table(len(fields), 2) + self.vbox.pack_start(table, padding=3) + + for i, (fieldname, fieldtext) in enumerate(fields): + label = g.Label("%s:" % fieldname) + label.set_alignment(1,0) + table.attach(label, 0, 1, i, i+1, xpadding=2) + + # search for URLs or email addresses + if fieldtext.find('@') > 0: + self.urls[fieldname] = [] + from parseaddrlist import parseaddrlist + for name, address in parseaddrlist(fieldtext): + if not address: continue + if not name: + name = address + self.urls[fieldname].append((name, 'mailto:%s' % address)) + else: + ul = _url_re.findall(fieldtext) + if ul: + self.urls[fieldname] = [(fieldtext, x[1]) for x in ul] + + frame = g.Frame() + frame.set_shadow_type(g.SHADOW_IN) + table.attach(frame, 1, 2, i, i+1, xpadding=0) + urls = self.urls.get(fieldname) + if urls: + hbox = g.VBox() + frame.add(hbox) + for j, (text, url) in enumerate(urls): + label = g.Label('') + label.set_markup( + '%s' % text) + evb = g.EventBox() + evb.add(label) + evb.set_events(g.gdk.BUTTON_PRESS_MASK) + evb.connect("button_press_event", self.open_url, + fieldname, j) + hbox.pack_start(evb) + evb.realize() + evb.window.set_cursor(g.gdk.Cursor(g.gdk.HAND1)) + tooltips.set_tip(evb, + _("Open URL <%s> with the default URL handler.") % url, + tip_private=None) + else: + label = g.Label('') + label.set_text(fieldtext) + label.set_selectable(True) + frame.add(label) + label.set_alignment(0.5,0) + label.set_justify(g.JUSTIFY_CENTER) + label.set_line_wrap(True) + + self.vbox.show_all() + + if help: + self.add_button(g.STOCK_HELP, g.RESPONSE_HELP) + self.add_button(g.STOCK_CLOSE, g.RESPONSE_CLOSE) + self.connect('response', self.response_cb) + self.set_default_response(g.RESPONSE_CLOSE) + + def open_url(self, widget, event, name, idx): + """Open the url associated with a label with ROX url handler.""" + + try: + url = self.urls[name][idx][1] + except: + return + from rox import basedir, filer + app = basedir.load_first_config('rox.sourceforge.net', + 'MIME-types', 'text_x-uri') + try: + if os.path.islink(app): + app = os.readlink(app) + if os.path.isdir(app): + app = os.path.join(app, 'AppRun') + filer._spawn((app, url)) + except (OSError, IOError): + import threading, webbrowser + t = threading.Thread(target=webbrowser.open, args=(url, 1)) + t.setDaemon(1) + t.start() + except: + rox.report_exception() + + def response_cb(self, widget, id, *args): + """Callback for dialog buttons.""" + + if id == g.RESPONSE_CLOSE: + self.close() + elif id == g.RESPONSE_HELP: + self.open_help() + + def open_help(self, widget=None, *args): + """Open the Help directory with the filer.""" + + from rox import filer + helpdir = os.path.join(rox.app_dir, 'Help') + if os.path.isdir(helpdir): + filer.open_dir(helpdir) diff --git a/source/rox-extra/menu/Menu/messages.pot b/source/rox-extra/menu/Menu/messages.pot new file mode 100644 index 0000000..a46c67e --- /dev/null +++ b/source/rox-extra/menu/Menu/messages.pot @@ -0,0 +1,109 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR ORGANIZATION +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"PO-Revision-Date: Wed Oct 12 19:31:24 2005\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: ENCODING\n" +"Generated-By: pygettext.py 1.1\n" + + +#: infowin.py:91 +msgid "Info" +msgstr "" + +#: tips:5 +msgid "Sort the menu entries in alphabetical order." +msgstr "" + +#: infowin.py:45 +msgid "About" +msgstr "" + +#: rmenu.py:336 +msgid "Options..." +msgstr "" + +#: tips:2 +msgid "Path" +msgstr "" + +#: tips:3 +msgid "The location of your Apps folder. (This should become a path at some point)." +msgstr "" + +#: rmenu.py:247 +msgid "" +"Could not read your application directory.\n" +"\n" +"Please set the path to your Apps folder in the options!" +msgstr "" + +#: tips:1 +msgid "Menu" +msgstr "" + +#: tips:4 +msgid "Sort menu entries" +msgstr "" + +#: AppRun:15 +msgid "Add to panel" +msgstr "" + +#: rmenu.py:334 +msgid "Info..." +msgstr "" + +#: tips:6 +msgid "Use icons" +msgstr "" + +#: AppRun:22 +msgid "You don't seem to have a panel on your default display. Please open a ROX panel and try again" +msgstr "" + +#: rmenu.py:331 +msgid "Refresh menu" +msgstr "" + +#: rmenu.py:349 +msgid "" +"Could not open your application directory.\n" +"\n" +"Please set the path to your Apps folder in the options!" +msgstr "" + +#: rmenu.py:339 +msgid "Close" +msgstr "" + +#: rmenu.py:130 +msgid "Application starter - click left to open menu, click right for more options." +msgstr "" + +#: tips:7 tips:8 tips:9 +msgid "Display icons next to menu entries for application directories." +msgstr "" + +#: rmenu.py:329 +msgid "Open apps folder" +msgstr "" + +#: infowin.py:159 +msgid "Open URL <%s> with the default URL handler." +msgstr "" + +#: AppRun:13 +msgid "" +"Menu is meant to be used as a ROX panel applet only. You can drag it to your panel to run it.\n" +"\n" +"Do you want me to add it to the panel now?" +msgstr "" + diff --git a/source/rox-extra/menu/Menu/panel.py b/source/rox-extra/menu/Menu/panel.py new file mode 100644 index 0000000..4ba579f --- /dev/null +++ b/source/rox-extra/menu/Menu/panel.py @@ -0,0 +1,29 @@ +import gtk + +def find_panel_window(): + root = gtk.gdk.get_default_root_window() + wids = root.property_get('_NET_CLIENT_LIST')[2] + wl = [gtk.gdk.window_foreign_new(long(w)) for w in wids] + for w in wl: + if w is not None: + wclass = w.property_get('WM_CLASS')[2].split('\0')[:2] + if wclass[0] == 'ROX-Panel': + return w + else: + return None + +def get_panel_orientation(): + panel = find_panel_window() + if panel: + panelx, panely = panel.get_root_origin() + rect = panel.get_frame_extents() + panelw, panelh = rect.width, rect.height + if panelx == 0: + if panelw > panelh: + if panely == 0: + return "Top" + else: + return "Bottom" + return "Left" + if panelw < panelh: + return "Right" diff --git a/source/rox-extra/menu/Menu/parseaddrlist.py b/source/rox-extra/menu/Menu/parseaddrlist.py new file mode 100644 index 0000000..b9f707f --- /dev/null +++ b/source/rox-extra/menu/Menu/parseaddrlist.py @@ -0,0 +1,44 @@ +import email.Utils + +def tokensplit(s, splitchars=None, quotes='"\''): + """Split a string into tokens at every occcurence of splitchars. + + splitchars within quotes are disregarded. + """ + + if splitchars is None: + import string + splitchars = string.whitespace + inquote = None + l = []; token = [] + for c in s: + if c in quotes: + if c == inquote: + inquote = None + elif inquote is None: + inquote = c + if c in splitchars and inquote is None: + l.append("".join(token)) + token = [] + inquote = None + else: + token.append(c) + else: + l.append("".join(token)) + return l + +def parseaddrlist(alist): + """Parse a comma-separated list of email address into (name, mail) tuples. + """ + + l = [] + for addr in tokensplit(alist, ',', quotes='"'): + addr = addr.strip() + if addr: + l.append(email.Utils.parseaddr(addr)) + return l + + +if __name__ == '__main__': + al = '"Hacker, J. Random" , Joe O\'Donnel , luser@dau.org, alice (Alice Bobton), , ' + print parseaddrlist(al) diff --git a/source/rox-extra/menu/Menu/rmenu.py b/source/rox-extra/menu/Menu/rmenu.py new file mode 100644 index 0000000..db1e34d --- /dev/null +++ b/source/rox-extra/menu/Menu/rmenu.py @@ -0,0 +1,361 @@ +""" + rmenu.py (a application menu applet for the ROX Panel) + + Copyright 2004-2005 Kenneth Hayber , + Christopher Arndt + All rights reserved. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + + This program is distributed in the hope that it will be useful + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +""" + +# standard library modules +import sys, os, time, shelve +from os.path import dirname, exists, expanduser, join, isdir, isfile, realpath +try: + set() +except NameError: + from sets import Set as set + +# third-party modules +import rox +from rox import g, app_options, applet, choices, filer, Menu, mime +from rox.options import Option +from rox.OptionsBox import REVERT + +from cache import CacheManager, CacheMiss + +# globals +APP_NAME = 'Menu' +APP_DIR = rox.app_dir +APP_SIZE = [28, 150] + +# Options.xml processing +choices.migrate(APP_NAME, 'hayber.us') +rox.setup_app_options(APP_NAME, site='hayber.us') +Menu.set_save_name(APP_NAME, site='hayber.us') +options = dict( + apps=Option('applications', join(expanduser('~'), 'Apps')), + sort=Option('sort', True), + icons=Option('icons', True) +) + +rox.app_options.notify() + +# helper functions +def isapp(name): + """Check if file is an app dir.""" + + apprun = join(name, 'AppRun') + return isfile(apprun) and os.access(apprun, os.X_OK) + +def walk(top): + """Walk dir yielding a tuple (dir, dirnames, filenames) for every subdir. + + Simplified version of os.walk() that follows symlinked directories and + puts ROX application dirs into filenames. + """ + + try: + names = os.listdir(top) + except error, err: + return + + dirs, nondirs = [], [] + for name in names: + path = join(top, name) + # don't do hidden files + if not name.startswith('.'): + if isdir(path): + if isapp(path): + nondirs.append((name, True)) + else: + dirs.append(name) + else: + nondirs.append((name, False)) + + yield top, dirs, nondirs + for name in dirs: + for x in walk(join(top, name)): + yield x + +# classes +class RoxMenu(applet.Applet): + """A Menu Applet""" + + def __init__(self, filename, root=None): + """Initialize applet. + + filename is passed to Applet.__init__() + root is the top of the directory hierarchy that is + scanned for applications to build the menu. + """ + + applet.Applet.__init__(self, filename) + + # load the applet icon + self.image = g.Image() + self.pixbuf = g.gdk.pixbuf_new_from_file(join(APP_DIR, 'images', + 'menu.svg')) + self.image.set_from_pixbuf(self.pixbuf) + self.resize_image(8) + self.add(self.image) + + self.vertical = self.get_panel_orientation() in ('Right', 'Left') + if self.vertical: + self.set_size_request(8, -1) + else: + self.set_size_request(-1, 8) + + # use IconFactory for the icons of the menu items + self.factory = g.IconFactory() + self.factory.add_default() + # cache + self.cache_file = join(rox.basedir.save_config_path('hayber.us', + APP_NAME), 'cache' ) + self.cache = CacheManager(self.cache_file) + + # set the tooltip + tooltips = g.Tooltips() + tooltips.set_tip(self, _("Application starter - " + "click left to open menu, click right for more options."), + tip_private=None) + + # menus + if root: + self.root = root + else: + self.root = options['apps'].value + self.refresh_menu() + self.mainmenu.attach(self, self) + self.build_appmenu() + + # event handling + self.add_events(g.gdk.BUTTON_PRESS_MASK) + self.connect('button-press-event', self.button_press) + self.connect('size-allocate', self.resize) + self.connect('delete_event', self.quit) + rox.app_options.add_notify(self.get_options) + + def run_it(self, args=None): + """Open the given file with ROX.""" + + #print >>sys.stderr, args + try: + filer.spawn_rox((realpath(args),)) + except: + rox.info(args) + + def load_icon(self, name, path, isapp=False, force_reload=False): + """Try to load an icon for an application.""" + + size = mime.ICON_SIZE_SMALL + try: + if force_reload: raise CacheMiss + pb = self.cache.load_pixbuf(name) + except CacheMiss: + try: + if isapp: + for icon in ('.DirIcon', 'AppIcon.xpm'): + iconpath = join(path, icon) + if exists(iconpath): + pb = g.gdk.pixbuf_new_from_file(iconpath) + h=int(pb.get_width()*float(size)/pb.get_height()) + pb = pb.scale_simple(size, h, g.gdk.INTERP_BILINEAR) + self.cache.store_pixbuf(name, pb) + break + else: + return + else: + mtype = mime.get_type(path) + pb = mtype.get_icon(size) + except: + rox.report_exception() + print >>sys.stderr, "Can't load icon '%s'" % iconpath + return + g.stock_add([(name, name, 0, 0, "")]) + self.factory.add(name, g.IconSet(pixbuf=pb)) + + def process_dir(self, directory): + """Walk a directory and build main menu. + + Directories will be submenus. Empty directories are ignored. + Normal files and app dirs are added as normal menu items. + """ + + menu = []; menu_append = menu.append + for curdir, dirs, files in walk(directory): + if options['sort'].int_value: + sdirs = [(x.lower(), x) for x in dirs] + sdirs.sort() + dirs[:] = [x[1] for x in sdirs] + dirs.reverse() + files = [(x[0].lower(), x) for x in files] + files.sort() + files = [x[1] for x in files] + files.reverse() + for file in files: + path = join(curdir, file[0]) + leaf = path[len(directory):] + if options['icons'].int_value: + self.load_icon(leaf, path, file[1], force_reload=True) + menu_append(Menu.Action(leaf, + 'run_it', '', leaf, values=(path,))) + else: + menu_append(Menu.Action(leaf, + 'run_it', '', None, values=(path,))) + menu.reverse() + return menu + + def resize(self, widget, rectangle): + """Called when the panel sends a size.""" + + if self.vertical: + size = rectangle[2] + else: + size = rectangle[3] + if size != self.size: + self.resize_image(size) + + def resize_image(self, size): + """Resize the application image.""" + + # I like the look better with the -4, there is no technical + # reason for it. + scaled_pixbuf = self.pixbuf.scale_simple(size-4, size-4, + g.gdk.INTERP_BILINEAR) + self.image.set_from_pixbuf(scaled_pixbuf) + self.size = size + + def button_press(self, window, event): + """Handle mouse clicks by popping up the matching menu.""" + + if event.button == 1: + if self.mainmenu_items: + self.mainmenu.popup(self, event, self.position_menu) + else: + rox.alert(_("Could not read your application directory.\n\nPlease set the path to your Apps folder in the options!")) + elif event.button == 2: + self.open_app_folder() + elif event.button == 3: + self.appmenu.popup(self, event, self.position_menu) + + def get_panel_orientation(self): + """Return panel orientation and margin for displaying a popup menu. + + Position in ('Top', 'Bottom', 'Left', 'Right'). + """ + + pos = self.socket.property_get('_ROX_PANEL_MENU_POS', 'STRING', g.FALSE) + if pos: pos = pos[2] + if pos: + side, margin = pos.split(',') + margin = int(margin) + else: + side, margin = None, 2 + return side + + def get_options(self, widget=None, rebuild=False, response=False): + """Used as the notify callback when options change.""" + + if response: + # option box closed by button + if rebuild == REVERT: + return + elif not rebuild: + # option box still open + return + self.root = options['apps'].value + for o in ('apps', 'sort', 'icons'): + if options[o].has_changed: + rebuild = True + break + if rebuild: + self.refresh_menu(True) + + def show_options(self, button=None): + """Open the options edit dialog.""" + rox.edit_options() + rox._options_box.connect_after('destroy', self.get_options, True) + rox._options_box.connect_after('response', self.get_options, True) + + def get_info(self): + """Display an InfoWin box.""" + + iw = getattr(self, 'iw', None) + if not iw: + from infowin import infowin + self.iw = iw = infowin(APP_NAME) + iw.show() + + def refresh_menu(self, force_reload=False): + """Rebuild the menu from disk.""" + + #stime = time.time() + if self.root and isdir(self.root): + try: + if force_reload: raise CacheMiss + self.mainmenu_items = self.cache.load_menu(self.root) + for e in self.mainmenu_items: + if e.stock: + self.load_icon(e.stock, join(self.root, e.stock)) + except CacheMiss: + self.mainmenu_items = self.process_dir(self.root) + self.cache.store_menu(self.root, self.mainmenu_items) + self.cache.sync() + else: + self.mainmenu_items = [] + self.mainmenu = Menu.Menu('main', self.mainmenu_items) + #etime = time.time() + #print >>sys.stderr, "Refresh time(ms): %.2f, Menu leaves: %i" % \ + # ((etime-stime)*1000, len(self.mainmenu_items)) + + def build_appmenu(self): + """Build the right-click app menu.""" + + self.appmenu_items = [] + i_append = self.appmenu_items.append + i_append(Menu.Action( + _('Open apps folder'), 'open_app_folder', '', g.STOCK_JUMP_TO)) + i_append(Menu.Action( + _('Refresh menu'), 'refresh_menu', '', g.STOCK_REFRESH, (True,))) + i_append(Menu.Separator()) + i_append(Menu.Action( + _('Info...'), 'get_info', '', g.STOCK_DIALOG_INFO)) + i_append(Menu.Action( + _('Options...'), 'show_options', '', g.STOCK_PREFERENCES)) + i_append(Menu.Separator()) + i_append(Menu.Action( + _('Close'), 'quit', '', g.STOCK_CLOSE)) + self.appmenu = Menu.Menu('other', self.appmenu_items) + self.appmenu.attach(self, self) + + def open_app_folder(self): + """Open the folder comtaining the appliocations with ROX-Filer.""" + + if self.root and isdir(self.root): + filer.open_dir(self.root) + else: + rox.alert(_("Could not open your application directory.\n\nPlease set the path to your Apps folder in the options!")) + + def quit(self, *args): + """Quit applet and close everything.""" + + del self.cache + try: + self.iw.destroy() + except AttributeError: + pass + except: + rox.report_exception() + self.destroy() diff --git a/source/rox-extra/menu/Menu/roxsoap.py b/source/rox-extra/menu/Menu/roxsoap.py new file mode 100644 index 0000000..82aad4c --- /dev/null +++ b/source/rox-extra/menu/Menu/roxsoap.py @@ -0,0 +1,170 @@ +#!/usr/bin/env python + +"""A quick-and-dirty helper module to do SOAP RPCs to ROX-Filer. + +Usage: +>>> proxy = RoxSOAPProxy() +>>> proxy.Version() + +To see, which SOAP RPC calls are supported: +>>> print proxy._methods + +For the method arguments, please see the ROX manual (appendix C). + +If a method takes arguments, you have to specify them as keyword arguments +(case-sensitive!): +>>> proxy.FileType(Filename='movie.avi') +(u'video/x-msvideo',) + +Only the following types are supported as arguments values: +- (Unicode) strings +- Lists of (unicode) strings +- All other types will be converted to unicode strings, which may not be + what you want. Boolean types will work, though. + +All methods return a tuple of unicode strings or None. +""" + +import sys +import os +from xml.dom import minidom + +__all__ = ['RoxSOAPProxy', 'SOAPRPCError'] + +__author__ = "Christopher Arndt" +__version__ = "0.2" +__date__ = "2005-09-19" +__copyright__ = "Python license" + +class SOAPRPCError(Exception): + pass + +class curry: + """Curry a callable with default arguments and return it as a new callable. + """ + + def __init__(self, callable, *args, **kwargs): + self.callable = callable + self.pending = args[:] + self.kwargs = kwargs.copy() + + def __call__(self, *args, **kwargs): + if kwargs and self.kwargs: + kw = self.kwargs.copy() + kw.update(kwargs) + else: + kw = kwargs or self.kwargs + return apply(self.callable, self.pending + args, kw) + +class RoxSOAPProxy: + """A wrapper for SOAP RPC calls to ROX-Filer.""" + + _SOAP_REQUEST_TEMPLATE=u"""\ + + + + <%(method)s> +%(args)s + + + +""" + _methods = ['CloseDir', 'Copy', 'Examine', 'FileType', 'Link', 'Mount', + 'Move', 'OpenDir', 'Panel', 'PanelAdd', 'PanelRemove', 'Pinboard', + 'PinboardAdd', 'PinboardRemove', 'Run', 'SetBackdrop', 'SetBackdropApp', + 'Show', 'Unmount', 'Version' + ] + + def __init__(self, debug=False): + self.debug = debug + + def __getattr__(self, name): + if name in self._methods: + return curry(self._do_rpc, name) + else: + try: + return self.__dict__[name] + except KeyError: + raise AttributeError, \ + "SOAP RPC method '%s' not supported" % name + + def _parse_response(self, response): + """Extract the RPC results from a SOAP response""" + + xml = minidom.parseString(response) + l = [] + for el in xml.getElementsByTagName('soap:result'): + l.append("".join([n.nodeValue for n in el.childNodes])) + if l: + return tuple(l) + + def _build_request(self, method, **kwargs): + """Enter method docstring here.""" + + args = [] + for k,v in kwargs.items(): + if type(v) == type([]): + args.append(u' <%s>' % k) + for i in v: + args.append(u' %s' % unicode(i)) + args.append(u' ' % k) + else: + args.append(u" <%s>%s" % (k, unicode(v), k)) + args = "\n".join(args) + return self._SOAP_REQUEST_TEMPLATE % {'args': args, 'method': method} + + def _send_request(self, msg): + cin, cout, cerr = os.popen3('rox --RPC', 'rb+') + cin.write(msg) + cin.flush() + cin.close() + response = cout.read() + err = cerr.read() + cout.close(); cerr.close() + return response, err + + def _do_rpc(self, method, **kwargs): + msg = self._build_request(method, **kwargs) + self._debug("Send SOAP request:\n", msg) + response, err = self._send_request(msg) + if err: + self._debug("Error while doing SOAP call:\n", err) + raise SOAPRPCError, err + if response: + self._debug("Received SOAP response:\n", response) + return self._parse_response(response) + + def _debug(self, *msg): + if self.debug: + print >>sys.stderr, " ".join(map(str, msg)) + +def _test(): + proxy = RoxSOAPProxy() + print "ROX version:", proxy.Version()[0] + +if __name__ == '__main__': + __usage__ = """Usage: roxsoap.py Method [argument=value ...] + +Method is one of: %s + +See http://rox.sourceforge.net/Manual/Manual/Manual.html#soap for more +information about method signatures.""" % ", ".join(RoxSOAPProxy._methods) + + if len(sys.argv) > 1: + method = sys.argv[1] + args = {} + try: + for arg in sys.argv[2:]: + k, v = arg.split('=', 1) + args[k] = v + except ValueError: + print >>sys.stderr, __usage__ + sys.exit(1) + proxy = RoxSOAPProxy(True) + soapcall = getattr(proxy, method) + try: + print soapcall(**args) + except SOAPRPCError, msg: + print >>sys.stderr, msg + else: + _test() diff --git a/source/rox-extra/menu/Menu/tips b/source/rox-extra/menu/Menu/tips new file mode 100644 index 0000000..f995154 --- /dev/null +++ b/source/rox-extra/menu/Menu/tips @@ -0,0 +1,9 @@ +_("Menu") +_("Path") +_("The location of your Apps folder. (This should become a path at some point).") +_("Sort menu entries") +_("Sort the menu entries in alphabetical order.") +_("Use icons") +_("Display icons next to menu entries for application directories.") +_("Display icons next to menu entries for application directories.") +_("Display icons next to menu entries for application directories.") From ryuo at frugalware.org Wed Jun 18 15:05:48 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 15:05:51 2008 Subject: [Frugalware-git] rox: menu-005-1-i686 Message-ID: <20080618130548.62B731778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=f3cad0b87692e287390c020355443dabeecc79fe commit f3cad0b87692e287390c020355443dabeecc79fe Author: James Buren Date: Wed Jun 18 08:05:43 2008 -0500 menu-005-1-i686 * clean up diff --git a/source/rox-extra/menu/Menu/AppInfo.xml b/source/rox-extra/menu/Menu/AppInfo.xml deleted file mode 100644 index 34c040f..0000000 --- a/source/rox-extra/menu/Menu/AppInfo.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - A Panel Menu for ROX - Ein Panelmenü für ROX - ROX 面板选单 - ROX 面板選單 - - Panel applet providing a menu to start ROX apps. - 005 (12-Oct-2005) - - Ken Hayber <ken@hayber.us>, Christopher Arndt <chris@chrisarndt.de> - - GNU General Public License - http://www.hayber.us/rox/Menu - - - Stellt ein Menü, um ROX-Anwendungen zu starten, auf dem Panel bereit. - - - - - ROX 面板上程式选单 - - - - - - - ROX 面板上程式選單集 - - - - - - diff --git a/source/rox-extra/menu/Menu/AppRun b/source/rox-extra/menu/Menu/AppRun deleted file mode 100755 index b8dd8de..0000000 --- a/source/rox-extra/menu/Menu/AppRun +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env python - -import findrox; findrox.version(1, 9, 13) -import rox, os, sys, gtk - -__builtins__._ = rox.i18n.translation(os.path.join(rox.app_dir, 'Messages')) - -import rmenu - -def add_to_panel(): - """Add applet to panel if user confirms """ - - if rox.confirm(_("Menu is meant to be used as a ROX panel applet only. " - "You can drag it to your panel to run it.\n\nDo you want me to add it " - "to the panel now?"), gtk.STOCK_ADD, _("Add to panel")): - import panel, roxsoap - side = panel.get_panel_orientation() - if side: - proxy = roxsoap.RoxSOAPProxy() - proxy.PanelAdd(Side=side, Path=rox.app_dir) - else: - rox.croak(_("You don't seem to have a panel on your default " - "display. Please open a ROX panel and try again")) - -if sys.argv[0].endswith('AppRun'): - add_to_panel() -elif sys.argv[0].endswith('AppletRun'): - try: - main = rmenu.RoxMenu(long(sys.argv[1])) - main.show_all() - except (IndexError, ValueError): - add_to_panel() - except: - rox.report_exception() - -rox.mainloop() diff --git a/source/rox-extra/menu/Menu/AppletRun b/source/rox-extra/menu/Menu/AppletRun deleted file mode 100755 index b8dd8de..0000000 --- a/source/rox-extra/menu/Menu/AppletRun +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env python - -import findrox; findrox.version(1, 9, 13) -import rox, os, sys, gtk - -__builtins__._ = rox.i18n.translation(os.path.join(rox.app_dir, 'Messages')) - -import rmenu - -def add_to_panel(): - """Add applet to panel if user confirms """ - - if rox.confirm(_("Menu is meant to be used as a ROX panel applet only. " - "You can drag it to your panel to run it.\n\nDo you want me to add it " - "to the panel now?"), gtk.STOCK_ADD, _("Add to panel")): - import panel, roxsoap - side = panel.get_panel_orientation() - if side: - proxy = roxsoap.RoxSOAPProxy() - proxy.PanelAdd(Side=side, Path=rox.app_dir) - else: - rox.croak(_("You don't seem to have a panel on your default " - "display. Please open a ROX panel and try again")) - -if sys.argv[0].endswith('AppRun'): - add_to_panel() -elif sys.argv[0].endswith('AppletRun'): - try: - main = rmenu.RoxMenu(long(sys.argv[1])) - main.show_all() - except (IndexError, ValueError): - add_to_panel() - except: - rox.report_exception() - -rox.mainloop() diff --git a/source/rox-extra/menu/Menu/Help/COPYING b/source/rox-extra/menu/Menu/Help/COPYING deleted file mode 100644 index 60549be..0000000 --- a/source/rox-extra/menu/Menu/Help/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) 19yy - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/source/rox-extra/menu/Menu/Help/Changes b/source/rox-extra/menu/Menu/Help/Changes deleted file mode 100644 index ba8bbab..0000000 --- a/source/rox-extra/menu/Menu/Help/Changes +++ /dev/null @@ -1,60 +0,0 @@ -* Mon Sep 19 2005 Christopher Arndt -- make symlinks for directories work (replace os.walk() by own version) - -* Sat Sep 17 2005 Christopher Arndt -- scale icons after loading -- icons for normal files -- fixed bug that prevented menu rebuilding after options changed - -* Fri Sep 16 2005 Christopher Arndt -- refactored process_dir() again -- implemented menu and icon caching (needs testing) -- only rebuild menu when option box is closed - -* Tue Sep 13 2005 Christopher Arndt -- options fort sorting and icon display -- delay infowin import until needed -- replace process_dir() fnction with non-recursive version - -* Tue Sep 06 2005 Christopher Arndt -- fix window reference counting error -- let Python >= 2.4 use 'key' keyword to sort() -- new module roxsoap.py - -* Sun Sep 04 2005 Christopher Arndt -- handle multiple email addresses with infowin - -* Sat Sep 03 2005 Christopher Arndt -- infowin refactoring -- fix error handling in App(let)Run -- longer README - -* Fri Sep 02 2005 Christopher Arndt -- new module for infowin -- rescale icon for infowin -- add Help button in infowin -- fixed typo in AppInfo.xml -- fixed code to detect if running as an applet in AppRun -- more docstrings - -* Thu Sep 01 2005 Christopher Arndt -- German translation -- German AppInfo.xml -- rename method "event_callback" to "resize" -- integrate changes from Ken Hayber's version 003 - -* Wed Aug 31 2005 Christopher Arndt -- handle unvalid app dirs gracefully -- recursivley scan directories for menu entries -- sort entries (folders first, case-insensitive) -- change indentation to 4 spaces -- some docstring corrections -- menu option for refreshing app menu to right-click popup -- replaced InfoWin with own version -- added Homepage and better Purpose tags to AppInfo.xml -- middle-mouse click opens App folder in ROX-Filer -- Better applet tooltip -- handle option changes -- destroy infowin (if exists) when quitting -- AppRun with error message -- menu option for opening the apps folder with ROX-Filer diff --git a/source/rox-extra/menu/Menu/Help/README b/source/rox-extra/menu/Menu/Help/README deleted file mode 100644 index 2aadf8c..0000000 --- a/source/rox-extra/menu/Menu/Help/README +++ /dev/null @@ -1,65 +0,0 @@ - Menu - A simple menu applet for the ROX panel. - by Ken Hayber and Christopher Arndt - -Brief -~~~~~ -Menu provides a start menu for all your ROX applications on the ROX panel. - -It will examine the directory containing your ROX applications (default ~/Apps), -recursively reading all subdirectories, and build a matching menu tree. It will -then display an icon on the panel. Click on the icon to access the menu. - -Subdirectories will appear as submenus of your main menu so you can organize -your application collection nicely. Empty directories are ignored and do not -appear in the menu. All other files (excluding those whose names begin with a -dot) appear as normal menu entries. When you choose an item from the menu, the -file it points to will be opened by the ROX filer. This allows you to put any -file type that ROX can handle in the menu, not just applications. - -Conditions -~~~~~~~~~~ -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Please report any bugs to me, Ken Hayber - - -Requirements -~~~~~~~~~~~~ -ROX 2.1.0 or higher -ROX-Lib2 2.0.0 or higher -Pygtk 1.9.18 or better? -Python 2.3 or better - - -Instructions -~~~~~~~~~~~~ -Drag the AppIcon to the Panel to run as an applet. -Left click to show the application menu. -Middle click to open the directory with your ROX applications in a filer window. -Middle click + drag to position the applet. -Right click for the options menu. From there you can: - - open the directory with your ROX applications in a filer window. - - request the applet to rebuild the application menu from disk. - - view the program (version number, authors, website etc.) - - open the option edit dialog to set the directory containing your ROX - applications. - - close the applet. - -Email the authors for help :) - Ken Hayber - Christopher Arndt - -Written in Python, pygtk and ROX-Lib2. diff --git a/source/rox-extra/menu/Menu/Help/TODO b/source/rox-extra/menu/Menu/Help/TODO deleted file mode 100644 index 2b47337..0000000 --- a/source/rox-extra/menu/Menu/Help/TODO +++ /dev/null @@ -1,13 +0,0 @@ -TODO items for Menu - -* Sort the list? - done -* Folders first? - done -* Multiple folder depths (currently only one level deep) - done -* Help menu item (or button in InfoWin?) - done -* resize icon for InfoWin - done - -* Scan multiple Apps directories (e.g. ~ and /usr/) -* Use ROX-Lib to determine if we have an AppDir or not instead of looking for the AppRun file? -* Bigger icons -* options for sort behaviour -* figure out how to have icons on submenus diff --git a/source/rox-extra/menu/Menu/Messages/de.gmo b/source/rox-extra/menu/Menu/Messages/de.gmo deleted file mode 100644 index f909ef9..0000000 Binary files a/source/rox-extra/menu/Menu/Messages/de.gmo and /dev/null differ diff --git a/source/rox-extra/menu/Menu/Messages/de.po b/source/rox-extra/menu/Menu/Messages/de.po deleted file mode 100644 index d367c84..0000000 --- a/source/rox-extra/menu/Menu/Messages/de.po +++ /dev/null @@ -1,127 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: Menu 002\n" -"POT-Creation-Date: 2005-09-14 15:38+IST\n" -"PO-Revision-Date: 2005-09-01 01:31+IST\n" -"Last-Translator: Chris Arndt \n" -"Language-Team: Chris Arndt >\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" - -#: infowin.py:91 -msgid "Info" -msgstr "Info" - -#: tips:5 -msgid "Sort the menu entries in alphabetical order." -msgstr "Sortiere die Meneintrge in alphabetischer Reihenfolge." - -#: infowin.py:45 -msgid "About" -msgstr "ber" - -#: rmenu.py:336 -msgid "Options..." -msgstr "Optionen..." - -#: tips:2 -msgid "Path" -msgstr "Pfad" - -#: tips:3 -msgid "" -"The location of your Apps folder. (This should become a path at some point)." -msgstr "Der Pfad zu Ihrem Anwendungsordner." - -#: rmenu.py:247 -msgid "" -"Could not read your application directory.\n" -"\n" -"Please set the path to your Apps folder in the options!" -msgstr "" -"Konnte den Anwendungsordner nicht lesen.\n" -"\n" -"Bitte setzen Sie den Pfad zu Ihrem Anwendungsordner in den Optionen!" - -#: tips:1 -msgid "Menu" -msgstr "Men" - -#: tips:4 -msgid "Sort menu entries" -msgstr "Men sortieren" - -#: AppRun:15 -msgid "Add to panel" -msgstr "Zum Panel hinzufgen" - -#: rmenu.py:334 -msgid "Info..." -msgstr "ber..." - -#: tips:6 -msgid "Use icons" -msgstr "Verwende Symbole" - -#: AppRun:22 -msgid "" -"You don't seem to have a panel on your default display. Please open a ROX " -"panel and try again" -msgstr "" -"Anscheinend haben Sie kein Panel auf Ihrem Standarddisplay. Bitte ffen Sie " -"ein ROX-Panel und versuchen Sie es erneut." - -#: rmenu.py:331 -msgid "Refresh menu" -msgstr "Lese Men erneut ein" - -#: rmenu.py:349 -msgid "" -"Could not open your application directory.\n" -"\n" -"Please set the path to your Apps folder in the options!" -msgstr "" -"Konnte den Anwendungsordner nicht ffnen.\n" -"\n" -"Bitte setzen Sie den Pfad zu Ihrem Anwendungsordner in den Optionen!" - -#: rmenu.py:339 -msgid "Close" -msgstr "Schliee" - -#: rmenu.py:130 -msgid "" -"Application starter - click left to open menu, click right for more options." -msgstr "" -"Anwendungsstarter - klicke links, um das Men zu ffnen, klicke rechts fr " -"weitere Optionen." - -#: tips:7 tips:8 tips:9 -msgid "Display icons next to menu entries for application directories." -msgstr "Zeige Symbole neben den Meneintrgen fr Anwendungen an." - -#: rmenu.py:329 -msgid "Open apps folder" -msgstr "ffne Anwendungsordner" - -#: infowin.py:159 -msgid "Open URL <%s> with the default URL handler." -msgstr "ffne die URL <%s> mit der Standardanwendung fr URLs." - -#: AppRun:13 -msgid "" -"Menu is meant to be used as a ROX panel applet only. You can drag it to your " -"panel to run it.\n" -"\n" -"Do you want me to add it to the panel now?" -msgstr "" -"Menu kann nur als Panelapplet verwendet werden. Sie knnen es auf ein Panel " -"ziehen, um es dort hinzuzufgen.\n" -"\n" -"Wollen Sie, dass ich das Programm jetzt zum Panel hinzufge?" diff --git a/source/rox-extra/menu/Menu/Messages/dist b/source/rox-extra/menu/Menu/Messages/dist deleted file mode 100755 index a637e09..0000000 --- a/source/rox-extra/menu/Menu/Messages/dist +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -echo Making all .mo files... -echo - -for FILE in *.po; do - msgfmt $FILE -o ${FILE%.po}.gmo && echo Created file $OUT OK -done diff --git a/source/rox-extra/menu/Menu/Messages/make_tips b/source/rox-extra/menu/Menu/Messages/make_tips deleted file mode 100755 index 6d5a13c..0000000 --- a/source/rox-extra/menu/Menu/Messages/make_tips +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env python - -from xmllib import * -import string, os - -print "Extracting translatable bits from Options.xml..." - -class Parser(XMLParser): - data = "" - - def unknown_starttag(self, tag, attrs): - for x in ['title', 'label', 'end', 'unit']: - if attrs.has_key(x): - self.trans(attrs[x]) - self.data = "" - - def handle_data(self, data): - self.data = self.data + data - - def unknown_endtag(self, tag): - data = string.strip(self.data) - if data: - self.trans(data) - - def trans(self, data): - data = string.join(string.split(data, '\n'), '\\n') - if data: - out.write('_("%s")\n' % data) - -try: - os.chdir("po") -except OSError: - pass - -file = open('../Options.xml', 'rb') -out = open('../tips', 'wb') -parser = Parser() -parser.feed(file.read()) -file.close() -parser.close() -out.close() - -# file = open('../Mixer.xml', 'rb') -# out = open('../tips', 'wb') -# parser = Parser() -# parser.feed(file.read()) -# file.close() -# parser.close() -# out.close() diff --git a/source/rox-extra/menu/Menu/Messages/update-po b/source/rox-extra/menu/Menu/Messages/update-po deleted file mode 100755 index 5a28d44..0000000 --- a/source/rox-extra/menu/Menu/Messages/update-po +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -echo Extracting messages from source files... -echo - -python ./make_tips -(cd ..; pygettext AppRun *.py tips) - -echo -echo Updating all .po files... -echo - -for FILE in *.po; do - echo -n "Updating '$FILE' translation" - mv $FILE $FILE.old - msgmerge $FILE.old ../messages.pot > $FILE -done diff --git a/source/rox-extra/menu/Menu/Messages/zh_CN.gmo b/source/rox-extra/menu/Menu/Messages/zh_CN.gmo deleted file mode 100644 index 49b7205..0000000 Binary files a/source/rox-extra/menu/Menu/Messages/zh_CN.gmo and /dev/null differ diff --git a/source/rox-extra/menu/Menu/Messages/zh_CN.po b/source/rox-extra/menu/Menu/Messages/zh_CN.po deleted file mode 100644 index d3cb878..0000000 --- a/source/rox-extra/menu/Menu/Messages/zh_CN.po +++ /dev/null @@ -1,130 +0,0 @@ -# Menu Chinese Translation. -# Copyright @ 2003 Free Software Foundation, Inc. -# Current translator: Babyfai Cheung, 2004. -msgid "" -msgstr "" -"Project-Id-Version: Menu-004\n" -"POT-Creation-Date: 2005-09-20 21:35+HKT\n" -"PO-Revision-Date: 2004-12-07 19:43+0300\n" -"Last-Translator: Babyfai Cheung\n" -"Language-Team: none\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: infowin.py:91 -msgid "Info" -msgstr "资讯" - -#: tips:5 -msgid "Sort the menu entries in alphabetical order." -msgstr "" - -#: infowin.py:45 -msgid "About" -msgstr "关於" - -#: rmenu.py:336 -msgid "Options..." -msgstr "选项..." - -#: tips:2 -msgid "Path" -msgstr "路径" - -#: tips:3 -msgid "" -"The location of your Apps folder. (This should become a path at some point)." -msgstr "您的 Apps 文件夹位置. (亦会成为设定的路径)." - -#: rmenu.py:247 -msgid "" -"Could not read your application directory.\n" -"\n" -"Please set the path to your Apps folder in the options!" -msgstr "" -"未能读取您的程式目录\n" -"\n" -"请在选项中，将 Apps 文件夹的路径设定！" - -#: tips:1 -msgid "Menu" -msgstr "菜单" - -#: tips:4 -msgid "Sort menu entries" -msgstr "" - -#: AppRun:15 -msgid "Add to panel" -msgstr "" - -#: rmenu.py:334 -msgid "Info..." -msgstr "资讯..." - -#: tips:6 -msgid "Use icons" -msgstr "" - -#: AppRun:22 -msgid "" -"You don't seem to have a panel on your default display. Please open a ROX " -"panel and try again" -msgstr "" - -#: rmenu.py:331 -msgid "Refresh menu" -msgstr "更新菜单" - -#: rmenu.py:349 -msgid "" -"Could not open your application directory.\n" -"\n" -"Please set the path to your Apps folder in the options!" -msgstr "" -"未能开启您的程式目录\n" -"\n" -"请在选项中，将 Apps 文件夹的路径设定！" - -#: rmenu.py:339 -msgid "Close" -msgstr "关闭" - -#: rmenu.py:130 -msgid "" -"Application starter - click left to open menu, click right for more options." -msgstr "程式开启器 - 左击打开菜单，右击其他选项。" - -#: tips:7 tips:8 tips:9 -msgid "Display icons next to menu entries for application directories." -msgstr "" - -#: rmenu.py:329 -msgid "Open apps folder" -msgstr "开启程式文件夹" - -#: infowin.py:159 -msgid "Open URL <%s> with the default URL handler." -msgstr "以预设浏览器开启 URL <%s>" - -#: AppRun:13 -#, fuzzy -msgid "" -"Menu is meant to be used as a ROX panel applet only. You can drag it to your " -"panel to run it.\n" -"\n" -"Do you want me to add it to the panel now?" -msgstr "" -"此菜单只可放在 ROX 面板上启动\n" -"\n" -"请将程式拖放到面板上！" - -#~ msgid "" -#~ "Run as an applet but got no valid file descriptor.\n" -#~ "\n" -#~ "This should not happen." -#~ msgstr "" -#~ "Run as an applet but got no valid file descriptor.\n" -#~ "\n" -#~ "This should not happen." diff --git a/source/rox-extra/menu/Menu/Messages/zh_TW.gmo b/source/rox-extra/menu/Menu/Messages/zh_TW.gmo deleted file mode 100644 index 79fd326..0000000 Binary files a/source/rox-extra/menu/Menu/Messages/zh_TW.gmo and /dev/null differ diff --git a/source/rox-extra/menu/Menu/Messages/zh_TW.po b/source/rox-extra/menu/Menu/Messages/zh_TW.po deleted file mode 100644 index 9ec5f3a..0000000 --- a/source/rox-extra/menu/Menu/Messages/zh_TW.po +++ /dev/null @@ -1,130 +0,0 @@ -# Menu Chinese Translation. -# Copyright @ 2003 Free Software Foundation, Inc. -# Current translator: Babyfai Cheung, 2004. -msgid "" -msgstr "" -"Project-Id-Version: Menu-004\n" -"POT-Creation-Date: 2005-09-20 21:35+HKT\n" -"PO-Revision-Date: 2004-12-07 19:43+0300\n" -"Last-Translator: Babyfai Cheung\n" -"Language-Team: none\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: infowin.py:91 -msgid "Info" -msgstr "資訊" - -#: tips:5 -msgid "Sort the menu entries in alphabetical order." -msgstr "" - -#: infowin.py:45 -msgid "About" -msgstr "關於" - -#: rmenu.py:336 -msgid "Options..." -msgstr "選項..." - -#: tips:2 -msgid "Path" -msgstr "路徑" - -#: tips:3 -msgid "" -"The location of your Apps folder. (This should become a path at some point)." -msgstr "您的 Apps 資料夾位置. (亦會成為設定的路徑)." - -#: rmenu.py:247 -msgid "" -"Could not read your application directory.\n" -"\n" -"Please set the path to your Apps folder in the options!" -msgstr "" -"未能讀取您的程式目錄\n" -"\n" -"請在選項中，將 Apps 資料夾的路徑設定！" - -#: tips:1 -msgid "Menu" -msgstr "選單" - -#: tips:4 -msgid "Sort menu entries" -msgstr "" - -#: AppRun:15 -msgid "Add to panel" -msgstr "" - -#: rmenu.py:334 -msgid "Info..." -msgstr "資訊..." - -#: tips:6 -msgid "Use icons" -msgstr "" - -#: AppRun:22 -msgid "" -"You don't seem to have a panel on your default display. Please open a ROX " -"panel and try again" -msgstr "" - -#: rmenu.py:331 -msgid "Refresh menu" -msgstr "更新選單" - -#: rmenu.py:349 -msgid "" -"Could not open your application directory.\n" -"\n" -"Please set the path to your Apps folder in the options!" -msgstr "" -"未能開啟您的程式目錄\n" -"\n" -"請在選項中，將 Apps 資料夾的路徑設定！" - -#: rmenu.py:339 -msgid "Close" -msgstr "關閉" - -#: rmenu.py:130 -msgid "" -"Application starter - click left to open menu, click right for more options." -msgstr "程式開啟器 - 左擊打開選單，右擊其他選項。" - -#: tips:7 tips:8 tips:9 -msgid "Display icons next to menu entries for application directories." -msgstr "" - -#: rmenu.py:329 -msgid "Open apps folder" -msgstr "開啟程式資料夾" - -#: infowin.py:159 -msgid "Open URL <%s> with the default URL handler." -msgstr "以預設瀏覽器開啟 URL <%s>" - -#: AppRun:13 -#, fuzzy -msgid "" -"Menu is meant to be used as a ROX panel applet only. You can drag it to your " -"panel to run it.\n" -"\n" -"Do you want me to add it to the panel now?" -msgstr "" -"此選單只可放在 ROX 面板上啟動\n" -"\n" -"請將程式拖放到面板上！" - -#~ msgid "" -#~ "Run as an applet but got no valid file descriptor.\n" -#~ "\n" -#~ "This should not happen." -#~ msgstr "" -#~ "Run as an applet but got no valid file descriptor.\n" -#~ "\n" -#~ "This should not happen." diff --git a/source/rox-extra/menu/Menu/Options.xml b/source/rox-extra/menu/Menu/Options.xml deleted file mode 100644 index 2af9eea..0000000 --- a/source/rox-extra/menu/Menu/Options.xml +++ /dev/null @@ -1,10 +0,0 @@ - - -
    - - The location of your Apps folder. (This should become a path at some point). - - Sort the menu entries in alphabetical order. - Display icons next to menu entries for application directories. -
    -     diff --git a/source/rox-extra/menu/Menu/cache.py b/source/rox-extra/menu/Menu/cache.py deleted file mode 100644 index 7780715..0000000 --- a/source/rox-extra/menu/Menu/cache.py +++ /dev/null @@ -1,100 +0,0 @@ -import sys -import time -import shelve -import cPickle -import gtk -from os.path import getmtime - -# exceptions -class CacheMiss(Exception): - pass - -# helper functions -def pixbuf_serialize(pb): - """Serialize a pixbuf instance to a pickle""" - - return cPickle.dumps((pb.get_pixels(), pb.get_colorspace(), - pb.get_has_alpha(), pb.get_bits_per_sample(), pb.get_width(), - pb.get_height(), pb.get_rowstride()), 2) - -def pixbuf_restore(s): - """Create a pixbuf instance from the serialized pixel data""" - - data = cPickle.loads(s) - return gtk.gdk.pixbuf_new_from_data(*data) - -# classes -class CacheManager: - - def __init__(self, cache_file, debug=False): - self.cache_file = cache_file - self.debug = debug - self.open_cache() - - def _debug(self, *msg): - if self.debug: - print >>sys.stderr, " ".join(map(str, msg)) - - def open_cache(self): - self.cache = shelve.open(self.cache_file, protocol=2) - self._debug('CACHE open:', self.cache_file) - - def store_menu(self, root, menu): - """Save menu structure to disk cache.""" - - try: - self.cache[root] = (getmtime(root), menu) - self._debug('CACHE store:', root) - except cPickle.PicklingError: - try: del self.cache[root] - except: pass - - def load_menu(self, root): - """Try to load the menu structure from disk cache.""" - - try: - timestamp, menu = self.cache[root] - if timestamp <= getmtime(root): - self._debug('CACHE hit:', root) - return menu - else: - del self.cache[root] - msg = "Cached menu for '%s' out-of-date" % root - self._debug('CACHE miss:', msg) - raise CacheMiss, msg - except KeyError: - msg = "Directory '%s' not in cache." % root - self._debug('CACHE miss:', msg) - raise CacheMiss, msg - - def store_pixbuf(self, name, pb, timestamp=None): - if timestamp is None: - timestamp = time.time() - self.cache['icon:'+name] = (timestamp, pixbuf_serialize(pb)) - self._debug('CACHE store:', name, timestamp) - - def load_pixbuf(self, name, if_newer=0): - try: - timestamp, data = self.cache['icon:'+name] - if timestamp < if_newer: - del self.cache['icon:'+name] - msg = "Cached icon '%s' out-of-date." % name - self._debug('CACHE miss:', msg, timestamp) - raise CacheMiss, msg - self._debug('CACHE hit:', name) - return pixbuf_restore(data) - except KeyError: - msg = "Icon '%s' not in cache." % name - self._debug('CACHE miss:', msg) - raise CacheMiss, msg - - def sync(self): - try: - self.cache.sync() - self._debug('CACHE sync') - except AttributeError: - self._debug('CACHE sync not supported') - - def __del__(self): - self._debug('CACHE close:', self.cache_file) - self.cache.close() diff --git a/source/rox-extra/menu/Menu/findrox.py b/source/rox-extra/menu/Menu/findrox.py deleted file mode 100644 index 823b644..0000000 --- a/source/rox-extra/menu/Menu/findrox.py +++ /dev/null @@ -1,110 +0,0 @@ -# Most of the common code needed by ROX applications is in ROX-Lib2. -# Except this code, which is needed to find ROX-Lib2 in the first place! - -# Just make sure you import findrox before importing anything inside -# ROX-Lib2... - -import os, sys -from os.path import exists -import string - -def version(major, minor, micro): - """Find ROX-Lib2, with a version >= (major, minor, micro), and - add it to sys.path. If version is missing or too old, either - prompt the user, or (if possible) upgrade it automatically. - If 'rox' is already in PYTHONPATH, just use that (assume the injector - is being used).""" - try: - import rox - except ImportError: - pass - else: - #print "Using ROX-Lib in PYTHONPATH" - if (major, minor, micro) > rox.roxlib_version: - print >>sys.stderr, "WARNING: ROX-Lib version " \ - "%d.%d.%d requested, but using version " \ - "%d.%d.%d from %s" % \ - (major, minor, micro, - rox.roxlib_version[0], - rox.roxlib_version[1], - rox.roxlib_version[2], - rox.__file__) - return - - if not os.getenv('ROXLIB_DISABLE_ZEROINSTALL') and os.path.exists('/uri/0install/rox.sourceforge.net'): - # We're using ZeroInstall. Good :-) - zpath = '/uri/0install/rox.sourceforge.net/lib/ROX-Lib2/' \ - 'latest' - if os.path.exists(zpath): - vs = os.readlink(zpath).split('-')[-1] - v = map(int, vs.split('.')) - if v[0] < major or v[1] < minor or v[2] < micro: - if os.system('0refresh rox.sourceforge.net'): - report_error('Using ROX-Lib in Zero Install, but cached version (%s) is too old (need %d.%d.%d) and updating failed (is zero-install running?)' % (vs, major, minor, micro)) - sys.path.append(zpath + '/python') - return - print >>sys.stderr, "Using Zero Install, but failed to " \ - "fetch", zpath, "-- trying non-0install system." - - try: - path = os.environ['LIBDIRPATH'] - paths = string.split(path, ':') - except KeyError: - paths = [os.environ['HOME'] + '/lib', - '/usr/local/lib', '/usr/lib' ] - - for p in paths: - p = os.path.join(p, 'ROX-Lib2') - if exists(p): - # TODO: check version is new enough - sys.path.append(os.path.join(p, 'python')) - import rox - if major == 1 and minor == 9 and micro < 10: - return # Can't check version - if not hasattr(rox, 'roxlib_version'): - break - if (major, minor, micro) <= rox.roxlib_version: - return # OK - report_error("This program needs ROX-Lib2 (version %d.%d.%d) " % \ - (major, minor, micro) + "to run.\n" + \ - "I tried all of these places:\n\n" + \ - string.join(paths, '\n') + '\n\n' + \ - "ROX-Lib2 is available from:\n" + \ - "http://rox.sourceforge.net") - -def report_error(err): - "Write 'error' to stderr and, if possible, display a dialog box too." - try: - sys.stderr.write('*** ' + err + '\n') - except: - pass - try: - import pygtk; pygtk.require('2.0') - import gtk; g = gtk - except: - import gtk - win = gtk.GtkDialog() - message = gtk.GtkLabel(err + - '\n\nAlso, pygtk2 needs to be present') - win.set_title('Missing ROX-Lib2') - win.set_position(gtk.WIN_POS_CENTER) - message.set_padding(20, 20) - win.vbox.pack_start(message) - - ok = gtk.GtkButton("OK") - ok.set_flags(gtk.CAN_DEFAULT) - win.action_area.pack_start(ok) - ok.connect('clicked', gtk.mainquit) - ok.grab_default() - - win.connect('destroy', gtk.mainquit) - win.show_all() - gtk.mainloop() - else: - box = g.MessageDialog(None, g.MESSAGE_ERROR, 0, - g.BUTTONS_OK, err) - box.set_title('Missing ROX-Lib2') - box.set_position(g.WIN_POS_CENTER) - box.set_default_response(g.RESPONSE_OK) - box.run() - sys.exit(1) diff --git a/source/rox-extra/menu/Menu/images/menu.svg b/source/rox-extra/menu/Menu/images/menu.svg deleted file mode 100644 index c389464..0000000 --- a/source/rox-extra/menu/Menu/images/menu.svg +++ /dev/null @@ -1,259 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/rox-extra/menu/Menu/infowin.py b/source/rox-extra/menu/Menu/infowin.py deleted file mode 100644 index 4b5bcfb..0000000 --- a/source/rox-extra/menu/Menu/infowin.py +++ /dev/null @@ -1,216 +0,0 @@ -# infowin.py - -__all__ = ['infowin', 'InfoWin'] - -import os, re - -import rox -from rox import g, AppInfo - -_url_re = re.compile(r'(URL:)?(\w+?://\S+)') - -def _collect_about(ai): - """Extract about information from AppInfo object in the current language.""" - - info = [] - for key in ai.about[''].keys(): - k, v = ai.getAbout(key) - if v == '': - v = ai.getAbout(key, [''])[1] - info.append((k, v.strip())) - return info - -def infowin(pname, info=None): - """Open info window for this program. - - info is a source of an AppInfo.xml file, if None then - APP_DIR/AppInfo.xml is loaded instead. - """ - - if info is None: - info = os.path.join(rox.app_dir, 'AppInfo.xml') - try: - ai = AppInfo.AppInfo(info) - except: - rox.report_exception() - return - - info = _collect_about(ai) - if os.path.isdir(os.path.join(rox.app_dir, 'Help')): - help = True - else: - help = False - try: - iw = InfoWin(pname, fields=info, help=help) - iw.set_title(_("About")) - iw.show() - return iw - except: - rox.report_exception() - -class CommonMixIn: - - def key_event(self, window, kev): - if kev.keyval == g.keysyms.Escape: - self.close() - return True - elif kev.keyval in [g.keysyms.Return, g.keysyms.KP_Enter] \ - and hasattr(self, '_ok_cb'): - self._ok_cb() - return True - return False - - def show(self): - rox.Dialog.show(self) - if self.standalone: - rox.mainloop() - - def close(self, widget=None, *args): - self.hide() - if self.standalone: - self.destroy() - return True - -class InfoWin(CommonMixIn, rox.Dialog): - """A dialog showing information such as author, version, etc.""" - - def __init__(self, pname, fields=None, icon=None, help=False, standalone=False): - rox.Dialog.__init__(self) - - if not fields: - raise ValueError, \ - "'fields' keyword must have at least one label, value pair." - self.urls = {} - self.icon_size = 64 - self.standalone = standalone - - self.set_position(g.WIN_POS_CENTER) - self.set_default_size(350,-1) - self.connect("delete_event", self.close) - self.connect('key-press-event', self.key_event) - self.set_title(_("Info")) - tooltips = g.Tooltips() - - hbox = g.HBox() - self.vbox.pack_start(hbox, False, False, 5) - hbox.show() - - try: - if not icon: - icon = os.path.join(rox.app_dir, '.DirIcon') - pixbuf = g.gdk.pixbuf_new_from_file(icon) - scaled_pixbuf = pixbuf.scale_simple(self.icon_size, - self.icon_size, g.gdk.INTERP_BILINEAR) - ic = g.Image() - ic.set_from_pixbuf(scaled_pixbuf) - hbox.pack_start(ic) - ic.show() - except: - pass - - # program name label - name = g.Label() - name.set_markup('%s' % pname) - hbox.pack_end(name) - - # use table to pack labels and descriptions - table = g.Table(len(fields), 2) - self.vbox.pack_start(table, padding=3) - - for i, (fieldname, fieldtext) in enumerate(fields): - label = g.Label("%s:" % fieldname) - label.set_alignment(1,0) - table.attach(label, 0, 1, i, i+1, xpadding=2) - - # search for URLs or email addresses - if fieldtext.find('@') > 0: - self.urls[fieldname] = [] - from parseaddrlist import parseaddrlist - for name, address in parseaddrlist(fieldtext): - if not address: continue - if not name: - name = address - self.urls[fieldname].append((name, 'mailto:%s' % address)) - else: - ul = _url_re.findall(fieldtext) - if ul: - self.urls[fieldname] = [(fieldtext, x[1]) for x in ul] - - frame = g.Frame() - frame.set_shadow_type(g.SHADOW_IN) - table.attach(frame, 1, 2, i, i+1, xpadding=0) - urls = self.urls.get(fieldname) - if urls: - hbox = g.VBox() - frame.add(hbox) - for j, (text, url) in enumerate(urls): - label = g.Label('') - label.set_markup( - '%s' % text) - evb = g.EventBox() - evb.add(label) - evb.set_events(g.gdk.BUTTON_PRESS_MASK) - evb.connect("button_press_event", self.open_url, - fieldname, j) - hbox.pack_start(evb) - evb.realize() - evb.window.set_cursor(g.gdk.Cursor(g.gdk.HAND1)) - tooltips.set_tip(evb, - _("Open URL <%s> with the default URL handler.") % url, - tip_private=None) - else: - label = g.Label('') - label.set_text(fieldtext) - label.set_selectable(True) - frame.add(label) - label.set_alignment(0.5,0) - label.set_justify(g.JUSTIFY_CENTER) - label.set_line_wrap(True) - - self.vbox.show_all() - - if help: - self.add_button(g.STOCK_HELP, g.RESPONSE_HELP) - self.add_button(g.STOCK_CLOSE, g.RESPONSE_CLOSE) - self.connect('response', self.response_cb) - self.set_default_response(g.RESPONSE_CLOSE) - - def open_url(self, widget, event, name, idx): - """Open the url associated with a label with ROX url handler.""" - - try: - url = self.urls[name][idx][1] - except: - return - from rox import basedir, filer - app = basedir.load_first_config('rox.sourceforge.net', - 'MIME-types', 'text_x-uri') - try: - if os.path.islink(app): - app = os.readlink(app) - if os.path.isdir(app): - app = os.path.join(app, 'AppRun') - filer._spawn((app, url)) - except (OSError, IOError): - import threading, webbrowser - t = threading.Thread(target=webbrowser.open, args=(url, 1)) - t.setDaemon(1) - t.start() - except: - rox.report_exception() - - def response_cb(self, widget, id, *args): - """Callback for dialog buttons.""" - - if id == g.RESPONSE_CLOSE: - self.close() - elif id == g.RESPONSE_HELP: - self.open_help() - - def open_help(self, widget=None, *args): - """Open the Help directory with the filer.""" - - from rox import filer - helpdir = os.path.join(rox.app_dir, 'Help') - if os.path.isdir(helpdir): - filer.open_dir(helpdir) diff --git a/source/rox-extra/menu/Menu/messages.pot b/source/rox-extra/menu/Menu/messages.pot deleted file mode 100644 index a46c67e..0000000 --- a/source/rox-extra/menu/Menu/messages.pot +++ /dev/null @@ -1,109 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: Wed Oct 12 19:31:24 2005\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" -"Generated-By: pygettext.py 1.1\n" - - -#: infowin.py:91 -msgid "Info" -msgstr "" - -#: tips:5 -msgid "Sort the menu entries in alphabetical order." -msgstr "" - -#: infowin.py:45 -msgid "About" -msgstr "" - -#: rmenu.py:336 -msgid "Options..." -msgstr "" - -#: tips:2 -msgid "Path" -msgstr "" - -#: tips:3 -msgid "The location of your Apps folder. (This should become a path at some point)." -msgstr "" - -#: rmenu.py:247 -msgid "" -"Could not read your application directory.\n" -"\n" -"Please set the path to your Apps folder in the options!" -msgstr "" - -#: tips:1 -msgid "Menu" -msgstr "" - -#: tips:4 -msgid "Sort menu entries" -msgstr "" - -#: AppRun:15 -msgid "Add to panel" -msgstr "" - -#: rmenu.py:334 -msgid "Info..." -msgstr "" - -#: tips:6 -msgid "Use icons" -msgstr "" - -#: AppRun:22 -msgid "You don't seem to have a panel on your default display. Please open a ROX panel and try again" -msgstr "" - -#: rmenu.py:331 -msgid "Refresh menu" -msgstr "" - -#: rmenu.py:349 -msgid "" -"Could not open your application directory.\n" -"\n" -"Please set the path to your Apps folder in the options!" -msgstr "" - -#: rmenu.py:339 -msgid "Close" -msgstr "" - -#: rmenu.py:130 -msgid "Application starter - click left to open menu, click right for more options." -msgstr "" - -#: tips:7 tips:8 tips:9 -msgid "Display icons next to menu entries for application directories." -msgstr "" - -#: rmenu.py:329 -msgid "Open apps folder" -msgstr "" - -#: infowin.py:159 -msgid "Open URL <%s> with the default URL handler." -msgstr "" - -#: AppRun:13 -msgid "" -"Menu is meant to be used as a ROX panel applet only. You can drag it to your panel to run it.\n" -"\n" -"Do you want me to add it to the panel now?" -msgstr "" - diff --git a/source/rox-extra/menu/Menu/panel.py b/source/rox-extra/menu/Menu/panel.py deleted file mode 100644 index 4ba579f..0000000 --- a/source/rox-extra/menu/Menu/panel.py +++ /dev/null @@ -1,29 +0,0 @@ -import gtk - -def find_panel_window(): - root = gtk.gdk.get_default_root_window() - wids = root.property_get('_NET_CLIENT_LIST')[2] - wl = [gtk.gdk.window_foreign_new(long(w)) for w in wids] - for w in wl: - if w is not None: - wclass = w.property_get('WM_CLASS')[2].split('\0')[:2] - if wclass[0] == 'ROX-Panel': - return w - else: - return None - -def get_panel_orientation(): - panel = find_panel_window() - if panel: - panelx, panely = panel.get_root_origin() - rect = panel.get_frame_extents() - panelw, panelh = rect.width, rect.height - if panelx == 0: - if panelw > panelh: - if panely == 0: - return "Top" - else: - return "Bottom" - return "Left" - if panelw < panelh: - return "Right" diff --git a/source/rox-extra/menu/Menu/parseaddrlist.py b/source/rox-extra/menu/Menu/parseaddrlist.py deleted file mode 100644 index b9f707f..0000000 --- a/source/rox-extra/menu/Menu/parseaddrlist.py +++ /dev/null @@ -1,44 +0,0 @@ -import email.Utils - -def tokensplit(s, splitchars=None, quotes='"\''): - """Split a string into tokens at every occcurence of splitchars. - - splitchars within quotes are disregarded. - """ - - if splitchars is None: - import string - splitchars = string.whitespace - inquote = None - l = []; token = [] - for c in s: - if c in quotes: - if c == inquote: - inquote = None - elif inquote is None: - inquote = c - if c in splitchars and inquote is None: - l.append("".join(token)) - token = [] - inquote = None - else: - token.append(c) - else: - l.append("".join(token)) - return l - -def parseaddrlist(alist): - """Parse a comma-separated list of email address into (name, mail) tuples. - """ - - l = [] - for addr in tokensplit(alist, ',', quotes='"'): - addr = addr.strip() - if addr: - l.append(email.Utils.parseaddr(addr)) - return l - - -if __name__ == '__main__': - al = '"Hacker, J. Random" , Joe O\'Donnel , luser@dau.org, alice (Alice Bobton), , ' - print parseaddrlist(al) diff --git a/source/rox-extra/menu/Menu/rmenu.py b/source/rox-extra/menu/Menu/rmenu.py deleted file mode 100644 index db1e34d..0000000 --- a/source/rox-extra/menu/Menu/rmenu.py +++ /dev/null @@ -1,361 +0,0 @@ -""" - rmenu.py (a application menu applet for the ROX Panel) - - Copyright 2004-2005 Kenneth Hayber , - Christopher Arndt - All rights reserved. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License. - - This program is distributed in the hope that it will be useful - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -""" - -# standard library modules -import sys, os, time, shelve -from os.path import dirname, exists, expanduser, join, isdir, isfile, realpath -try: - set() -except NameError: - from sets import Set as set - -# third-party modules -import rox -from rox import g, app_options, applet, choices, filer, Menu, mime -from rox.options import Option -from rox.OptionsBox import REVERT - -from cache import CacheManager, CacheMiss - -# globals -APP_NAME = 'Menu' -APP_DIR = rox.app_dir -APP_SIZE = [28, 150] - -# Options.xml processing -choices.migrate(APP_NAME, 'hayber.us') -rox.setup_app_options(APP_NAME, site='hayber.us') -Menu.set_save_name(APP_NAME, site='hayber.us') -options = dict( - apps=Option('applications', join(expanduser('~'), 'Apps')), - sort=Option('sort', True), - icons=Option('icons', True) -) - -rox.app_options.notify() - -# helper functions -def isapp(name): - """Check if file is an app dir.""" - - apprun = join(name, 'AppRun') - return isfile(apprun) and os.access(apprun, os.X_OK) - -def walk(top): - """Walk dir yielding a tuple (dir, dirnames, filenames) for every subdir. - - Simplified version of os.walk() that follows symlinked directories and - puts ROX application dirs into filenames. - """ - - try: - names = os.listdir(top) - except error, err: - return - - dirs, nondirs = [], [] - for name in names: - path = join(top, name) - # don't do hidden files - if not name.startswith('.'): - if isdir(path): - if isapp(path): - nondirs.append((name, True)) - else: - dirs.append(name) - else: - nondirs.append((name, False)) - - yield top, dirs, nondirs - for name in dirs: - for x in walk(join(top, name)): - yield x - -# classes -class RoxMenu(applet.Applet): - """A Menu Applet""" - - def __init__(self, filename, root=None): - """Initialize applet. - - filename is passed to Applet.__init__() - root is the top of the directory hierarchy that is - scanned for applications to build the menu. - """ - - applet.Applet.__init__(self, filename) - - # load the applet icon - self.image = g.Image() - self.pixbuf = g.gdk.pixbuf_new_from_file(join(APP_DIR, 'images', - 'menu.svg')) - self.image.set_from_pixbuf(self.pixbuf) - self.resize_image(8) - self.add(self.image) - - self.vertical = self.get_panel_orientation() in ('Right', 'Left') - if self.vertical: - self.set_size_request(8, -1) - else: - self.set_size_request(-1, 8) - - # use IconFactory for the icons of the menu items - self.factory = g.IconFactory() - self.factory.add_default() - # cache - self.cache_file = join(rox.basedir.save_config_path('hayber.us', - APP_NAME), 'cache' ) - self.cache = CacheManager(self.cache_file) - - # set the tooltip - tooltips = g.Tooltips() - tooltips.set_tip(self, _("Application starter - " - "click left to open menu, click right for more options."), - tip_private=None) - - # menus - if root: - self.root = root - else: - self.root = options['apps'].value - self.refresh_menu() - self.mainmenu.attach(self, self) - self.build_appmenu() - - # event handling - self.add_events(g.gdk.BUTTON_PRESS_MASK) - self.connect('button-press-event', self.button_press) - self.connect('size-allocate', self.resize) - self.connect('delete_event', self.quit) - rox.app_options.add_notify(self.get_options) - - def run_it(self, args=None): - """Open the given file with ROX.""" - - #print >>sys.stderr, args - try: - filer.spawn_rox((realpath(args),)) - except: - rox.info(args) - - def load_icon(self, name, path, isapp=False, force_reload=False): - """Try to load an icon for an application.""" - - size = mime.ICON_SIZE_SMALL - try: - if force_reload: raise CacheMiss - pb = self.cache.load_pixbuf(name) - except CacheMiss: - try: - if isapp: - for icon in ('.DirIcon', 'AppIcon.xpm'): - iconpath = join(path, icon) - if exists(iconpath): - pb = g.gdk.pixbuf_new_from_file(iconpath) - h=int(pb.get_width()*float(size)/pb.get_height()) - pb = pb.scale_simple(size, h, g.gdk.INTERP_BILINEAR) - self.cache.store_pixbuf(name, pb) - break - else: - return - else: - mtype = mime.get_type(path) - pb = mtype.get_icon(size) - except: - rox.report_exception() - print >>sys.stderr, "Can't load icon '%s'" % iconpath - return - g.stock_add([(name, name, 0, 0, "")]) - self.factory.add(name, g.IconSet(pixbuf=pb)) - - def process_dir(self, directory): - """Walk a directory and build main menu. - - Directories will be submenus. Empty directories are ignored. - Normal files and app dirs are added as normal menu items. - """ - - menu = []; menu_append = menu.append - for curdir, dirs, files in walk(directory): - if options['sort'].int_value: - sdirs = [(x.lower(), x) for x in dirs] - sdirs.sort() - dirs[:] = [x[1] for x in sdirs] - dirs.reverse() - files = [(x[0].lower(), x) for x in files] - files.sort() - files = [x[1] for x in files] - files.reverse() - for file in files: - path = join(curdir, file[0]) - leaf = path[len(directory):] - if options['icons'].int_value: - self.load_icon(leaf, path, file[1], force_reload=True) - menu_append(Menu.Action(leaf, - 'run_it', '', leaf, values=(path,))) - else: - menu_append(Menu.Action(leaf, - 'run_it', '', None, values=(path,))) - menu.reverse() - return menu - - def resize(self, widget, rectangle): - """Called when the panel sends a size.""" - - if self.vertical: - size = rectangle[2] - else: - size = rectangle[3] - if size != self.size: - self.resize_image(size) - - def resize_image(self, size): - """Resize the application image.""" - - # I like the look better with the -4, there is no technical - # reason for it. - scaled_pixbuf = self.pixbuf.scale_simple(size-4, size-4, - g.gdk.INTERP_BILINEAR) - self.image.set_from_pixbuf(scaled_pixbuf) - self.size = size - - def button_press(self, window, event): - """Handle mouse clicks by popping up the matching menu.""" - - if event.button == 1: - if self.mainmenu_items: - self.mainmenu.popup(self, event, self.position_menu) - else: - rox.alert(_("Could not read your application directory.\n\nPlease set the path to your Apps folder in the options!")) - elif event.button == 2: - self.open_app_folder() - elif event.button == 3: - self.appmenu.popup(self, event, self.position_menu) - - def get_panel_orientation(self): - """Return panel orientation and margin for displaying a popup menu. - - Position in ('Top', 'Bottom', 'Left', 'Right'). - """ - - pos = self.socket.property_get('_ROX_PANEL_MENU_POS', 'STRING', g.FALSE) - if pos: pos = pos[2] - if pos: - side, margin = pos.split(',') - margin = int(margin) - else: - side, margin = None, 2 - return side - - def get_options(self, widget=None, rebuild=False, response=False): - """Used as the notify callback when options change.""" - - if response: - # option box closed by button - if rebuild == REVERT: - return - elif not rebuild: - # option box still open - return - self.root = options['apps'].value - for o in ('apps', 'sort', 'icons'): - if options[o].has_changed: - rebuild = True - break - if rebuild: - self.refresh_menu(True) - - def show_options(self, button=None): - """Open the options edit dialog.""" - rox.edit_options() - rox._options_box.connect_after('destroy', self.get_options, True) - rox._options_box.connect_after('response', self.get_options, True) - - def get_info(self): - """Display an InfoWin box.""" - - iw = getattr(self, 'iw', None) - if not iw: - from infowin import infowin - self.iw = iw = infowin(APP_NAME) - iw.show() - - def refresh_menu(self, force_reload=False): - """Rebuild the menu from disk.""" - - #stime = time.time() - if self.root and isdir(self.root): - try: - if force_reload: raise CacheMiss - self.mainmenu_items = self.cache.load_menu(self.root) - for e in self.mainmenu_items: - if e.stock: - self.load_icon(e.stock, join(self.root, e.stock)) - except CacheMiss: - self.mainmenu_items = self.process_dir(self.root) - self.cache.store_menu(self.root, self.mainmenu_items) - self.cache.sync() - else: - self.mainmenu_items = [] - self.mainmenu = Menu.Menu('main', self.mainmenu_items) - #etime = time.time() - #print >>sys.stderr, "Refresh time(ms): %.2f, Menu leaves: %i" % \ - # ((etime-stime)*1000, len(self.mainmenu_items)) - - def build_appmenu(self): - """Build the right-click app menu.""" - - self.appmenu_items = [] - i_append = self.appmenu_items.append - i_append(Menu.Action( - _('Open apps folder'), 'open_app_folder', '', g.STOCK_JUMP_TO)) - i_append(Menu.Action( - _('Refresh menu'), 'refresh_menu', '', g.STOCK_REFRESH, (True,))) - i_append(Menu.Separator()) - i_append(Menu.Action( - _('Info...'), 'get_info', '', g.STOCK_DIALOG_INFO)) - i_append(Menu.Action( - _('Options...'), 'show_options', '', g.STOCK_PREFERENCES)) - i_append(Menu.Separator()) - i_append(Menu.Action( - _('Close'), 'quit', '', g.STOCK_CLOSE)) - self.appmenu = Menu.Menu('other', self.appmenu_items) - self.appmenu.attach(self, self) - - def open_app_folder(self): - """Open the folder comtaining the appliocations with ROX-Filer.""" - - if self.root and isdir(self.root): - filer.open_dir(self.root) - else: - rox.alert(_("Could not open your application directory.\n\nPlease set the path to your Apps folder in the options!")) - - def quit(self, *args): - """Quit applet and close everything.""" - - del self.cache - try: - self.iw.destroy() - except AttributeError: - pass - except: - rox.report_exception() - self.destroy() diff --git a/source/rox-extra/menu/Menu/roxsoap.py b/source/rox-extra/menu/Menu/roxsoap.py deleted file mode 100644 index 82aad4c..0000000 --- a/source/rox-extra/menu/Menu/roxsoap.py +++ /dev/null @@ -1,170 +0,0 @@ -#!/usr/bin/env python - -"""A quick-and-dirty helper module to do SOAP RPCs to ROX-Filer. - -Usage: ->>> proxy = RoxSOAPProxy() ->>> proxy.Version() - -To see, which SOAP RPC calls are supported: ->>> print proxy._methods - -For the method arguments, please see the ROX manual (appendix C). - -If a method takes arguments, you have to specify them as keyword arguments -(case-sensitive!): ->>> proxy.FileType(Filename='movie.avi') -(u'video/x-msvideo',) - -Only the following types are supported as arguments values: -- (Unicode) strings -- Lists of (unicode) strings -- All other types will be converted to unicode strings, which may not be - what you want. Boolean types will work, though. - -All methods return a tuple of unicode strings or None. -""" - -import sys -import os -from xml.dom import minidom - -__all__ = ['RoxSOAPProxy', 'SOAPRPCError'] - -__author__ = "Christopher Arndt" -__version__ = "0.2" -__date__ = "2005-09-19" -__copyright__ = "Python license" - -class SOAPRPCError(Exception): - pass - -class curry: - """Curry a callable with default arguments and return it as a new callable. - """ - - def __init__(self, callable, *args, **kwargs): - self.callable = callable - self.pending = args[:] - self.kwargs = kwargs.copy() - - def __call__(self, *args, **kwargs): - if kwargs and self.kwargs: - kw = self.kwargs.copy() - kw.update(kwargs) - else: - kw = kwargs or self.kwargs - return apply(self.callable, self.pending + args, kw) - -class RoxSOAPProxy: - """A wrapper for SOAP RPC calls to ROX-Filer.""" - - _SOAP_REQUEST_TEMPLATE=u"""\ - - - - <%(method)s> -%(args)s - - - -""" - _methods = ['CloseDir', 'Copy', 'Examine', 'FileType', 'Link', 'Mount', - 'Move', 'OpenDir', 'Panel', 'PanelAdd', 'PanelRemove', 'Pinboard', - 'PinboardAdd', 'PinboardRemove', 'Run', 'SetBackdrop', 'SetBackdropApp', - 'Show', 'Unmount', 'Version' - ] - - def __init__(self, debug=False): - self.debug = debug - - def __getattr__(self, name): - if name in self._methods: - return curry(self._do_rpc, name) - else: - try: - return self.__dict__[name] - except KeyError: - raise AttributeError, \ - "SOAP RPC method '%s' not supported" % name - - def _parse_response(self, response): - """Extract the RPC results from a SOAP response""" - - xml = minidom.parseString(response) - l = [] - for el in xml.getElementsByTagName('soap:result'): - l.append("".join([n.nodeValue for n in el.childNodes])) - if l: - return tuple(l) - - def _build_request(self, method, **kwargs): - """Enter method docstring here.""" - - args = [] - for k,v in kwargs.items(): - if type(v) == type([]): - args.append(u' <%s>' % k) - for i in v: - args.append(u' %s' % unicode(i)) - args.append(u' ' % k) - else: - args.append(u" <%s>%s" % (k, unicode(v), k)) - args = "\n".join(args) - return self._SOAP_REQUEST_TEMPLATE % {'args': args, 'method': method} - - def _send_request(self, msg): - cin, cout, cerr = os.popen3('rox --RPC', 'rb+') - cin.write(msg) - cin.flush() - cin.close() - response = cout.read() - err = cerr.read() - cout.close(); cerr.close() - return response, err - - def _do_rpc(self, method, **kwargs): - msg = self._build_request(method, **kwargs) - self._debug("Send SOAP request:\n", msg) - response, err = self._send_request(msg) - if err: - self._debug("Error while doing SOAP call:\n", err) - raise SOAPRPCError, err - if response: - self._debug("Received SOAP response:\n", response) - return self._parse_response(response) - - def _debug(self, *msg): - if self.debug: - print >>sys.stderr, " ".join(map(str, msg)) - -def _test(): - proxy = RoxSOAPProxy() - print "ROX version:", proxy.Version()[0] - -if __name__ == '__main__': - __usage__ = """Usage: roxsoap.py Method [argument=value ...] - -Method is one of: %s - -See http://rox.sourceforge.net/Manual/Manual/Manual.html#soap for more -information about method signatures.""" % ", ".join(RoxSOAPProxy._methods) - - if len(sys.argv) > 1: - method = sys.argv[1] - args = {} - try: - for arg in sys.argv[2:]: - k, v = arg.split('=', 1) - args[k] = v - except ValueError: - print >>sys.stderr, __usage__ - sys.exit(1) - proxy = RoxSOAPProxy(True) - soapcall = getattr(proxy, method) - try: - print soapcall(**args) - except SOAPRPCError, msg: - print >>sys.stderr, msg - else: - _test() diff --git a/source/rox-extra/menu/Menu/tips b/source/rox-extra/menu/Menu/tips deleted file mode 100644 index f995154..0000000 --- a/source/rox-extra/menu/Menu/tips +++ /dev/null @@ -1,9 +0,0 @@ -_("Menu") -_("Path") -_("The location of your Apps folder. (This should become a path at some point).") -_("Sort menu entries") -_("Sort the menu entries in alphabetical order.") -_("Use icons") -_("Display icons next to menu entries for application directories.") -_("Display icons next to menu entries for application directories.") -_("Display icons next to menu entries for application directories.") From ryuo at frugalware.org Wed Jun 18 15:19:14 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 15:19:17 2008 Subject: [Frugalware-git] rox: mem-2.1.5-1-i686 Message-ID: <20080618131914.AD52C1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=530836e6101b623e808237e3b3576939e2ef1c8d commit 530836e6101b623e808237e3b3576939e2ef1c8d Author: James Buren Date: Wed Jun 18 08:18:33 2008 -0500 mem-2.1.5-1-i686 * redraft diff --git a/source/rox-extra/mem/FrugalBuild b/source/rox-extra/mem/FrugalBuild new file mode 100644 index 0000000..c1ecdfa --- /dev/null +++ b/source/rox-extra/mem/FrugalBuild @@ -0,0 +1,20 @@ +# Compiling Time: 0.02 SBU +# Maintainer: James Buren + +pkgname=mem +pkgver=2.1.5 +pkgrel=1 +pkgdesc="ROX Applet for displaying current memory usage." +_F_rox_name=Mem +_F_rox_subdir=Applets/ +options=('scriptlet') +Finclude rox +depends=('rox-clib' 'libgtop') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=$_F_rox_name +up2date="Flasttar http://www.kerofin.demon.co.uk/rox/$pkgname.html" +source=(http://www.kerofin.demon.co.uk/rox/$_F_rox_name-$pkgver.tar.gz) +archs=('i686') +sha1sums=('d78608e02213fcad189f7f1cfc8713ccd96746d5') + +# optimization OK From ryuo at frugalware.org Wed Jun 18 15:30:07 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 15:30:09 2008 Subject: [Frugalware-git] rox: postal-004-1-i686 Message-ID: <20080618133007.B09C81778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=a55e36f2347cd9d400d89a0af2526925bb2a8343 commit a55e36f2347cd9d400d89a0af2526925bb2a8343 Author: James Buren Date: Wed Jun 18 08:30:00 2008 -0500 postal-004-1-i686 * redraft diff --git a/source/rox-extra/postal/FrugalBuild b/source/rox-extra/postal/FrugalBuild new file mode 100644 index 0000000..ae8191c --- /dev/null +++ b/source/rox-extra/postal/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=postal +pkgver=004 +pkgrel=1 +pkgdesc="ROX Applet for managing your email." +_F_rox_name=Postal +_F_rox_subdir=Applets/ +Finclude rox +rodepends=('rox-lib') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=$_F_rox_name +up2date="Flasttar http://hayber.us/rox/applets/" +source=(http://hayber.us/rox/applets/$_F_rox_name-$pkgver.tgz) +archs=('i686') +sha1sums=('55e845346d9e88bc5e54eeca637d96c37b7aa663') From vmiklos at frugalware.org Wed Jun 18 15:30:09 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 18 15:30:14 2008 Subject: [Frugalware-git] frugalware-current: nasm-2.03.01-1-i686 Message-ID: <20080618133009.4E90F1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bc6de3907167644a737c782ebedced1ab1e7353c commit bc6de3907167644a737c782ebedced1ab1e7353c Author: Miklos Vajna Date: Wed Jun 18 15:20:02 2008 +0200 nasm-2.03.01-1-i686 - version bump diff --git a/source/devel-extra/nasm/FrugalBuild b/source/devel-extra/nasm/FrugalBuild index 12983e1..fa00ae0 100644 --- a/source/devel-extra/nasm/FrugalBuild +++ b/source/devel-extra/nasm/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=nasm -pkgver=2.03 +pkgver=2.03.01 pkgrel=1 pkgdesc="NASM is the Netwide Assembler" Finclude sourceforge @@ -10,6 +10,6 @@ depends=('glibc') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=6208 |grep 'nasm sources' |sed -ne 's/.*\]\(.*\) [A-Z].*\[.*/\1/;1p'" -sha1sums=('01573ea0847e2e27cc9c84265d719f46081cbf34') +sha1sums=('3d8d3c60519819eb6099fda7533d0d326c047987') # optimization OK From vmiklos at frugalware.org Wed Jun 18 15:30:09 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 18 15:30:15 2008 Subject: [Frugalware-git] frugalware-current: vde2-2.2.1-1-i686 Message-ID: <20080618133009.7ABA21778050@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=77a8f6024f5bab84903bea23ce53f4b8ec27ed03 commit 77a8f6024f5bab84903bea23ce53f4b8ec27ed03 Author: Miklos Vajna Date: Wed Jun 18 15:21:19 2008 +0200 vde2-2.2.1-1-i686 - version bump diff --git a/source/network-extra/vde2/FrugalBuild b/source/network-extra/vde2/FrugalBuild index 7c05210..2e5a239 100644 --- a/source/network-extra/vde2/FrugalBuild +++ b/source/network-extra/vde2/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: VMiklos pkgname=vde2 -pkgver=2.1.6 +pkgver=2.2.1 pkgrel=1 pkgdesc="Wmulates ethernet switches over existing connections." depends=('glibc') @@ -14,5 +14,5 @@ _F_sourceforge_dirname="vde" Finclude sourceforge url="http://vde.sourceforge.net/" up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=95403&package_id=169680'|grep 'vde2-[0-9.]\+.t.*_mirror'|sed 's/.*-\(.*\)\.t.*/\1/;q'" -sha1sums=('4eb7966e03490b5f9367e7fb08fbfbd7ada98e6e') +sha1sums=('7ba0e018ab55cb846b1389b6424104970860703b') # optimization OK From vmiklos at frugalware.org Wed Jun 18 15:30:09 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 18 15:30:17 2008 Subject: [Frugalware-git] frugalware-current: etckeeper-0.16-1-i686 Message-ID: <20080618133009.9D1CF1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4f43897811e2d1d7185672bc0e15c067ec494580 commit 4f43897811e2d1d7185672bc0e15c067ec494580 Author: Miklos Vajna Date: Wed Jun 18 15:23:28 2008 +0200 etckeeper-0.16-1-i686 - version bump diff --git a/source/apps-extra/etckeeper/FrugalBuild b/source/apps-extra/etckeeper/FrugalBuild index 49a678b..08421a2 100644 --- a/source/apps-extra/etckeeper/FrugalBuild +++ b/source/apps-extra/etckeeper/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos pkgname=etckeeper -pkgver=0.15 +pkgver=0.16 pkgrel=1 pkgdesc="Stores the /etc directory in a git repo." url="http://kitenet.net/~joey/code/etckeeper/" @@ -14,7 +14,7 @@ archs=('i686' 'x86_64') Fpkgversep="_" up2date="lynx -dump http://ftp.debian.org/debian/pool/main/e/etckeeper|Flasttar" source=(http://ftp.debian.org/debian/pool/main/e/etckeeper/etckeeper_$pkgver.tar.gz) -sha1sums=('67e29438921e5b5fd9cde40c7e95c6e9dbc42c59') +sha1sums=('87d9bc8e5935e2233b0016d324d71516738ff73e') build() { From vmiklos at frugalware.org Wed Jun 18 15:30:09 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 18 15:30:18 2008 Subject: [Frugalware-git] frugalware-current: kvm-70-1-i686 Message-ID: <20080618133009.DDBE117780AE@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=80c9424012b2bc5aae3b01f15d174f41bfbf9637 commit 80c9424012b2bc5aae3b01f15d174f41bfbf9637 Author: Miklos Vajna Date: Wed Jun 18 15:28:39 2008 +0200 kvm-70-1-i686 - version bump diff --git a/source/xapps-extra/kvm/FrugalBuild b/source/xapps-extra/kvm/FrugalBuild index 5090538..e27ed92 100644 --- a/source/xapps-extra/kvm/FrugalBuild +++ b/source/xapps-extra/kvm/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=kvm -pkgver=69 +pkgver=70 pkgrel=1 pkgdesc="KVM is a kernel based virtual machine" groups=('xapps-extra') @@ -12,7 +12,7 @@ Finclude sourceforge url="http://kvm.sourceforge.net" depends=('sdl' 'zlib') makedepends=('gcc-3.3') -sha1sums=('f90033e6a8336c8bb242e50b58d11a0293c9851d') +sha1sums=('19e34f21cee5ad05669a814b656c58dedd747ea0') Fconfopts="--prefix=$Fprefix" # no changelog in the tarball, you can reach it here: From vmiklos at frugalware.org Wed Jun 18 15:30:10 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 18 15:30:19 2008 Subject: [Frugalware-git] frugalware-current: mpd-0.13.2-1-i686 Message-ID: <20080618133010.1577017780B0@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0fa270ed1a9864a594ac4e41247f88901c86624d commit 0fa270ed1a9864a594ac4e41247f88901c86624d Author: Miklos Vajna Date: Wed Jun 18 15:29:45 2008 +0200 mpd-0.13.2-1-i686 - version bump diff --git a/source/multimedia/mpd/FrugalBuild b/source/multimedia/mpd/FrugalBuild index 5ba6d44..075a089 100644 --- a/source/multimedia/mpd/FrugalBuild +++ b/source/multimedia/mpd/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos pkgname=mpd -pkgver=0.13.1 -pkgrel=2 +pkgver=0.13.2 +pkgrel=1 pkgdesc="the Music Player Daemon" url="http://musicpd.org" depends=('libmikmod>=3.1.7' 'flac>=1.1.3' 'libao' 'audiofile>=0.1.7' 'libvorbis' \ @@ -13,7 +13,7 @@ groups=('multimedia') archs=('i686' 'x86_64') up2date="lynx -dump $url/files.shtml|grep Current|sed -n 's/.*s \(.*\)/\1/;1 p'" source=(http://musicpd.org/uploads/files/mpd-$pkgver.tar.bz2 rc.mpd) -sha1sums=('0a760bafb608ea5ecde28433dfef8f25a4a12a56' \ +sha1sums=('3b826bc75c314e6db6715a978c9b405775d3478c' \ '3c7de283c3a659b99d5eb6fe64dc0245eab87855') build() From ryuo at frugalware.org Wed Jun 18 15:35:57 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 15:36:00 2008 Subject: [Frugalware-git] rox: mail-0.3.8-1-i686 Message-ID: <20080618133557.BEE8C1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=d9643e28395cfd1616e2f67214d6ea69b34310c6 commit d9643e28395cfd1616e2f67214d6ea69b34310c6 Author: James Buren Date: Wed Jun 18 08:35:51 2008 -0500 mail-0.3.8-1-i686 * redraft diff --git a/source/rox-extra/mail/FrugalBuild b/source/rox-extra/mail/FrugalBuild new file mode 100644 index 0000000..b6b317b --- /dev/null +++ b/source/rox-extra/mail/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.02 SBU +# Maintainer: James Buren + +pkgname=mail +pkgver=0.3.8 +pkgrel=1 +pkgdesc="ROX Applet for mail notification." +_F_rox_name=Mail +_F_rox_subdir=Applets/ +Finclude rox +rodepends=('rox-lib') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=$_F_rox_name +up2date="Flasttar http://www.kerofin.demon.co.uk/rox/$pkgname.html" +source=(http://www.kerofin.demon.co.uk/rox/$_F_rox_name-$pkgver.tar.gz) +archs=('i686') +sha1sums=('a862dc2cc002b7a14f9a743cddf22a018195692b') From ryuo at frugalware.org Wed Jun 18 15:39:10 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 15:39:11 2008 Subject: [Frugalware-git] rox: rox.sh Message-ID: <20080618133910.0F7161778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=89736344580882c699988f981a81c3481042147f commit 89736344580882c699988f981a81c3481042147f Author: James Buren Date: Wed Jun 18 08:39:04 2008 -0500 rox.sh * added a check to see if sourceforge dirname is already set. diff --git a/source/include/rox.sh b/source/include/rox.sh index 1201f45..c1e6974 100644 --- a/source/include/rox.sh +++ b/source/include/rox.sh @@ -61,7 +61,7 @@ if [ "$_F_rox_override" -eq 0 ]; then A=`lynx -dump "$_F_rox_index_page" | grep "]$_F_rox_name --" | sed -n '1p' | sed 's|.*\[\(.*\)].*|\1|'` url2=`lynx -dump "$_F_rox_index_page" | grep " $A. " | sed 's|^.* ||'` if lynx -dump "$url2" | grep -v http://sourceforge.net/projects/rox | grep -q sourceforge.net; then - _F_sourceforge_dirname=rox + [ -z "$_F_sourceforge_dirname" ] && _F_sourceforge_dirname=rox Finclude sourceforge fi url=$url2 diff --git a/source/rox-extra/menu/Menu/.DirIcon b/source/rox-extra/menu/Menu/.DirIcon deleted file mode 120000 index 87a7cc8..0000000 --- a/source/rox-extra/menu/Menu/.DirIcon +++ /dev/null @@ -1 +0,0 @@ -images/menu.svg \ No newline at end of file From ryuo at frugalware.org Wed Jun 18 15:46:50 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 15:46:51 2008 Subject: [Frugalware-git] rox: load-2.1.4-1-i686 Message-ID: <20080618134650.3B2F51778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=1b441cb2aa1543836895550d2858755eb7578d55 commit 1b441cb2aa1543836895550d2858755eb7578d55 Author: James Buren Date: Wed Jun 18 08:46:35 2008 -0500 load-2.1.4-1-i686 * redraft diff --git a/source/rox-extra/load/FrugalBuild b/source/rox-extra/load/FrugalBuild new file mode 100644 index 0000000..e5a843d --- /dev/null +++ b/source/rox-extra/load/FrugalBuild @@ -0,0 +1,20 @@ +# Compiling Time: 0.02 SBU +# Maintainer: James Buren + +pkgname=load +pkgver=2.1.4 +pkgrel=1 +pkgdesc="ROX Applet for displaying your current system load." +_F_rox_name=Load +_F_rox_subdir=Applets/ +options=('scriptlet') +Finclude rox +depends=('rox-clib' 'libgtop') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=$_F_rox_name +up2date="Flasttar http://www.kerofin.demon.co.uk/rox/$pkgname.html" +source=(http://www.kerofin.demon.co.uk/rox/$_F_rox_name-$pkgver.tar.gz) +archs=('i686') +sha1sums=('1be4ef2394dbdebaab9ebf7240aae93ee3a13177') + +# optimization OK From ryuo at frugalware.org Wed Jun 18 15:58:20 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 15:58:22 2008 Subject: [Frugalware-git] rox: freefs-2.1.8-1-i686 Message-ID: <20080618135820.6F52D1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=d28747a2220cc85c727b42e4d85699e0ebc55b09 commit d28747a2220cc85c727b42e4d85699e0ebc55b09 Author: James Buren Date: Wed Jun 18 08:58:15 2008 -0500 freefs-2.1.8-1-i686 * redraft diff --git a/source/rox-extra/freefs/FrugalBuild b/source/rox-extra/freefs/FrugalBuild new file mode 100644 index 0000000..ea659a7 --- /dev/null +++ b/source/rox-extra/freefs/FrugalBuild @@ -0,0 +1,20 @@ +# Compiling Time: 0.02 SBU +# Maintainer: James Buren + +pkgname=freefs +pkgver=2.1.8 +pkgrel=1 +pkgdesc="ROX Applet for displaying your free filesystem space." +_F_rox_name=FreeFS +_F_rox_subdir=Applets/ +options=('scriptlet') +Finclude rox +depends=('rox-clib') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=$_F_rox_name +up2date="Flasttar http://www.kerofin.demon.co.uk/rox/$pkgname.html" +source=(http://www.kerofin.demon.co.uk/rox/$_F_rox_name-$pkgver.tar.gz) +archs=('i686') +sha1sums=('873f73c78cbda3a873da5a2f8e7f91aa6ed044b0') + +# optimization OK From ryuo at frugalware.org Wed Jun 18 16:02:45 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 16:02:46 2008 Subject: [Frugalware-git] frugalware-current: libev-3.42-1-i686 Message-ID: <20080618140245.15B011778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3bab081e71fee503cd28df7ef1473aa73bb45954 commit 3bab081e71fee503cd28df7ef1473aa73bb45954 Author: James Buren Date: Wed Jun 18 09:02:13 2008 -0500 libev-3.42-1-i686 * version bump diff --git a/source/lib-extra/libev/FrugalBuild b/source/lib-extra/libev/FrugalBuild index 741d1fe..0455dd8 100644 --- a/source/lib-extra/libev/FrugalBuild +++ b/source/lib-extra/libev/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: James Buren pkgname=libev -pkgver=3.41 +pkgver=3.42 pkgrel=1 pkgdesc="A full-featured and high-performance event loop" url="http://software.schmorp.de/pkg/libev.html" @@ -11,7 +11,7 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="Flasttar http://dist.schmorp.de/libev/Attic/" source=(http://dist.schmorp.de/libev/Attic/$pkgname-$pkgver.tar.gz) -sha1sums=('7685655eb420ca14f792dc8cb5e13701aa1e9763') +sha1sums=('d8a85e48783b580c302c4474a749fd54ba31148d') # change include to avoid conflict with libevent Fconfopts="$Fconfopts --includedir=/usr/include/libev" From ryuo at frugalware.org Wed Jun 18 16:13:17 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 16:13:19 2008 Subject: [Frugalware-git] rox: reticker-0.4.5-1-i686 Message-ID: <20080618141317.AC3F41778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=2036c871d07182198de68e0429e1d13b3c72b0e3 commit 2036c871d07182198de68e0429e1d13b3c72b0e3 Author: James Buren Date: Wed Jun 18 09:13:06 2008 -0500 reticker-0.4.5-1-i686 * redraft diff --git a/source/rox-extra/reticker/FrugalBuild b/source/rox-extra/reticker/FrugalBuild new file mode 100644 index 0000000..f269308 --- /dev/null +++ b/source/rox-extra/reticker/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=reticker +pkgver=0.4.5 +pkgrel=1 +pkgdesc="ROX Applet which acts as a newsticker." +_F_rox_name=RETicker +_F_rox_subdir=Applets/ +Finclude rox +rodepends=('rox-lib') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=$_F_rox_name +up2date="Flasttar ftp://ftp.berlios.de/pub/rox4debian/apps" +source=(ftp://ftp.berlios.de/pub/rox4debian/apps/$_F_rox_name-$pkgver.tgz) +archs=('i686') +sha1sums=('798c2d444c03f70820ba3881993af18e1b50ca11') + +# optimization OK From vmiklos at frugalware.org Wed Jun 18 16:21:09 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 18 16:21:12 2008 Subject: [Frugalware-git] frugalware-0.8: kernel-2.6.24-4kalgan3-i686 Message-ID: <20080618142109.480E81778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=56c56500bed2ca1b43b33978c3f49f47fca3d99b commit 56c56500bed2ca1b43b33978c3f49f47fca3d99b Author: Miklos Vajna Date: Wed Jun 18 16:20:55 2008 +0200 kernel-2.6.24-4kalgan3-i686 - update to patchlevel '.7' - add CVE-2008-1673.patch diff --git a/source/base/kernel/CVE-2008-1669.patch b/source/base/kernel/CVE-2008-1669.patch deleted file mode 100644 index 9939aa3..0000000 --- a/source/base/kernel/CVE-2008-1669.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/fs/locks.c b/fs/locks.c -index 592faad..5c4a178 100644 ---- a/fs/locks.c -+++ b/fs/locks.c -@@ -1749,6 +1749,7 @@ int fcntl_setlk(unsigned int fd, struct file *filp, unsigned int cmd, - struct file_lock *file_lock = locks_alloc_lock(); - struct flock flock; - struct inode *inode; -+ struct file *f; - int error; - - if (file_lock == NULL) -@@ -1821,7 +1822,15 @@ again: - * Attempt to detect a close/fcntl race and recover by - * releasing the lock that was just acquired. - */ -- if (!error && fcheck(fd) != filp && flock.l_type != F_UNLCK) { -+ /* -+ * we need that spin_lock here - it prevents reordering between -+ * update of inode->i_flock and check for it done in close(). -+ * rcu_read_lock() wouldn't do. -+ */ -+ spin_lock(¤t->files->file_lock); -+ f = fcheck(fd); -+ spin_unlock(¤t->files->file_lock); -+ if (!error && f != filp && flock.l_type != F_UNLCK) { - flock.l_type = F_UNLCK; - goto again; - } -@@ -1877,6 +1886,7 @@ int fcntl_setlk64(unsigned int fd, struct file *filp, unsigned int cmd, - struct file_lock *file_lock = locks_alloc_lock(); - struct flock64 flock; - struct inode *inode; -+ struct file *f; - int error; - - if (file_lock == NULL) -@@ -1949,7 +1959,10 @@ again: - * Attempt to detect a close/fcntl race and recover by - * releasing the lock that was just acquired. - */ -- if (!error && fcheck(fd) != filp && flock.l_type != F_UNLCK) { -+ spin_lock(¤t->files->file_lock); -+ f = fcheck(fd); -+ spin_unlock(¤t->files->file_lock); -+ if (!error && f != filp && flock.l_type != F_UNLCK) { - flock.l_type = F_UNLCK; - goto again; - } diff --git a/source/base/kernel/CVE-2008-1673.patch b/source/base/kernel/CVE-2008-1673.patch new file mode 100644 index 0000000..6a7d653 --- /dev/null +++ b/source/base/kernel/CVE-2008-1673.patch @@ -0,0 +1,107 @@ +From ddb2c43594f22843e9f3153da151deaba1a834c5 Mon Sep 17 00:00:00 2001 +From: Chris Wright +Date: Wed, 4 Jun 2008 09:16:33 -0700 +Subject: [PATCH] asn1: additional sanity checking during BER decoding + +- Don't trust a length which is greater than the working buffer. + An invalid length could cause overflow when calculating buffer size + for decoding oid. + +- An oid length of zero is invalid and allows for an off-by-one error when + decoding oid because the first subid actually encodes first 2 subids. + +- A primitive encoding may not have an indefinite length. + +Thanks to Wei Wang from McAfee for report. + +Cc: Steven French +Cc: stable@kernel.org +Acked-by: Patrick McHardy +Signed-off-by: Chris Wright +Signed-off-by: Linus Torvalds +--- + fs/cifs/asn1.c | 14 ++++++++++++++ + net/ipv4/netfilter/nf_nat_snmp_basic.c | 14 ++++++++++++++ + 2 files changed, 28 insertions(+), 0 deletions(-) + +diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c +index cb52cbb..f58e41d 100644 +--- a/fs/cifs/asn1.c ++++ b/fs/cifs/asn1.c +@@ -186,6 +186,11 @@ asn1_length_decode(struct asn1_ctx *ctx, unsigned int *def, unsigned int *len) + } + } + } ++ ++ /* don't trust len bigger than ctx buffer */ ++ if (*len > ctx->end - ctx->pointer) ++ return 0; ++ + return 1; + } + +@@ -203,6 +208,10 @@ asn1_header_decode(struct asn1_ctx *ctx, + if (!asn1_length_decode(ctx, &def, &len)) + return 0; + ++ /* primitive shall be definite, indefinite shall be constructed */ ++ if (*con == ASN1_PRI && !def) ++ return 0; ++ + if (def) + *eoc = ctx->pointer + len; + else +@@ -389,6 +398,11 @@ asn1_oid_decode(struct asn1_ctx *ctx, + unsigned long *optr; + + size = eoc - ctx->pointer + 1; ++ ++ /* first subid actually encodes first two subids */ ++ if (size < 2 || size > ULONG_MAX/sizeof(unsigned long)) ++ return 0; ++ + *oid = kmalloc(size * sizeof(unsigned long), GFP_ATOMIC); + if (*oid == NULL) + return 0; +diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c +index 5daefad..7750c97 100644 +--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c ++++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c +@@ -232,6 +232,11 @@ static unsigned char asn1_length_decode(struct asn1_ctx *ctx, + } + } + } ++ ++ /* don't trust len bigger than ctx buffer */ ++ if (*len > ctx->end - ctx->pointer) ++ return 0; ++ + return 1; + } + +@@ -250,6 +255,10 @@ static unsigned char asn1_header_decode(struct asn1_ctx *ctx, + if (!asn1_length_decode(ctx, &def, &len)) + return 0; + ++ /* primitive shall be definite, indefinite shall be constructed */ ++ if (*con == ASN1_PRI && !def) ++ return 0; ++ + if (def) + *eoc = ctx->pointer + len; + else +@@ -434,6 +443,11 @@ static unsigned char asn1_oid_decode(struct asn1_ctx *ctx, + unsigned long *optr; + + size = eoc - ctx->pointer + 1; ++ ++ /* first subid actually encodes first two subids */ ++ if (size < 2 || size > ULONG_MAX/sizeof(unsigned long)) ++ return 0; ++ + *oid = kmalloc(size * sizeof(unsigned long), GFP_ATOMIC); + if (*oid == NULL) { + if (net_ratelimit()) +-- +1.5.5 + diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index 634c6a6..6cb76f6 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -1,7 +1,7 @@ # Compiling Time: 14.33 SBU # Maintainer: VMiklos -_F_kernel_patches=(CVE-2008-1669.patch) +_F_kernel_patches=(CVE-2008-1673.patch) Finclude kernel # you can safely bump this. -pkgrel=4kalgan2 +pkgrel=4kalgan3 diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index 7203f36..e808fff 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -18,4 +18,4 @@ # don't touch these two! _F_kernelver_ver=2.6.24 _F_kernelver_rel=3 -_F_kernelver_stable=6 +_F_kernelver_stable=7 diff --git a/source/network/madwifi/FrugalBuild b/source/network/madwifi/FrugalBuild index 53b65bd..cbf09a9 100644 --- a/source/network/madwifi/FrugalBuild +++ b/source/network/madwifi/FrugalBuild @@ -3,7 +3,7 @@ pkgname=madwifi pkgver=0.9.4 -pkgrel=2 +pkgrel=3kalgan1 pkgdesc="Madwifi drivers for Atheros wireless chipsets" url="http://madwifi.sourceforge.net/" Finclude kernel-module From ryuo at frugalware.org Wed Jun 18 16:26:28 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 16:26:30 2008 Subject: [Frugalware-git] rox: wifi-003-1-i686 Message-ID: <20080618142628.6F8661778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=0d73d330180dedd1dadb2c9c6606f6bbcf95bbd6 commit 0d73d330180dedd1dadb2c9c6606f6bbcf95bbd6 Author: James Buren Date: Wed Jun 18 09:26:17 2008 -0500 wifi-003-1-i686 * redraft diff --git a/source/rox-extra/wifi/FrugalBuild b/source/rox-extra/wifi/FrugalBuild new file mode 100644 index 0000000..1184219 --- /dev/null +++ b/source/rox-extra/wifi/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=wifi +pkgver=003 +pkgrel=1 +pkgdesc="ROX Applet for monitoring your wireless." +_F_rox_name=WiFi +_F_rox_subdir=Applets/ +Finclude rox +rodepends=('rox-lib') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=$_F_rox_name +up2date="Flasttar http://code.google.com/p/rox-wifi/downloads/list" +source=(http://rox-wifi.googlecode.com/files/$_F_rox_name-$pkgver.tgz) +archs=('i686') +sha1sums=('509da073e7523a36303111c491655ca452c6dc9b') From vmiklos at frugalware.org Wed Jun 18 16:33:31 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 18 16:33:33 2008 Subject: [Frugalware-git] frugalware-0.8: exiv2-0.16-2kalgan1-i686 Message-ID: <20080618143331.72C7D1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=a4f137893e0811d796f30b6dbc68212bc314f1a5 commit a4f137893e0811d796f30b6dbc68212bc314f1a5 Author: Miklos Vajna Date: Wed Jun 18 16:33:07 2008 +0200 exiv2-0.16-2kalgan1-i686 - added SA30519.patch - closes #3135 diff --git a/source/lib-extra/exiv2/FrugalBuild b/source/lib-extra/exiv2/FrugalBuild index 91d60b1..fd803ca 100644 --- a/source/lib-extra/exiv2/FrugalBuild +++ b/source/lib-extra/exiv2/FrugalBuild @@ -3,15 +3,16 @@ pkgname=exiv2 pkgver=0.16 -pkgrel=1 +pkgrel=2kalgan1 pkgdesc="Exiv2 is a C++ library and a command line utility to access image metadata." url="http://www.exiv2.org/" depends=('libstdc++' 'zlib') groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.exiv2.org/download.html|grep -m1 '.tar.gz'|sed 's/.*v2-\(.*\).t.*/\1/'" -source=($url/$pkgname-$pkgver.tar.gz) +source=($url/$pkgname-$pkgver.tar.gz SA30519.patch) Fconfopts="$Fconfopts --with-zlib=/usr" -sha1sums=('fd5cdec6b60fd52a15c73c30760e099bbfa3cf50') +sha1sums=('fd5cdec6b60fd52a15c73c30760e099bbfa3cf50' \ + '586dd4c2fb273407cab4eab0182876014dd17e05') # optimization OK diff --git a/source/lib-extra/exiv2/SA30519.patch b/source/lib-extra/exiv2/SA30519.patch new file mode 100644 index 0000000..a104f5d --- /dev/null +++ b/source/lib-extra/exiv2/SA30519.patch @@ -0,0 +1,54 @@ +--- src/nikonmn.cpp 2008/01/29 13:33:51 1385 ++++ src/nikonmn.cpp 2008/03/29 06:14:56 1399 +@@ -931,29 +931,31 @@ + std::ostream& Nikon3MakerNote::print0x0084(std::ostream& os, + const Value& value) + { +- if (value.count() == 4) { +- long len1 = value.toLong(0); +- long len2 = value.toLong(1); +- Rational fno1 = value.toRational(2); +- Rational fno2 = value.toRational(3); +- os << len1; +- if (len2 != len1) { +- os << "-" << len2; +- } +- os << "mm "; +- std::ostringstream oss; +- oss.copyfmt(os); +- os << "F" << std::setprecision(2) +- << static_cast(fno1.first) / fno1.second; +- if (fno2 != fno1) { +- os << "-" << std::setprecision(2) +- << static_cast(fno2.first) / fno2.second; +- } +- os.copyfmt(oss); +- } +- else { ++ if ( value.count() != 4 ++ || value.toRational(0).second == 0 ++ || value.toRational(1).second == 0) { + os << "(" << value << ")"; ++ return os; ++ } ++ long len1 = value.toLong(0); ++ long len2 = value.toLong(1); ++ ++ Rational fno1 = value.toRational(2); ++ Rational fno2 = value.toRational(3); ++ os << len1; ++ if (len2 != len1) { ++ os << "-" << len2; ++ } ++ os << "mm "; ++ std::ostringstream oss; ++ oss.copyfmt(os); ++ os << "F" << std::setprecision(2) ++ << static_cast(fno1.first) / fno1.second; ++ if (fno2 != fno1) { ++ os << "-" << std::setprecision(2) ++ << static_cast(fno2.first) / fno2.second; + } ++ os.copyfmt(oss); + return os; + } From vmiklos at frugalware.org Wed Jun 18 16:36:26 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 18 16:36:27 2008 Subject: [Frugalware-git] frugalware-0.8: ed-0.9-1-i686 Message-ID: <20080618143626.28C2A1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=9cd5e846db544ad5880c9542d7e9171ffec2ceb4 commit 9cd5e846db544ad5880c9542d7e9171ffec2ceb4 Author: crazy Date: Sun Apr 6 00:39:07 2008 +0200 ed-0.9-1-i686 * added devel-core to groups * commit fbc2200 in current diff --git a/source/base/ed/FrugalBuild b/source/base/ed/FrugalBuild index 7f6dab9..d59d4e2 100644 --- a/source/base/ed/FrugalBuild +++ b/source/base/ed/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="A POSIX-compliant line editor" url="http://www.gnu.org/software/ed/ed.html" depends=('glibc') -groups=('base') +groups=('base' 'devel-core') archs=('i686' 'x86_64' 'ppc') Fup2gnubz2 source=(http://ftp.gnu.org/pub/gnu/ed/$pkgname-$pkgver.tar.bz2) From ryuo at frugalware.org Wed Jun 18 16:47:18 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 16:47:20 2008 Subject: [Frugalware-git] rox: hdd-temp-0.2.3-1-i686 Message-ID: <20080618144718.4FEC51778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=043bdec4cc317e6f6a0fce9db6a3ef43dcb9ca70 commit 043bdec4cc317e6f6a0fce9db6a3ef43dcb9ca70 Author: James Buren Date: Wed Jun 18 09:47:12 2008 -0500 hdd-temp-0.2.3-1-i686 * redraft diff --git a/source/rox-extra/hdd-temp/FrugalBuild b/source/rox-extra/hdd-temp/FrugalBuild new file mode 100644 index 0000000..749117a --- /dev/null +++ b/source/rox-extra/hdd-temp/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=hdd-temp +pkgver=0.2.3 +pkgrel=1 +pkgdesc="ROX Applet for displaying harddrive temperature." +_F_rox_name=HddTemp +_F_rox_subdir=Applets/ +Finclude rox +rodepends=('rox-lib' 'hddtemp') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=${rodepends[1]} +up2date="Flasttar http://www.smlw.pl/~wytnijto/nosrc/misc/rox-hddtemp/" +source=(http://www.smlw.pl/~wytnijto/nosrc/misc/rox-hddtemp/${rodepends[1]}-$pkgver.tar.bz2) +archs=('i686') +sha1sums=('85c12252aa9a98c82d1973980b055b6b5df049b6') + +# optimization OK From vmiklos at frugalware.org Wed Jun 18 16:52:10 2008 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jun 18 16:52:11 2008 Subject: [Frugalware-git] frugalware-0.8: net-snmp-5.4.1-4kalgan2-i686 Message-ID: <20080618145210.5602E1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=322d19ce2ed2991d743a196465b97f7130e4c064 commit 322d19ce2ed2991d743a196465b97f7130e4c064 Author: Miklos Vajna Date: Wed Jun 18 16:51:53 2008 +0200 net-snmp-5.4.1-4kalgan2-i686 - add CVE-2008-0960.patch - closes #3142 diff --git a/source/network-extra/net-snmp/CVE-2008-0960.patch b/source/network-extra/net-snmp/CVE-2008-0960.patch new file mode 100644 index 0000000..a3534f5 --- /dev/null +++ b/source/network-extra/net-snmp/CVE-2008-0960.patch @@ -0,0 +1,17 @@ +CVE-2008-0960 net-snmp SNMPv3 authentication bypass (VU#877044) + +Source: upstream, https://sourceforge.net/tracker/index.php?func=detail&aid=1989089&group_id=12694&atid=456380 + +diff -up net-snmp-5.0.9/snmplib/scapi.c.orig net-snmp-5.0.9/snmplib/scapi.c +--- net-snmp-5.0.9/snmplib/scapi.c.orig 2008-06-04 10:19:26.000000000 +0200 ++++ net-snmp-5.0.9/snmplib/scapi.c 2008-06-04 10:20:45.000000000 +0200 +@@ -460,6 +460,9 @@ sc_check_keyed_hash(const oid * authtype + QUITFUN(SNMPERR_GENERR, sc_check_keyed_hash_quit); + } + ++ if (maclen != USM_MD5_AND_SHA_AUTH_LEN) { ++ QUITFUN(SNMPERR_GENERR, sc_check_keyed_hash_quit); ++ } + + /* + * Generate a full hash of the message, then compare diff --git a/source/network-extra/net-snmp/FrugalBuild b/source/network-extra/net-snmp/FrugalBuild index 807bd2e..35779f1 100644 --- a/source/network-extra/net-snmp/FrugalBuild +++ b/source/network-extra/net-snmp/FrugalBuild @@ -4,17 +4,20 @@ pkgname=net-snmp pkgver=5.4.1 -pkgrel=4kalgan1 +pkgrel=4kalgan2 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" url="http://www.net-snmp.org/" depends=('openssl' 'perl>=5.10.0') +# tmp hack +makedepends=('patch') groups=('network-extra') archs=('i686' 'x86_64') Finclude sourceforge up2date="lynx -dump http://www.net-snmp.org/download.html |grep Supported -A 2 |sed -ne 's/.*\([0-9].[0-9].[0-9]\).*/\1/;$ p'" -source=(${source[@]} CVE-2008-2292.patch rc.snmpd) +source=(${source[@]} CVE-2008-2292.patch CVE-2008-0960.patch rc.snmpd) sha1sums=('ac5ba033c10d53d3057415121f8c4936c643c208' \ '7f7f770fcebdeb8bb19515937895c9c545cc0609' \ + 'bfb79ccb4db8b524655a78739bbf0e5255c1f14a' \ 'df7a817499d12c53e9d2809f68c24fea9d3307b0') build() { From ryuo at frugalware.org Wed Jun 18 16:56:23 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 16:56:24 2008 Subject: [Frugalware-git] rox: xdg-menu-1.4-1-i686 Message-ID: <20080618145623.82A4D1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=0ffbe94559c4879ca521fecd5fe20e55fb90b02e commit 0ffbe94559c4879ca521fecd5fe20e55fb90b02e Author: James Buren Date: Wed Jun 18 09:56:18 2008 -0500 xdg-menu-1.4-1-i686 * redraft diff --git a/source/rox-extra/xdg-menu/FrugalBuild b/source/rox-extra/xdg-menu/FrugalBuild new file mode 100644 index 0000000..96674d3 --- /dev/null +++ b/source/rox-extra/xdg-menu/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=xdg-menu +pkgver=1.4 +pkgrel=1 +pkgdesc="ROX Applet for displaying XDG menus." +_F_rox_name=XDG-Menu +_F_rox_subdir=Applets/ +_F_sourceforge_name=$_F_rox_name +_F_sourceforge_dirname=$pkgname +_F_sourceforge_ext=.tgz +Finclude rox +rodepends=('rox-lib' 'pyxdg' 'dbus-python') +groups=(${groups[@]} 'rox-applets') +archs=('i686') +sha1sums=('34493d2da5ca6a74fffd93185ce11bd573468865') From ryuo at frugalware.org Wed Jun 18 20:13:38 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 20:13:40 2008 Subject: [Frugalware-git] rox: traylib-0.3.2.1-1-i686 Message-ID: <20080618181338.12AF61778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=da20c88a3fa2ad1d5ab68675e54a2ed8409cea39 commit da20c88a3fa2ad1d5ab68675e54a2ed8409cea39 Author: James Buren Date: Wed Jun 18 13:13:16 2008 -0500 traylib-0.3.2.1-1-i686 * redraft diff --git a/source/rox-extra/traylib/FrugalBuild b/source/rox-extra/traylib/FrugalBuild new file mode 100644 index 0000000..8f45493 --- /dev/null +++ b/source/rox-extra/traylib/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=traylib +pkgver=0.3.2.1 +pkgrel=1 +pkgdesc="A library for some rox applets." +_F_rox_name=TrayLib +_F_rox_override=1 +Finclude rox +rodepends=('rox-filer' 'pygtk') +groups=(${groups[@]} 'rox-other') +archs=('i686') +url="ftp://ftp.berlios.de/pub/rox4debian/libs" +_F_archive_name=$_F_rox_name +up2date="Flasttar $url" +source=($url/$_F_rox_name-$pkgver.tgz) +sha1sums=('d38e225fb77b254b33922de001fdbd8559d7f965') From ryuo at frugalware.org Wed Jun 18 20:22:30 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 20:22:31 2008 Subject: [Frugalware-git] rox: tasktray-0.7-1-i686 Message-ID: <20080618182230.10EFE1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=ca4bf4d2a3c04bce0aa460c9b077622f6053c674 commit ca4bf4d2a3c04bce0aa460c9b077622f6053c674 Author: James Buren Date: Wed Jun 18 13:22:23 2008 -0500 tasktray-0.7-1-i686 * redraft diff --git a/source/rox-extra/tasktray/FrugalBuild b/source/rox-extra/tasktray/FrugalBuild new file mode 100644 index 0000000..9a10176 --- /dev/null +++ b/source/rox-extra/tasktray/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=tasktray +pkgver=0.7 +pkgrel=1 +pkgdesc="ROX Applet for displaying windows as icons." +_F_rox_name=TaskTray +_F_rox_subdir=Applets/ +Finclude rox +rodepends=('rox-lib' 'traylib' 'gnome-python-desktop-wnck') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=$_F_rox_name +up2date="Flasttar ftp://ftp.berlios.de/pub/rox4debian/apps" +source=(ftp://ftp.berlios.de/pub/rox4debian/apps/$_F_rox_name-$pkgver.tgz) +archs=('i686') +sha1sums=('56324abea01e75fae8633264d5077cc83f2dcbaa') From ryuo at frugalware.org Wed Jun 18 20:36:00 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 20:36:01 2008 Subject: [Frugalware-git] rox: pycups-1.9.39-1-i686 Message-ID: <20080618183600.093131778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=a689e02d2564ea47389b42e626ecb17dcc1b8425 commit a689e02d2564ea47389b42e626ecb17dcc1b8425 Author: James Buren Date: Wed Jun 18 13:35:35 2008 -0500 pycups-1.9.39-1-i686 * new package diff --git a/source/lib-extra/pycups/FrugalBuild b/source/lib-extra/pycups/FrugalBuild new file mode 100644 index 0000000..72d624a --- /dev/null +++ b/source/lib-extra/pycups/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.02 SBU +# Maintainer: James Buren + +pkgname=pycups +pkgver=1.9.39 +pkgrel=1 +pkgdesc="The python bindings for cups." +url="http://cyberelk.net/tim/software/pycups/" +depends=('python' 'cups') +groups=('lib-extra') +archs=('i686' 'x86_64') +up2date="Flasttar `echo $url | sed 's|software|data|'`" +source=(`echo $url | sed 's|software|data|'`/$pkgname-$pkgver.tar.bz2) +sha1sums=('82a8d6bffdd4ec8425b4a19efaa02c8129082f85') + +# optimization OK From ryuo at frugalware.org Wed Jun 18 20:39:58 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 20:40:00 2008 Subject: [Frugalware-git] rox: devtray-0.4.1-1-i686 Message-ID: <20080618183958.824E91778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=f6ae680937001f94059a620948cbcb97a7ee7d09 commit f6ae680937001f94059a620948cbcb97a7ee7d09 Author: James Buren Date: Wed Jun 18 13:39:40 2008 -0500 devtray-0.4.1-1-i686 * redraft diff --git a/source/rox-extra/devtray/FrugalBuild b/source/rox-extra/devtray/FrugalBuild new file mode 100644 index 0000000..1cca882 --- /dev/null +++ b/source/rox-extra/devtray/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=devtray +pkgver=0.4.1 +pkgrel=1 +pkgdesc="ROX Applet for managing various devices through HAL." +_F_rox_name=DevTray +_F_rox_subdir=Applets/ +Finclude rox +rodepends=('rox-lib' 'traylib' 'dbus-python' 'hal' 'pyalsaaudio' 'pycups' 'cddb-py') +groups=(${groups[@]} 'rox-applets') +_F_archive_name=$_F_rox_name +up2date="Flasttar ftp://ftp.berlios.de/pub/rox4debian/apps" +source=(ftp://ftp.berlios.de/pub/rox4debian/apps/$_F_rox_name-$pkgver.tgz) +archs=('i686') +sha1sums=('bc786c46e301ae6cd45c0bec9dda7ba450bd5e32') From priyank at frugalware.org Wed Jun 18 20:44:19 2008 From: priyank at frugalware.org (Priyank) Date: Wed Jun 18 20:44:22 2008 Subject: [Frugalware-git] frugalware-current: gnomebaker-0.6.4-1-i686 Message-ID: <20080618184419.EE9EA1778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a5b576a7ecb3eb29ea5718a1cc9f3d6d1d7f7205 commit a5b576a7ecb3eb29ea5718a1cc9f3d6d1d7f7205 Author: Priyank Date: Thu Jun 19 00:11:12 2008 +0530 gnomebaker-0.6.4-1-i686 * Version bump * Added rarian to depends() diff --git a/source/gnome-extra/gnomebaker/FrugalBuild b/source/gnome-extra/gnomebaker/FrugalBuild index 7183046..0283822 100644 --- a/source/gnome-extra/gnomebaker/FrugalBuild +++ b/source/gnome-extra/gnomebaker/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Priyank Gosalia pkgname=gnomebaker -pkgver=0.6.2 +pkgver=0.6.4 pkgrel=1 pkgdesc="GnomeBaker is a CD/DVD burning application for the Gnome desktop." url="http://gnomebaker.sourceforge.net/" makedepends=('intltool') -depends=('libgnomeui>=2.18.1' 'gtk+2' 'libglade' 'libnotify' 'cdrtools' 'mpg321' \ - 'vorbis-tools' 'sox' 'dvd+rw-tools' 'perl-xml-parser' 'gstreamer') +depends=('libgnomeui>=2.22.1' 'gtk+2' 'libglade' 'libnotify' 'cdrtools' 'mpg321' \ + 'vorbis-tools' 'sox' 'dvd+rw-tools' 'perl-xml-parser' 'gstreamer' 'rarian') groups=('gnome-extra') archs=('i686' 'x86_64') _F_gnome_scrollkeeper="y" @@ -16,6 +16,6 @@ _F_gnome_iconcache="y" _F_sourceforge_broken_up2date=1 Finclude gnome-scriptlet sourceforge Fconfopts="${Fconfopts[@]} --enable-libnotify" -sha1sums=('0c4581eb9639172d1221817e621582b22c54a236') +sha1sums=('ead0fe0091a1de7ae9197bf8e1b374749fc7c61b') # optimization OK From ryuo at frugalware.org Wed Jun 18 21:03:53 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 21:03:56 2008 Subject: [Frugalware-git] rox: rox-session-0.40.0-1-i686 Message-ID: <20080618190353.324A21778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=7915b7c8fdf61e38822143da1dc547852c4e53d0 commit 7915b7c8fdf61e38822143da1dc547852c4e53d0 Author: James Buren Date: Wed Jun 18 14:03:35 2008 -0500 rox-session-0.40.0-1-i686 * redraft diff --git a/source/rox-extra/rox-session/FrugalBuild b/source/rox-extra/rox-session/FrugalBuild new file mode 100644 index 0000000..089694f --- /dev/null +++ b/source/rox-extra/rox-session/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.03 SBU +# Maintainer: James Buren + +pkgname=rox-session +pkgver=0.40.0 +pkgrel=1 +pkgdesc="Session manager for ROX desktop." +_F_rox_name=ROX-Session +_F_sourceforge_name=$pkgname +options=('scriptlet') +Finclude rox +rodepends=('rox-filer') +depends=('gtk+2' 'glibc' 'freetype2' 'libxau' 'libxdmcp' 'dbus-glib' 'libxtst' 'libxxf86vm' 'libxdamage') +groups=(${groups[@]} 'rox-core') +archs=('i686') +sha1sums=('c41010c0364c8e9fcac02e7e4cfda6684e798460') + +# optimization OK From ryuo at frugalware.org Wed Jun 18 21:06:18 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 21:06:20 2008 Subject: [Frugalware-git] rox: rox-session-0.40.0-1-i686 Message-ID: <20080618190618.5DCE01778015@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=d2a0401f478866bfc05468c405811798e4a4e1cc commit d2a0401f478866bfc05468c405811798e4a4e1cc Author: James Buren Date: Wed Jun 18 14:06:26 2008 -0500 rox-session-0.40.0-1-i686 * removed unnecessary line diff --git a/source/rox-extra/rox-session/FrugalBuild b/source/rox-extra/rox-session/FrugalBuild index 089694f..bb7279e 100644 --- a/source/rox-extra/rox-session/FrugalBuild +++ b/source/rox-extra/rox-session/FrugalBuild @@ -6,7 +6,6 @@ pkgver=0.40.0 pkgrel=1 pkgdesc="Session manager for ROX desktop." _F_rox_name=ROX-Session -_F_sourceforge_name=$pkgname options=('scriptlet') Finclude rox rodepends=('rox-filer') From ryuo at frugalware.org Wed Jun 18 21:49:55 2008 From: ryuo at frugalware.org (James Buren) Date: Wed Jun 18 21:50:00 2008 Subject: [Frugalware-git] rox: edit-2.0-1-i686 Message-ID: <20080618194955.F04D81778050@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=rox.git;a=commitdiff;h=a8b25b7cd06e7164f7a7373ef3b77049afd3b0dd commit a8b25b7cd06e7164f7a7373ef3b77049afd3b0dd Author: James Buren Date: Wed Jun 18 14:49:26 2008 -0500 edit-2.0-1-i686 * clean up diff --git a/source/rox-extra/edit/edit-2.0/Edit/.DirIcon b/source/rox-extra/edit/edit-2.0/Edit/.DirIcon deleted file mode 100644 index f3dc988..0000000 Binary files a/source/rox-extra/edit/edit-2.0/Edit/.DirIcon and /dev/null differ diff --git a/source/rox-extra/edit/edit-2.0/Edit/.cvsignore b/source/rox-extra/edit/edit-2.0/Edit/.cvsignore deleted file mode 100644 index 0d20b64..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.pyc diff --git a/source/rox-extra/edit/edit-2.0/Edit/AppInfo.xml b/source/rox-extra/edit/edit-2.0/Edit/AppInfo.xml deleted file mode 100644 index 69d60dd..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/AppInfo.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - Simple text editor - Un semplice editor di testi - Un simple editor de texto - Ein einfacher Texteditor - 文字编辑器 - 文字編輯器 - - Text editor - 2.0 (21-Sep-2005) - Thomas Leonard - GNU General Public License - http://rox.sourceforge.net - - - editor di testi - - - - - - - Editor de texto - - - - - - - Texteditor - - - - - 文字编辑器 - - - - - - - 文字編輯器 - - - - - - diff --git a/source/rox-extra/edit/edit-2.0/Edit/AppRun b/source/rox-extra/edit/edit-2.0/Edit/AppRun deleted file mode 100755 index b58fd45..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/AppRun +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python -import setup - -import sys -import rox -import EditWindow - -try: - from optparse import OptionParser -except ImportError: - # optparse missing, e.g. in Python 2.2 - line_number = None - args = sys.argv[1:] -else: - parser = OptionParser() - parser.add_option("-l", "--line_number", type='int', - dest="line_number", default=None, - help="start editor at given line number") - - (options, args) = parser.parse_args() - line_number = options.line_number - -if len(args): - for file in args: - try: - EditWindow.EditWindow(file, line_number = line_number) - except EditWindow.Abort: - pass -else: - EditWindow.EditWindow() - -rox.mainloop() diff --git a/source/rox-extra/edit/edit-2.0/Edit/CVS/Entries b/source/rox-extra/edit/edit-2.0/Edit/CVS/Entries deleted file mode 100644 index 393fd28..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/CVS/Entries +++ /dev/null @@ -1,17 +0,0 @@ -/.DirIcon/1.2/Fri May 16 10:13:21 2003/-ko/TRelease-2-0 -/.cvsignore/1.1/Fri Jul 19 15:43:34 2002//TRelease-2-0 -/AppInfo.xml/1.18/Wed Sep 21 09:18:51 2005//TRelease-2-0 -/AppRun/1.16/Sat Sep 3 09:53:52 2005//TRelease-2-0 -/Edit.xml/1.4/Wed Sep 21 09:19:56 2005//TRelease-2-0 -/EditWindow.py/1.61/Tue Sep 20 20:30:19 2005//TRelease-2-0 -/Options.xml/1.15/Sat Jul 9 16:22:58 2005//TRelease-2-0 -/buffer.py/1.11/Tue Jun 21 20:05:25 2005//TRelease-2-0 -/diff.py/1.8/Sat May 28 16:21:40 2005//TRelease-2-0 -/findrox.py/1.13/Mon May 2 17:58:32 2005//TRelease-2-0 -/goto.py/1.5/Sat May 28 16:21:40 2005//TRelease-2-0 -/search.py/1.13/Sat May 21 18:34:50 2005//TRelease-2-0 -/setup.py/1.4/Sat Sep 3 09:37:14 2005//TRelease-2-0 -D/Help//// -D/Messages//// -D/images//// -D/tests//// diff --git a/source/rox-extra/edit/edit-2.0/Edit/CVS/Repository b/source/rox-extra/edit/edit-2.0/Edit/CVS/Repository deleted file mode 100644 index e99d6e3..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -Edit diff --git a/source/rox-extra/edit/edit-2.0/Edit/CVS/Root b/source/rox-extra/edit/edit-2.0/Edit/CVS/Root deleted file mode 100644 index 01d4116..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -tal197@cvs.sourceforge.net:/cvsroot/rox diff --git a/source/rox-extra/edit/edit-2.0/Edit/CVS/Tag b/source/rox-extra/edit/edit-2.0/Edit/CVS/Tag deleted file mode 100644 index 8833b6e..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NRelease-2-0 diff --git a/source/rox-extra/edit/edit-2.0/Edit/Edit.xml b/source/rox-extra/edit/edit-2.0/Edit/Edit.xml deleted file mode 100644 index d11dbed..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Edit.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - Edit - simple text editor - - Edit is a simple text editor, with a ROX-style user interface. It has drag-and-drop saving, search-and-replace and multi-level undo. - - - - - - - - - - diff --git a/source/rox-extra/edit/edit-2.0/Edit/EditWindow.py b/source/rox-extra/edit/edit-2.0/Edit/EditWindow.py deleted file mode 100644 index d7cf875..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/EditWindow.py +++ /dev/null @@ -1,925 +0,0 @@ - -import rox -from rox import g, filer, app_options, mime -import sys -from rox.loading import XDSLoader -from rox.options import Option -from rox import OptionsBox -from rox.saving import Saveable -import os -import diff -import codecs - -# WARNING: This is a temporary hack, until we write a way choose between -# the two ways of doing toolbars or we abandon the old method entirely -import warnings -warnings.filterwarnings('ignore', category=DeprecationWarning, - module='EditWindow') -# End temporary hack - -def optional_section(available): - """If requires is None, the section is enabled. Otherwise, - the section is shaded and the requires message is shown at - the top.""" - if available: - def build_enabled_section(box, node, label): - return box.do_box(node, None, g.VBox(False, 0)) - return build_enabled_section - else: - def build_disabled_section(box, node, label): - assert label is not None - box, = box.do_box(node, None, g.VBox(False, 0)) - box.set_sensitive(False) - frame = g.Frame(label) - box.set_border_width(4) - frame.add(box) - return [frame] - return build_disabled_section - -try: - import gtkspell - have_spell = True -except: - have_spell = False - -to_utf8 = codecs.getencoder('utf-8') - -from buffer import Buffer, have_sourceview -from rox.Menu import Menu, set_save_name, SubMenu, Separator, Action, ToggleItem - -OptionsBox.widget_registry['source-view-only'] = optional_section(have_sourceview) - -default_font = Option('default_font', 'serif') - -background_colour = Option('background', '#fff') -foreground_colour = Option('foreground', '#000') - -auto_indent = Option('autoindent', '1') -word_wrap = Option('wordwrap', '1') - -layout_left_margin = Option('layout_left_margin', 2) -layout_right_margin = Option('layout_right_margin', 4) - -layout_before_para = Option('layout_before_para', 0) -layout_after_para = Option('layout_after_para', 0) -layout_inside_para = Option('layout_inside_para', 0) -layout_indent_para = Option('layout_indent_para', 2) - -right_margin = Option('right_margin', 80) -show_margin = Option('show_margin', True) -smart_home_end = Option('smart_home_end', True) -show_line_numbers = Option('show_line_numbers', True) -show_line_markers = Option('show_line_markers', True) -tab_width = Option('tab_width', 4) -use_spaces_for_tabs = Option('use_spaces_for_tabs', False) - -show_toolbar = Option('show_toolbar', 1) - -set_save_name('Edit', site='rox.sourceforge.net') - -edit_menu = [ - Action(_('Cut'), 'cut', 'X', g.STOCK_CUT), - Action(_('Copy'), 'copy', 'C', g.STOCK_COPY), - Action(_('Paste'), 'paste', 'V', g.STOCK_PASTE), - Separator(), - Action(_('Undo'), 'undo', 'Z', g.STOCK_UNDO), - Action(_('Redo'), 'redo', 'Y', g.STOCK_REDO), - Separator(), - Action(_('Search...'), 'search', 'F4', g.STOCK_FIND), - Action(_('Search and Replace....'), 'search_replace', - 'F4', g.STOCK_FIND_AND_REPLACE), - Action(_('Goto line...'), 'goto', 'F5', g.STOCK_JUMP_TO), - ] - -bookmark_menu = [ - Separator(), - Action(_('Toggle Bookmark'), 'toggle_bookmark', 'F2'), - Action(_('Next Bookmark'), 'next_bookmark', 'F2'), - Action(_('Previous Bookmark'), 'prev_bookmark', 'F2'), - ] - -if have_sourceview: - edit_menu += bookmark_menu - -menu = Menu('main', [ -SubMenu(_('File'), [ - Action(_('Save'), 'save', 'S', g.STOCK_SAVE), - Action(_('Save As...'), 'save_as', '', g.STOCK_SAVE_AS), - Action(_('Open Parent'), 'up', '', g.STOCK_GO_UP), - Action(_('Show Changes'), 'diff', '', 'rox-diff'), - ToggleItem(_('Word Wrap'), 'word_wrap'), - Action(_('Close'), 'close', '', g.STOCK_CLOSE), - Separator(), - Action(_('New'), 'new', '', g.STOCK_NEW)]), - -SubMenu(_('Edit'), edit_menu), - -Action(_('Options'), 'show_options', '', g.STOCK_PROPERTIES), -Action(_('Help'), 'help', 'F1', g.STOCK_HELP), -]) - -known_codecs = ( - "iso8859_1", "iso8859_2", "iso8859_3", "iso8859_4", "iso8859_5", - "iso8859_6", "iso8859_7", "iso8859_8", "iso8859_9", "iso8859_10", - "iso8859_13", "iso8859_14", "iso8859_15", - "ascii", "base64_codec", "charmap", - "cp037", "cp1006", "cp1026", "cp1140", "cp1250", "cp1251", "cp1252", - "cp1253", "cp1254", "cp1255", "cp1256", "cp1257", "cp1258", "cp424", - "cp437", "cp500", "cp737", "cp775", "cp850", "cp852", "cp855", "cp856", - "cp857", "cp860", "cp861", "cp862", "cp863", "cp864", "cp865", "cp866", - "cp869", "cp874", "cp875", "hex_codec", - "koi8_r", - "latin_1", - "mac_cyrillic", "mac_greek", "mac_iceland", "mac_latin2", "mac_roman", "mac_turkish", - "mbcs", "quopri_codec", "raw_unicode_escape", - "rot_13", - "utf_16_be", "utf_16_le", "utf_16", "utf_7", "utf_8", "uu_codec", - "zlib_codec" -) - -class Abort(Exception): - pass - -class Minibuffer: - def setup(self): - """Called when the minibuffer is opened.""" - - def key_press(self, kev): - """A keypress event in the minibuffer text entry.""" - - def changed(self): - """The minibuffer text has changed.""" - - def activate(self): - """Return or Enter pressed.""" - - info = 'Press Escape to close the minibuffer.' - -class DiffLoader(XDSLoader): - def __init__(self, window): - XDSLoader.__init__(self, ['text/plain']) - self.window = window - - def xds_load_from_file(self, path): - self.window.diff(path = path) - - def xds_load_from_stream(self, name, type, stream): - tmp = diff.Tmp(suffix = '-' + (name or 'tmp')) - import shutil - shutil.copyfileobj(stream, tmp) - tmp.seek(0) - self.window.diff(path = tmp.name) - -class EditWindow(rox.Window, XDSLoader, Saveable): - _word_wrap = False - wrap_button = None - - def __init__(self, filename = None, show = True, line_number = None): - rox.Window.__init__(self) - XDSLoader.__init__(self, ['text/plain', 'UTF8_STRING']) - self.set_default_size(g.gdk.screen_width() * 2 / 3, - g.gdk.screen_height() / 2) - - self.savebox = None - self.info_box = None - self.language = None - - app_options.add_notify(self.update_styles) - - if filename: - import os.path - if not os.path.exists(filename): - try: - filename2, line_number = filename.split(':') - line_number = long(line_number) - except ValueError: - # Either there was no ':', or it wasn't followed by a number - pass - else: - filename = filename2 - self.uri = os.path.abspath(filename) - self.mime_type = mime.get_type(self.uri, 1) - else: - self.uri = None - self.mime_type = mime.lookup('text', 'plain') - - self.buffer = Buffer() - - try: - import gtksourceview - self.text = gtksourceview.SourceView(self.buffer) - pixbuf = g.gdk.pixbuf_new_from_file(rox.app_dir+"/images/marker.png") - self.text.set_marker_pixbuf("bookmark", pixbuf) - if self.mime_type: - self.buffer.set_type(self.mime_type) - except: - self.text = g.TextView() - self.text.set_buffer(self.buffer) - - self.text.set_size_request(10, 10) - self.xds_proxy_for(self.text) - - self.insert_mark = self.buffer.get_mark('insert') - self.selection_bound_mark = self.buffer.get_mark('selection_bound') - start = self.buffer.get_start_iter() - self.mark_start = self.buffer.create_mark('mark_start', start, True) - self.mark_end = self.buffer.create_mark('mark_end', start, False) - self.mark_tmp = self.buffer.create_mark('mark_tmp', start, False) - tag = self.buffer.create_tag('marked') - tag.set_property('background', 'green') - self.marked = 0 - - # When searching, this is where the cursor was when the minibuffer - # was opened. - start = self.buffer.get_start_iter() - self.search_base = self.buffer.create_mark('search_base', start, True) - - vbox = g.VBox(False) - self.add(vbox) - - tools = g.Toolbar() - tools.set_style(g.TOOLBAR_ICONS) - vbox.pack_start(tools, False, True, 0) - - self.status_label = g.Label('') - tools.append_widget(self.status_label, None, None) - tools.insert_stock(g.STOCK_HELP, _('Help'), None, self.help, None, 0) - diff = tools.insert_stock('rox-diff', _('Show changes from saved copy.\n' - 'Or, drop a backup file onto this button to see changes from that.'), - None, self.diff, None, 0) - DiffLoader(self).xds_proxy_for(diff) - - if have_spell: - self.spell = None - image_spell = g.Image() - image_spell.set_from_stock(g.STOCK_SPELL_CHECK, tools.get_icon_size()) - self.spell_button = tools.insert_element(g.TOOLBAR_CHILD_TOGGLEBUTTON, - None, _("Check Spelling"), _("Check Spelling"), None, - image_spell, self.toggle_spell, None, 0) - - image_wrap = g.Image() - image_wrap.set_from_file(rox.app_dir + '/images/rox-word-wrap.png') - self.wrap_button = tools.insert_element(g.TOOLBAR_CHILD_TOGGLEBUTTON, - None, _("Word Wrap"), _("Word Wrap"), None, image_wrap, - lambda button: self.set_word_wrap(button.get_active()), - None, 0) - tools.insert_stock(g.STOCK_REDO, _('Redo'), None, self.redo, None, 0) - tools.insert_stock(g.STOCK_UNDO, _('Undo'), None, self.undo, None, 0) - tools.insert_stock(g.STOCK_FIND_AND_REPLACE, _('Replace'), None, self.search_replace, None, 0) - tools.insert_stock(g.STOCK_FIND, _('Search'), None, self.search, None, 0) - tools.insert_stock(g.STOCK_SAVE_AS, _('Save As'), None, self.save_as, None, 0) - self.save_button = tools.insert_stock(g.STOCK_SAVE, _('Save'), None, self.save, None, 0) - tools.insert_stock(g.STOCK_GO_UP, _('Up'), None, self.up, None, 0) - tools.insert_stock(g.STOCK_CLOSE, _('Close'), None, self.close, None, 0) - # Set minimum size to ignore the label - tools.set_size_request(tools.size_request()[0], -1) - - self.tools = tools - - swin = g.ScrolledWindow() - swin.set_policy(g.POLICY_AUTOMATIC, g.POLICY_AUTOMATIC) - vbox.pack_start(swin, True, True) - - swin.add(self.text) - - if show: - self.show_all() - self.update_styles() - - self.update_title() - - # Create the minibuffer - self.mini_hbox = g.HBox(False) - - info = rox.ButtonMixed(g.STOCK_DIALOG_INFO, '') - info.set_relief(g.RELIEF_NONE) - info.unset_flags(g.CAN_FOCUS) - info.connect('clicked', self.mini_show_info) - - close = rox.ButtonMixed(g.STOCK_STOP, '') - close.set_relief(g.RELIEF_NONE) - close.unset_flags(g.CAN_FOCUS) - close.connect('clicked', lambda e: self.set_minibuffer(None)) - - self.mini_hbox.pack_end(info, False, True, 0) - self.mini_hbox.pack_start(close, False, True, 0) - self.mini_label = g.Label('') - self.mini_hbox.pack_start(self.mini_label, False, True, 0) - self.mini_entry = g.Entry() - self.mini_hbox.pack_start(self.mini_entry, True, True, 0) - vbox.pack_start(self.mini_hbox, False, True) - self.mini_entry.connect('key-press-event', self.mini_key_press) - self.mini_entry.connect('changed', self.mini_changed) - - self.connect('destroy', self.destroyed) - - self.connect('delete-event', self.delete_event) - self.text.grab_focus() - self.text.connect('key-press-event', self.key_press) - - # FIXME: why does this freeze Edit? - #if have_spell: - #if self.mime_type.media == 'text' and self.mime_type.subtype == 'plain': - #self.toggle_spell() - ##self.spell.set_language ("en_US") - - def update_current_line(*unused): - cursor = self.buffer.get_iter_at_mark(self.insert_mark) - bound = self.buffer.get_iter_at_mark(self.selection_bound_mark) - if cursor.compare(bound) == 0: - n_lines = self.buffer.get_line_count() - self.status_label.set_text(_('Line %s of %d') % (cursor.get_line() + 1, n_lines)) - else: - n_lines = abs(cursor.get_line() - bound.get_line()) + 1 - if n_lines == 1: - n_chars = abs(cursor.get_line_offset() - bound.get_line_offset()) - if n_chars == 1: - bytes = to_utf8(self.buffer.get_text(cursor, bound, False))[0] - self.status_label.set_text(_('One character selected (%s)') % - ' '.join(map(lambda x: '0x%2x' % ord(x), bytes))) - else: - self.status_label.set_text(_('%d characters selected') % n_chars) - else: - self.status_label.set_text(_('%d lines selected') % n_lines) - self.buffer.connect('mark-set', update_current_line) - self.buffer.connect('changed', update_current_line) - - - # Loading might take a while, so get something on the screen - # now... - g.gdk.flush() - - if filename: - try: - self.load_file(filename) - if filename != '-': - self.save_last_stat = os.stat(filename) - except Abort: - self.destroy() - raise - - self.buffer.connect('modified-changed', self.update_title) - self.buffer.set_modified(False) - - def button_press(text, event): - if event.button != 3: - return False - #self.text.emit('populate-popup', menu.menu) - menu.popup(self, event) - return True - self.text.connect('button-press-event', button_press) - self.text.connect('popup-menu', lambda text: menu.popup(self, None)) - - menu.attach(self, self) - self.buffer.place_cursor(self.buffer.get_start_iter()) - self.buffer.start_undo_history() - - if line_number: - iter = self.buffer.get_iter_at_line(int(line_number) - 1) - self.buffer.place_cursor(iter) - self.text.scroll_to_mark(self.insert_mark, 0.05, False) - - def key_press(self, text, kev): - if kev.keyval == g.keysyms.Return or kev.keyval == g.keysyms.KP_Enter: - return self.auto_indent() - elif kev.keyval == g.keysyms.Tab or kev.keyval == g.keysyms.KP_Tab: - return self.indent_block() - elif kev.keyval == g.keysyms.ISO_Left_Tab: - return self.unindent_block() - - def auto_indent(self): - if not auto_indent.int_value: - return False - - start = self.buffer.get_iter_at_mark(self.insert_mark) - end = start.copy() - start.set_line_offset(0) - end.forward_to_line_end() - line = self.buffer.get_text(start, end, False) - indent = '' - - if self.mime_type.subtype == 'x-python': - try: - l = line.split('\n')[0] - except: - l = line - if l.endswith(':') and not l.startswith('#'): - if use_spaces_for_tabs.int_value: - indent += ' ' * tab_width.int_value - else: - indent += '\t' - elif have_sourceview: - return False - - for x in line: - if x in ' \t': - indent += x - else: - break - - self.buffer.begin_user_action() - self.buffer.insert_at_cursor('\n' + indent) - self.buffer.end_user_action() - return True - - def indent_block(self): - try: - (start, end) = self.buffer.get_selection_bounds() - start_line = start.get_line() - end_line = end.get_line() - self.buffer.begin_user_action() - for i in range(start_line, end_line+1): - iter = self.buffer.get_iter_at_line(i) - self.buffer.insert(iter, '\t') - self.buffer.end_user_action() - return True - except: - return False - - def unindent_block(self): - try: - (start, end) = self.buffer.get_selection_bounds() - start_line = start.get_line() - end_line = end.get_line() - self.buffer.begin_user_action() - for i in range(start_line, end_line+1): - iter = self.buffer.get_iter_at_line(i) - if iter.get_char() == '\t': - next_char = iter.copy() - next_char.forward_char() - self.buffer.delete(iter, next_char) - self.buffer.end_user_action() - return True - except: - return False - - def destroyed(self, widget): - app_options.remove_notify(self.update_styles) - - def update_styles(self): - try: - import pango - font = pango.FontDescription(default_font.value) - bg = g.gdk.color_parse(background_colour.value) - fg = g.gdk.color_parse(foreground_colour.value) - - self.text.set_left_margin(layout_left_margin.int_value) - self.text.set_right_margin(layout_right_margin.int_value) - - self.text.set_pixels_above_lines(layout_before_para.int_value) - self.text.set_pixels_below_lines(layout_after_para.int_value) - self.text.set_pixels_inside_wrap(layout_inside_para.int_value) - self.text.set_indent(layout_indent_para.int_value) - - self.word_wrap = bool(word_wrap.int_value) - - if show_toolbar.int_value: - self.tools.show() - else: - self.tools.hide() - except: - rox.report_exception() - else: - self.text.modify_font(font) - self.text.modify_base(g.STATE_NORMAL, bg) - self.text.modify_text(g.STATE_NORMAL, fg) - - if have_sourceview: - self.text.set_show_line_numbers(show_line_numbers.int_value) - self.text.set_show_line_markers(show_line_markers.int_value) - self.text.set_auto_indent(auto_indent.int_value) - self.text.set_tabs_width(tab_width.int_value) - self.text.set_insert_spaces_instead_of_tabs(use_spaces_for_tabs.int_value) - self.text.set_margin(right_margin.int_value) - self.text.set_show_margin(show_margin.int_value) - self.text.set_smart_home_end(smart_home_end.int_value) - if self.buffer.language == 'Python': - self.text.set_auto_indent(False) - - def cut(self): self.text.emit('cut_clipboard') - def copy(self): self.text.emit('copy_clipboard') - def paste(self): self.text.emit('paste_clipboard') - - def delete_event(self, window, event): - if self.buffer.get_modified(): - self.save_as(discard = 1) - return 1 - return 0 - - def update_title(self, *unused): - title = self.uri or '<'+_('Untitled')+'>' - if self.buffer.get_modified(): - title = title + " *" - self.save_button.set_sensitive(True) - else: - self.save_button.set_sensitive(False) - self.set_title(title) - - def xds_load_from_stream(self, name, t, stream): - if t == 'UTF8_STRING': - return # Gtk will handle it - try: - self.insert_data(stream.read()) - except Abort: - pass - - def get_encoding(self, message): - "Returns (encoding, errors), or raises Abort to cancel." - box = g.MessageDialog(self, 0, g.MESSAGE_QUESTION, g.BUTTONS_CANCEL, message) - box.set_has_separator(False) - - frame = g.Frame() - box.vbox.pack_start(frame, True, True) - frame.set_border_width(6) - - hbox = g.HBox(False, 4) - hbox.set_border_width(6) - - hbox.pack_start(g.Label(_('Encoding:')), False, True, 0) - combo = g.Combo() - combo.disable_activate() - combo.entry.connect('activate', lambda w: box.activate_default()) - combo.set_popdown_strings(known_codecs) - hbox.pack_start(combo, True, True, 0) - ignore_errors = g.CheckButton(_('Ignore errors')) - hbox.pack_start(ignore_errors, False, True) - - frame.add(hbox) - - box.vbox.show_all() - box.add_button(g.STOCK_CONVERT, g.RESPONSE_YES) - box.set_default_response(g.RESPONSE_YES) - - while 1: - combo.entry.grab_focus() - - resp = box.run() - if resp != g.RESPONSE_YES: - box.destroy() - raise Abort - - if ignore_errors.get_active(): - errors = 'replace' - else: - errors = 'strict' - encoding = combo.entry.get_text() - try: - codecs.getdecoder(encoding) - break - except: - rox.alert(_("Unknown encoding '%s'") % encoding) - - box.destroy() - - return encoding, errors - - def insert_data(self, data): - import codecs - errors = 'strict' - encoding = 'utf-8' - while 1: - decoder = codecs.getdecoder(encoding) - try: - data = decoder(data, errors)[0] - if errors == 'strict': - assert '\0' not in data - else: - if '\0' in data: - data = data.replace('\0', '\\0') - break - except: - pass - - encoding, errors = self.get_encoding( - _("Data is not valid %s. Please select the file's encoding. " - "Turn on 'ignore errors' to try and load it anyway.") - % encoding) - - self.buffer.begin_user_action() - self.buffer.insert_at_cursor(data) - self.buffer.end_user_action() - return 1 - - def load_file(self, path): - try: - if path == '-': - file = sys.stdin - else: - file = open(path, 'r') - contents = file.read() - if path != '-': - file.close() - - self.buffer.begin_not_undoable_action() - self.insert_data(contents) - self.buffer.end_not_undoable_action() - except Abort: - raise - except: - rox.report_exception() - raise Abort - - def close(self, button = None): - if self.buffer.get_modified(): - self.save_as(discard = 1) - else: - self.destroy() - - def discard(self): - self.destroy() - - def up(self, button = None): - if self.uri: - filer.show_file(self.uri) - else: - rox.alert(_('File is not saved to disk yet')) - - - def toggle_spell(self, button = None): - if self.spell: - self.spell.detach() - self.spell = None - self.spell_button.set_active(False) - else: - try: - self.spell = gtkspell.Spell(self.text) - self.spell_button.set_active(True) - except: - self.spell = None - self.spell_button.set_active(False) - - #self.spell_button.set_active(self.spell != None) - - def diff(self, button = None, path = None): - path = path or self.uri - if not path: - rox.alert(_('This file has never been saved; nothing to compare it to!\n' - 'Note: you can drop a file onto the toolbar button to see ' - 'the changes from that file.')) - return - diff.show_diff(path, self.save_to_stream) - - def has_selection(self): - s, e = self.get_selection_range() - return not e.equal(s) - - def get_marked_range(self): - s = self.buffer.get_iter_at_mark(self.mark_start) - e = self.buffer.get_iter_at_mark(self.mark_end) - if s.compare(e) > 0: - return e, s - return s, e - - def get_selection_range(self): - s = self.buffer.get_iter_at_mark(self.insert_mark) - e = self.buffer.get_iter_at_mark(self.selection_bound_mark) - if s.compare(e) > 0: - return e, s - return s, e - - def save(self, widget = None): - if self.uri: - self.save_to_file(self.uri) - self.buffer.set_modified(False) - else: - self.save_as(discard=0) - - def save_as(self, widget = None, discard = 0): - from rox.saving import SaveBox - - if self.savebox: - self.savebox.destroy() - - try: - self.mime_type = mime.get_type(self.uri, 1) - except: - self.mime_type = mime.lookup('text', 'plain') - - mime_text = self.mime_type.media + '/' + self.mime_type.subtype - - if self.has_selection() and not discard: - saver = SelectionSaver(self) - self.savebox = SaveBox(saver, 'Selection', mime_text) - self.savebox.connect('destroy', lambda w: saver.destroy()) - else: - uri = self.uri or _('TextFile') - self.savebox = SaveBox(self, uri, mime_text, discard) - self.savebox.show() - - def help(self, button = None): - filer.open_dir(os.path.join(rox.app_dir, 'Help')) - - def save_to_stream(self, stream): - s = self.buffer.get_start_iter() - e = self.buffer.get_end_iter() - stream.write(self.buffer.get_text(s, e, True)) - - def set_uri(self, uri): - self.uri = uri - self.buffer.set_modified(False) - self.update_title() - - def new(self): - EditWindow() - - def change_font(self): - style = self.text.get_style().copy() - style.font = load_font(options.get('edit_font')) - self.text.set_style(style) - - def show_options(self): - rox.edit_options() - - def set_marked(self, start = None, end = None): - "Set the marked region (from the selection if no region is given)." - self.clear_marked() - assert not self.marked - - buffer = self.buffer - if start: - assert end - else: - assert not end - start, end = self.get_selection_range() - buffer.move_mark(self.mark_start, start) - buffer.move_mark(self.mark_end, end) - buffer.apply_tag_by_name('marked', - buffer.get_iter_at_mark(self.mark_start), - buffer.get_iter_at_mark(self.mark_end)) - self.marked = 1 - - def clear_marked(self): - if not self.marked: - return - self.marked = 0 - buffer = self.buffer - buffer.remove_tag_by_name('marked', - buffer.get_iter_at_mark(self.mark_start), - buffer.get_iter_at_mark(self.mark_end)) - - def undo(self, widget = None): - self.buffer.undo() - cursor = self.buffer.get_iter_at_mark(self.insert_mark) - self.text.scroll_to_iter(cursor, 0.05, False) - - def redo(self, widget = None): - self.buffer.redo() - cursor = self.buffer.get_iter_at_mark(self.insert_mark) - self.text.scroll_to_iter(cursor, 0.05, False) - - def goto(self, widget = None): - from goto import Goto - self.set_minibuffer(Goto()) - - def search(self, widget = None): - from search import Search - self.set_minibuffer(Search()) - - def search_replace(self, widget = None): - from search import Replace - Replace(self).show() - - def toggle_bookmark(self): - cursor = self.buffer.get_iter_at_mark(self.insert_mark) - name = str(cursor.get_line()) - marker = self.buffer.get_marker(name) - if marker: - self.buffer.delete_marker(marker); - else: - marker = self.buffer.create_marker(name, "bookmark", cursor); - - def next_bookmark(self): - cursor = self.buffer.get_iter_at_mark(self.insert_mark) - cursor.forward_char() - marker = self.buffer.get_next_marker(cursor) - if marker: - self.buffer.get_iter_at_marker (cursor, marker) - self.buffer.place_cursor(cursor) - self.text.scroll_to_iter(cursor, 0.05, False) - - def prev_bookmark(self): - cursor = self.buffer.get_iter_at_mark(self.insert_mark) - cursor.backward_char() - marker = self.buffer.get_prev_marker(cursor) - if marker: - self.buffer.get_iter_at_marker (cursor, marker) - self.buffer.place_cursor(cursor) - self.text.scroll_to_iter(cursor, 0.05, False) - - def set_mini_label(self, label): - self.mini_label.set_text(label) - - def set_minibuffer(self, minibuffer): - assert minibuffer is None or isinstance(minibuffer, Minibuffer) - - try: - self.minibuffer.close() - except: - pass - - self.minibuffer = None - - if minibuffer: - self.mini_entry.set_text('') - self.minibuffer = minibuffer - minibuffer.setup(self) - self.mini_entry.grab_focus() - self.mini_hbox.show_all() - else: - self.mini_hbox.hide() - self.text.grab_focus() - - def mini_key_press(self, entry, kev): - if kev.keyval == g.keysyms.Escape: - self.set_minibuffer(None) - return 1 - if kev.keyval == g.keysyms.Return or kev.keyval == g.keysyms.KP_Enter: - self.minibuffer.activate() - return 1 - - return self.minibuffer.key_press(kev) - - def mini_changed(self, entry): - if not self.minibuffer: - return - self.minibuffer.changed() - - def mini_show_info(self, *unused): - assert self.minibuffer - if self.info_box: - self.info_box.destroy() - self.info_box = g.MessageDialog(self, 0, g.MESSAGE_INFO, g.BUTTONS_OK, - self.minibuffer.info) - self.info_box.set_title(_('Minibuffer help')) - def destroy(box): - self.info_box = None - self.info_box.connect('destroy', destroy) - self.info_box.show() - self.info_box.connect('response', lambda w, r: w.destroy()) - - def process_selected(self, process): - """Calls process(line) on each line in the selection, or each line in the file - if there is no selection. If the result is not None, the text is replaced.""" - self.buffer.begin_user_action() - try: - self._process_selected(process) - finally: - self.buffer.end_user_action() - - def _process_selected(self, process): - if self.has_selection(): - def get_end(): - start, end = self.get_selection_range() - if start.compare(end) > 0: - return start - return end - start, end = self.get_selection_range() - if start.compare(end) > 0: - start = end - else: - def get_end(): - return self.buffer.get_end_iter() - start = self.buffer.get_start_iter() - end = get_end() - - while start.compare(end) <= 0: - line_end = start.copy() - line_end.forward_to_line_end() - if line_end.compare(end) >= 0: - line_end = end - line = self.buffer.get_text(start, line_end, False) - new = process(line) - if new is not None: - self.buffer.move_mark(self.mark_tmp, start) - self.buffer.insert(line_end, new) - start = self.buffer.get_iter_at_mark(self.mark_tmp) - line_end = start.copy() - line_end.forward_chars(len(line.decode('utf-8'))) - self.buffer.delete(start, line_end) - - start = self.buffer.get_iter_at_mark(self.mark_tmp) - end = get_end() - if not start.forward_line(): break - - def set_word_wrap(self, value): - self._word_wrap = value - self.wrap_button.set_active(value) - if value: - self.text.set_wrap_mode(g.WRAP_WORD) - else: - self.text.set_wrap_mode(g.WRAP_NONE) - - word_wrap = property(lambda self: self._word_wrap, set_word_wrap) - -class SelectionSaver(Saveable): - def __init__(self, window): - self.window = window - window.set_marked() - - def save_to_stream(self, stream): - s, e = self.window.get_marked_range() - stream.write(self.window.buffer.get_text(s, e, True)) - - def destroy(self): - # Called when savebox is remove. Get rid of the selection marker - self.window.clear_marked() diff --git a/source/rox-extra/edit/edit-2.0/Edit/Help/COPYING b/source/rox-extra/edit/edit-2.0/Edit/Help/COPYING deleted file mode 100644 index 60549be..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Help/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) 19yy - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/source/rox-extra/edit/edit-2.0/Edit/Help/CVS/Entries b/source/rox-extra/edit/edit-2.0/Edit/Help/CVS/Entries deleted file mode 100644 index 9c6dcc4..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Help/CVS/Entries +++ /dev/null @@ -1,4 +0,0 @@ -/COPYING/1.1/Tue Jun 26 10:55:42 2001//TRelease-2-0 -/Changes/1.65/Wed Sep 21 09:18:51 2005//TRelease-2-0 -/README/1.13/Sat Sep 3 09:53:52 2005//TRelease-2-0 -D diff --git a/source/rox-extra/edit/edit-2.0/Edit/Help/CVS/Repository b/source/rox-extra/edit/edit-2.0/Edit/Help/CVS/Repository deleted file mode 100644 index 3493f2b..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Help/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -Edit/Help diff --git a/source/rox-extra/edit/edit-2.0/Edit/Help/CVS/Root b/source/rox-extra/edit/edit-2.0/Edit/Help/CVS/Root deleted file mode 100644 index 01d4116..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Help/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -tal197@cvs.sourceforge.net:/cvsroot/rox diff --git a/source/rox-extra/edit/edit-2.0/Edit/Help/CVS/Tag b/source/rox-extra/edit/edit-2.0/Edit/Help/CVS/Tag deleted file mode 100644 index 8833b6e..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Help/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NRelease-2-0 diff --git a/source/rox-extra/edit/edit-2.0/Edit/Help/Changes b/source/rox-extra/edit/edit-2.0/Edit/Help/Changes deleted file mode 100644 index 1aae91c..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Help/Changes +++ /dev/null @@ -1,257 +0,0 @@ - Edit - A simple text editor - by Thomas Leonard - -Dnd loading: Loads to cursor, not indicated point. - -20-Sep-2005 (Release 2.0) -~~~~~~~~~~~ -Bugfix: Indenting Python code in spaces-for-tabs mode failed (Thomas Leonard). - -03-Sep-2005 -~~~~~~~~~~~ -Parsing the line number option requires Python 2.3. On Python 2.2, just -disable this instead of aborting. As an alternative, allow the syntax -file:number (Thomas Leonard). - -27-Aug-2005 -~~~~~~~~~~~ -Added Edit.xml file, which can be used as a feed for 0launch (Thomas Leonard). - -07-Jul-2005 -~~~~~~~~~~~ -Added tooltips for the GtkSourceView options (Thomas Leonard). - -22-Jun-2005 -~~~~~~~~~~~ -When gtksourceview is missing, shade those options and explain why they -don't work (Thomas Leonard). - -06-Jun-2005 -~~~~~~~~~~~ -When saving a file with no name, don't show Discard (Thomas Leonard). - -31-May-2005 -~~~~~~~~~~~ -Guido Schimmels: -Add GTK_SPELL_CHECK ToggleButton to toolbar when pygtkspell is available. - -30-May-2005 -~~~~~~~~~~~ - -Guido Schimmels: -Increase indendation level after python statement (previous line ends with colon) - -29-May-2005 -~~~~~~~~~~~ -Updated Chinese translations (Babyfai Cheung). - -28-May-2005 -~~~~~~~~~~~ - -Add missing marker.png image - -Ken Hayber: - -Switch to basedir spec -Code cleanups - -25-May-2005 -~~~~~~~~~~~ - -Ken Hayber: - -New CLI option: -l (--line_number) -> jump to given line number at startup - -21-May-2005 -~~~~~~~~~~~ -Added Save toolbar button, renaming the old Save to Save As (Guido Schimmels). - -20-May-2005 -~~~~~~~~~~~ - -Ken Hayber: - -Make Find minibuffer work like Firefox's. -Indent/unindent of blocks (select a block and tab/shift-tab) -Fix a warning when trying to undo too far and places the cursor -at the undo/redo point (so you can see what you are un/redoing). - -16-May-2005 -~~~~~~~~~~~ -Ken Hayber + Guido Schimmels: - -Make translatable. -Prettify search/replace dialog with sizegroup. -Options.xml: move Toolbar frame at the end of Display section, remove Toolbar -section, line up Display->Colour->Foreground/Background in a hbox. -Update de.po. -Use gtksourceview's undo/redo system (it groups edits together so -if you type a word and hit undo it kills the whole word at once). -Fix g.FALSE/TRUE deprecation warnings. -Fix a small bug/warning about self.dir not being defined in search.py. -Set the mime-type in the SaveBox from the file type if possible. -Add support for bookmarks (set, clear and jump to). -Make the search minibuffer work/look more like FireFox's search. - -12-May-2005 -~~~~~~~~~~~ -Updated Chinese translation (Babyfai Cheung). - -03-May-2005 -~~~~~~~~~~~ -Added support for GtkSourceView (Guido Schimmels, with some untested changes -by Thomas Leonard). -Updated findrox. - -03-Mar-2005 -~~~~~~~~~~~ -Renamed 'Save' to 'Save As' for consistency with other systems (Thomas -Leonard). - -19-Feb-2005 -~~~~~~~~~~~ -Temporary fix for deprecation warnings with pygtk 2.6 (Stephen Watson). - -12-Feb-2005 -~~~~~~~~~~~ -Updated Chinese translation (Babyfai Cheung). - -29-Jan-2005 (Release 1.9.7) -~~~~~~~~~~~ -Added some unit tests for search and replace. -Bugfix: Search and Replace failed to correctly modify lines containing - non-ASCII characters (Thomas Leonard; reported by Arnaud Calvo). - -23-Dec-2004 -~~~~~~~~~~~ -Added Chinese translation (Babyfai Cheung). - -15-Jul-2004 -~~~~~~~~~~~ -Added option to toggle display of toolbar (requested by JoeHill). - -18-Apr-2004 (Release 1.9.6) -~~~~~~~~~~~ -Added Word Wrap menu item and toolbar toggle (Ken Hayber). - -18-Mar-2004 -~~~~~~~~~~~ -Added German translation (Guido Schimmels). - -22-Feb-2004 (Release 1.9.5) -~~~~~~~~~~~ -Record size and mtime of file when editing starts, so newer ROX-Libs can -warn about other applications editing the file. - -27-Jan-2004 -~~~~~~~~~~~ -Added French translation (Arnaud Calvo). - -13-Jan-2004 -~~~~~~~~~~~ -Option to turn word wrapping on and off (Ken Hayber). - -17-Oct-2003 -~~~~~~~~~~~ -Bugfix: Needed to 'import os' for Python 2.2 (Peter Geer). - -14-Oct-2003 (Release 1.9.4) -~~~~~~~~~~~ -Added toolbar icon for Show Changes. -Added line number display, which also shows details of the current selection, -if any (requested by Arnaud Calvo). - -13-Oct-2003 -~~~~~~~~~~~ -Added ability to bring up a diff of the changes to the saved version of the -file. - -09-Oct-2003 -~~~~~~~~~~~ -Open menu on popup-menu signal (for keyboard users). - -06-Oct-2003 -~~~~~~~~~~~ -Added Spanish translation (Nicolás de la Torre). - -04-Oct-2003 -~~~~~~~~~~~ -Marked strings as translatable and added Italian translation (Roberto -Inzerillo). - -27-Aug-2003 -~~~~~~~~~~~ -Spanish translation of AppInfo (Nicolás de la Torre). - -26-Aug-2003 -~~~~~~~~~~~ -Added 'Messages' directory for translations (requested by Nicolás de la Torre). - -26-Jul-2003 -~~~~~~~~~~~ -Hide scrollbar when not in use. - -23-Jul-2003 (Release 1.9.3) -~~~~~~~~~~~ -Group actions for undo and redo. -Removed Process minibuffer. -Cope slightly better with binary data. - -22-Jul-2003 -~~~~~~~~~~~ -Added Search-and-Replace toolbar button. Added section on search and replace -to the manual. -Added Spacing section to the options box, to control the line spacings, -margins and indents. - -20-Jul-2003 -~~~~~~~~~~~ -Support older versions of pygtk (reported by Alastair Porter). - -19-Jul-2003 (Release 1.9.2) -~~~~~~~~~~~ -Added stock items to menus. -Added menu items for Cut, Copy and Paste. -Added Search and Replace. -Added automatic indentation feature (on by default). - -04-Jul-2003 -~~~~~~~~~~~ -Added italian translation in AppInfo.xml (Yuri Bongiorno) - -16-May-2003 (Release 1.9.1) -~~~~~~~~~~~ -New icon (Geoff Youngs). - -10-Feb-2003 -~~~~~~~~~~~ -Upgraded to cope with pygtk-1.99.15. - -02-Feb-2003 -~~~~~~~~~~~ -Fixed problem with wheel mouse scrolling (Stuart Langridge). - -29-Jan-2003 -~~~~~~~~~~~ -Make wheel mouse scrolling work (requested by Albert Wagner). - -21-Jan-2003 -~~~~~~~~~~~ -Fix warning message when opening minibuffer (reported by joehill). - -02-Sep-2002 (Release 1.9.0) -~~~~~~~~~~~ -Process minibuffer defaults to previous command. - -28-Jul-2002 -~~~~~~~~~~~ -Added process minibuffer. - -21-Jul-2002 -~~~~~~~~~~~ -Preserve permissions when saving. - -19-Jul-2002 -~~~~~~~~~~~ -When importing non-UTF8 text, allow the user to select an encoding to use. diff --git a/source/rox-extra/edit/edit-2.0/Edit/Help/README b/source/rox-extra/edit/edit-2.0/Edit/Help/README deleted file mode 100644 index f24c295..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Help/README +++ /dev/null @@ -1,122 +0,0 @@ - Edit - A simple text editor for ROX - by Thomas Leonard - - -BRIEF - -Edit is a simple text editor written in python. You do not need to compile it before using it, but you will require ROX-Lib2: - - http://rox.sourceforge.net/rox_lib.html - -To run, click on Edit's icon in a filer window. No installation is required, but you can copy it anywhere you want using the filer... - -To load a file into Edit, drop the file onto the Edit icon in a ROX-Filer window or panel. - -INSTRUCTIONS - -To start Edit, either click on its icon in a filer window or drag a file onto it. A window appears with a small toolbar and a text area showing the file. The tools are: - -Close - Close the window -Up - Open a ROX-Filer window showing the file -Save - Open a ROX savebox - drag to a ROX-Filer window to save -Search - Open the interactive search minibuffer at the bottom of the window -Search and Replace - Open the search and replace dialog box (see below) -Undo - Back one change -Redo - Forward one change (undoes undo operations) -Diff - Show changes since the file was saved (see below) -Help - Show the help files - -You can right-click on the window for a menu. - -COPY AND PASTE - -You can copy a piece of text to the `clipboard' (which is invisible) by selecting it and then pressing Ctrl-C. You can paste text from the clipboard by pressing Ctrl-V (you can also use the Edit menu). The clipboard is shared by all applications, so you can use this to transfer text between programs. However, if you quit the application which 'owns' the clipboard (the last program you did Ctrl-C in), then the clipboard is lost. - -A faster alternative mechanism is the 'primary selection'. You can click the middle mouse button to insert the currently selected text (from any application). This mechanism is entirely separate from the clipboard, but is also widely supported. - -Tip: to insert the pathname of a file (rather than its contents, which you would do with drag-and-drop), select the file in ROX-Filer and click the middle button at the point in the text where you want to insert it. - -SEARCHING - -To search, click on the Search toolbar icon, or choose Edit->Search... from the popup menu. As you type, the next match is highlighted. Press the Down arrow to move to the next match, or the Up arrow to search backwards for the previous match. - -SEARCH AND REPLACE - -Enter some text to search for in the 'Replace' box and enter the text to replace it with in the 'With:' box. For example, to update all your copyright notices: - - Replace: Copyright 2002 - With: Copyright 2003 - -Sometimes you need more flexibility. For example, you may wish to search for all four digit numbers, or for spaces at the beginning of a line. In that case, you'll need to turn on the 'Advanced' check box. When you do this, some characters take on special meanings. A quick-reference table will appear listing them, and some examples. - -You can now do things like this: - - Replace: Copyright \d{4} - With: Copyright 2003 - -`\d' means `any digit', and `{4}' means to match four of them. So, this will find 'Copyright 2002', 'Copyright 1997', etc, and change them all to Copyright 2003. - -The 'With:' box also allows some special characters, allowing you to refer back to bracketed parts of the match. For example: - - Replace: ^(\d+) (\S+)$ - With: \2 \1 - -This looks for lines starting with one or more digits, then a space, and then one or more non-spaces at the end of the line. The part matched by the (\d+) becomes group 1, and the (\S+) bit is group 2, due to the brackets. The replacement text then switches them around, so: - - 1234 Mary - 876 Bob -becomes - Mary 1234 - Bob 876 - -(if you want to ignore spaces at the start of the line, use: ^\s*...) -Finally, if your needs are really complicated, you can turn on the 'Python expression' checkbox. In this case, instead of inserting the 'With:' text directly, it will be evaluated as a formula (a Python expression). For example: - - Replace: \b[A-Z][a-z]+\b - With: old.upper() - -This finds all complete words starting with an uppercase letter and followed by at least one lowercase letter, and converts them to uppercase (so "Where are Mary and Bob?" becomes "WHERE are MARY and BOB?"). -Likewise, consider: - - Replace: \d+\+\d+ - With: eval(old) - -This searches for two strings of digits separated by a "+" (the \ is needed so that + doesn't get it's special meaning of `one or more'), and evaluates the matched text as a Python expression itself. So: - - What is 5+2, 3+5 or 1+1? -becomes: - What is 7, 8 or 2? - -OPTIONS - -From the popup menu, you can open the Options box. This lets to choose the font, colours and spacings to use, and control the auto-indent feature. - -SHOW CHANGES - -When editing a file, you can compare it to the saved version by clicking on the Show Changes toolbar button, or by choosing File->Show Changes from the menu. - -The window that appears shows each part of the file that changed. Red lines were deleted and green lines were added (if a line was changed, there will be a red line for the old version followed by a green line for the new one). White lines are context (lines which didn't change, but help to show where the change was). Each section has a grey header showing the line numbers of the changes. - -All the colours can be changed in the options box. - -You can also compare the current file with an older backup (or any other file) by dragging the backup file to the 'Show Changes' toolbar button. - -CONDITIONS - -This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Please report any bugs to the mailing list: - - http://rox.sourceforge.net/phpwiki/index.php/MailingLists diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/CVS/Entries b/source/rox-extra/edit/edit-2.0/Edit/Messages/CVS/Entries deleted file mode 100644 index a588626..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Messages/CVS/Entries +++ /dev/null @@ -1,10 +0,0 @@ -/de.po/1.2/Sat May 21 18:34:50 2005//TRelease-2-0 -/dist/1.1/Tue Aug 26 14:48:35 2003//TRelease-2-0 -/es.po/1.3/Sat May 21 18:34:50 2005//TRelease-2-0 -/fr.po/1.4/Sat May 21 18:34:50 2005//TRelease-2-0 -/it.po/1.4/Sat May 21 18:34:50 2005//TRelease-2-0 -/tips.py/1.1/Mon Oct 6 10:11:38 2003//TRelease-2-0 -/update-po/1.2/Mon Oct 6 10:11:38 2003//TRelease-2-0 -/zh_CN.po/1.6/Sun Jul 31 10:09:52 2005//TRelease-2-0 -/zh_TW.po/1.6/Sun Jul 31 10:09:52 2005//TRelease-2-0 -D diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/CVS/Repository b/source/rox-extra/edit/edit-2.0/Edit/Messages/CVS/Repository deleted file mode 100644 index 7200d40..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Messages/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -Edit/Messages diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/CVS/Root b/source/rox-extra/edit/edit-2.0/Edit/Messages/CVS/Root deleted file mode 100644 index 01d4116..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Messages/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -tal197@cvs.sourceforge.net:/cvsroot/rox diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/CVS/Tag b/source/rox-extra/edit/edit-2.0/Edit/Messages/CVS/Tag deleted file mode 100644 index 8833b6e..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Messages/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NRelease-2-0 diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/de.gmo b/source/rox-extra/edit/edit-2.0/Edit/Messages/de.gmo deleted file mode 100644 index ea9d0a3..0000000 Binary files a/source/rox-extra/edit/edit-2.0/Edit/Messages/de.gmo and /dev/null differ diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/de.po b/source/rox-extra/edit/edit-2.0/Edit/Messages/de.po deleted file mode 100644 index 61d4c90..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Messages/de.po +++ /dev/null @@ -1,587 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: Edit 1.9.7\n" -"POT-Creation-Date: Sat May 21 20:07:04 2005\n" -"PO-Revision-Date: 2005-05-21 20:06+0100\n" -"Last-Translator: Guido Schimmels <__guido__@web.de>\n" -"Language-Team: ROX mailing-list \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.4\n" -"X-Poedit-Language: German\n" -"X-Poedit-Country: GERMANY\n" - -#: EditWindow.py:52 -msgid "Cut" -msgstr "Ausschneiden" - -#: EditWindow.py:53 -msgid "Copy" -msgstr "Kopieren" - -#: EditWindow.py:54 -msgid "Paste" -msgstr "Einfügen" - -#: EditWindow.py:56 EditWindow.py:221 -msgid "Undo" -msgstr "Zurück" - -#: EditWindow.py:57 EditWindow.py:220 -msgid "Redo" -msgstr "Wiederholen" - -#: EditWindow.py:59 -msgid "Search..." -msgstr "Suchen..." - -#: EditWindow.py:60 -msgid "Search and Replace...." -msgstr "Suchen und Ersetzen..." - -#: EditWindow.py:62 -msgid "Goto line..." -msgstr "Zu Zeile..." - -#: EditWindow.py:67 -msgid "Toggle Bookmark" -msgstr "Lesezeichen an/aus" - -#: EditWindow.py:68 -msgid "Next Bookmark" -msgstr "Nächstes Lesezeichen" - -#: EditWindow.py:69 -msgid "Previous Bookmark" -msgstr "Voriges Lesezeichen" - -#: EditWindow.py:76 -msgid "File" -msgstr "Datei" - -#: EditWindow.py:77 EditWindow.py:225 -msgid "Save" -msgstr "Speichern" - -#: EditWindow.py:78 -msgid "Save As..." -msgstr "Speichern Als..." - -#: EditWindow.py:79 -msgid "Open Parent" -msgstr "Übergeordnetes Verzeichnis" - -#: EditWindow.py:80 -msgid "Show Changes" -msgstr "Änderungen zeigen" - -#: EditWindow.py:81 EditWindow.py:216 tips:9 -msgid "Word Wrap" -msgstr "Zeilenumbruch" - -#: EditWindow.py:82 EditWindow.py:227 -msgid "Close" -msgstr "Schließen" - -#: EditWindow.py:84 -msgid "New" -msgstr "Neu" - -#: EditWindow.py:86 -msgid "Edit" -msgstr "Bearbeiten" - -#: EditWindow.py:88 -msgid "Options" -msgstr "Optionen" - -#: EditWindow.py:89 EditWindow.py:207 -msgid "Help" -msgstr "Hilfe" - -#: EditWindow.py:208 -msgid "" -"Show changes from saved copy.\n" -"Or, drop a backup file onto this button to see changes from that." -msgstr "" -"Zeige Änderungen gegenüber Sicherheitskopie.\n" -"Oder, Sicherungskopie auf diesen Knopf ziehen, um Änderungen zu sehen." - -#: EditWindow.py:222 -msgid "Replace" -msgstr "Ersetzen" - -#: EditWindow.py:223 -msgid "Search" -msgstr "Suchen" - -#: EditWindow.py:224 -msgid "Save As" -msgstr "Speichern Als" - -#: EditWindow.py:226 -msgid "Up" -msgstr "Rauf" - -#: EditWindow.py:279 -msgid "Line %s of %d" -msgstr "Zeile %s von %d" - -#: EditWindow.py:286 -msgid "One character selected (%s)" -msgstr "Ein Zeichen markiert (%s)" - -#: EditWindow.py:289 -msgid "%d characters selected" -msgstr "%d Zeichen markiert" - -#: EditWindow.py:291 -msgid "%d lines selected" -msgstr "%d Zeilen markiert" - -#: EditWindow.py:434 -msgid "Untitled" -msgstr "Unbenannt" - -#: EditWindow.py:462 -msgid "Encoding:" -msgstr "Kodierung:" - -#: EditWindow.py:468 -msgid "Ignore errors" -msgstr "Fehler ignorieren" - -#: EditWindow.py:494 -msgid "Unknown encoding '%s'" -msgstr "Unbekanntes Zeichenormat '%s'" - -#: EditWindow.py:518 -msgid "" -"Data is not valid %s. Please select the file's encoding. Turn on 'ignore " -"errors' to try and load it anyway." -msgstr "" -"Daten entsprechen nicht %s. Bitte wählen Sie das Zeichenformat der Datei. " -"Schalten Sie 'Fehler ignorieren ein', um Datei trotzdem zu öffnen." - -#: EditWindow.py:559 -msgid "File is not saved to disk yet" -msgstr "Die Datei ist noch nicht gespeichert" - -#: EditWindow.py:564 -msgid "" -"This file has never been saved; nothing to compare it to!\n" -"Note: you can drop a file onto the toolbar button to see the changes from " -"that file." -msgstr "" -"Diese Datei wurde noch nie gespeichert; Nichts da zum vergleichen!\n" -"Übrigens: Sie können eine Datei auf den Knopf in der Werkzeugleiste ziehen, " -"um Änderungen an dieser Datei zu sehen." - -#: EditWindow.py:761 -msgid "Minibuffer help" -msgstr "Hilfe zur Befehlszeile" - -#: diff.py:78 -msgid "Changes to %s" -msgstr "Änderungen an %s" - -#: diff.py:129 -msgid "There is no difference between this version and the saved one." -msgstr "Diese Version unterscheidet sich nicht von der Sicherheitskopie." - -#: goto.py:10 -msgid "Goto line:" -msgstr "Zu Zeile:" - -#: goto.py:12 -msgid "" -"Enter the line number to go to. Line numbers start from 1. Press Escape to " -"cancel, or Return to jump to the line." -msgstr "" -"Geben Sie die gewünschte Zeilennummer ein. Zeilennummern beginnen bei 1. " -"Drücken Sie Esc, um abzubrechen oder Return, um zur Zeile zu springen." - -#: goto.py:22 -msgid "Invalid line number: %s" -msgstr "Ungültige Zeilennummer: %s" - -#: search.py:6 -msgid "Matches any character" -msgstr "Beliebiges Zeichen" - -#: search.py:7 -msgid "Any lowercase letter" -msgstr "Beliebiger Kleinbuchstabe" - -#: search.py:8 -msgid "Any character listed (- must be first)" -msgstr "Beliebiges genanntes Zeichen (- muss als erstes stehen)" - -#: search.py:9 -msgid "A only at the start of a line" -msgstr "A nur am Zeilenanfang" - -#: search.py:10 -msgid "A only at the end of a line" -msgstr "A nur am Zeilenende" - -#: search.py:11 -msgid "Zero or more A" -msgstr "Null oder mehr A" - -#: search.py:12 -msgid "One or more A" -msgstr "Ein weiteres A" - -#: search.py:13 -msgid "Zero or one A" -msgstr "Null oder ein A" - -#: search.py:14 -msgid "Between m and n matches of A" -msgstr "Zwischen m und n Treffer von A" - -#: search.py:15 -msgid "Non-greedy versions of *, +, ? and {}" -msgstr "Laxe Versionen von *, +, ? und {}" - -#: search.py:16 -msgid "Literal \"*\", \"+\"" -msgstr "Literal \"*\", \"+\"" - -#: search.py:17 -msgid "Can match A or B" -msgstr "Trifft zu auf A oder B" - -#: search.py:18 -msgid "Group A and B together (for *, \\1, etc)" -msgstr "A und B Zusammengroupieren (für *, \\1, etc.)" - -#: search.py:19 -msgid "The first/second bracketed match (goes in the With: box)" -msgstr "Der erste/zweite geklammerte Treffer (gehört in den Kasten \"Durch:\")" - -#: search.py:20 -msgid "Word boundary (eg, \\bWord\\b)" -msgstr "Wortgrenze (z.B. \\bWort\\b)" - -#: search.py:21 -msgid "Non-word boundary" -msgstr "Nicht-Wort Grenze" - -#: search.py:22 -msgid "Digit, non-digit" -msgstr "Ziffer, Nicht-Ziffer" - -#: search.py:23 -msgid "Whitespace, non-whitespace" -msgstr "Leerraum, Nicht-Leerraum" - -#: search.py:24 -msgid "Others" -msgstr "Andere" - -#: search.py:24 -msgid "See the Python regular expression documentation for more" -msgstr "" -"Für Weiteres, Schlagen Sie nach in der Pythondocumentation zu regulären " -"Ausdrücken" - -#: search.py:26 -msgid "Examples:" -msgstr "Beispiele:" - -#: search.py:27 -msgid "Matches \"Fred\" anywhere" -msgstr "\"Fred\" an beliebiger Stelle stehend" - -#: search.py:28 -msgid "A line containing only \"Fred\"" -msgstr "Eine Zeile die nur \"Fred\" enthält" - -#: search.py:29 -msgid "\"Gogle, Google, Gooogle, etc\"" -msgstr "\"Gogle, Google, Gooogle, etc\"" - -#: search.py:30 -msgid "Colour or Color" -msgstr "Colour oder Color" - -#: search.py:31 -msgid "\"The\" or \"the\"" -msgstr "\"The\" or \"the\"" - -#: search.py:35 -msgid "Python expressions:" -msgstr "Python-Ausdrücke:" - -#: search.py:36 -msgid "The text that was matched" -msgstr "Der zutreffende Text" - -#: search.py:37 -msgid "The numerical value of 'old'" -msgstr "Der Zahlenwert von 'old'" - -#: search.py:38 -msgid "Convert match to uppercase" -msgstr "Zutreffenden Text in Großbuchstaben wandeln" - -#: search.py:39 -msgid "Double all matched numbers" -msgstr "Alle zutreffenden Nummern verdoppeln" - -#: search.py:56 -msgid "Find Next" -msgstr "Finde Nächstes" - -#: search.py:61 -msgid "Find Previous" -msgstr "Finde Voriges" - -#: search.py:66 -msgid "Match case" -msgstr "Groß-/Kleinschreibung beachten" - -#: search.py:80 -msgid "" -"Type a string to search for. The display will scroll to show the next match " -"as you type. Use the Up and Down cursor keys to move to the next or previous " -"match. Press Escape or Return to finish." -msgstr "" -"Einen Suchtext eingeben. Die Anzeige scrollt zum nächsten Treffer währen sie " -"tippen. Durch Pfeil Hoch und Runter gelangen sie zum nächsten oder vorigen " -"Treffer. Beenden durch Esc oder Eingabetaste." - -#: search.py:85 -msgid " Find: " -msgstr "Finde:" - -#: search.py:160 -msgid "Code" -msgstr "Zeichen" - -#: search.py:162 -msgid "Meaning" -msgstr "Bedeutet" - -#: search.py:213 -msgid "Replace:" -msgstr "Ersetzen:" - -#: search.py:214 -msgid "With:" -msgstr "Durch:" - -#: search.py:221 -msgid "Advanced search and replace" -msgstr "Erweitertes Suchen und Ersetzen" - -#: search.py:229 -msgid "Evaluate 'With' as Python expression" -msgstr "Werte 'With' aus als Python-Ausdruck" - -#: search.py:252 -msgid "You need to specify something to search for..." -msgstr "Keine Suche spezifiziert..." - -#: search.py:297 -msgid "Search string not found" -msgstr "Suchtext nicht gefunden" - -#: search.py:301 -msgid "One line changed" -msgstr "Eine Zeile geändert" - -#: search.py:303 -msgid "%d lines changed" -msgstr "%d Zeilen geändert" - -#: tips:1 -msgid "Display" -msgstr "Darstellung" - -#: tips:2 -msgid "Fonts" -msgstr "Zeichensätze" - -#: tips:3 -msgid "Text font" -msgstr "Textzeichensatz" - -#: tips:4 tips:5 -msgid "Font used for normal text." -msgstr "Zeichensatz für normalen Text." - -#: tips:6 -msgid "Colours" -msgstr "Farben" - -#: tips:7 -msgid "Foreground colour" -msgstr "Vordergrundfarbe" - -#: tips:8 -msgid "Background colour" -msgstr "Hintergrundfarbe" - -#: tips:10 -msgid "Wrap long lines of text" -msgstr "Lange Textzeilen umbrechen" - -#: tips:11 tips:12 -msgid "" -"Control whether lines wider than the window are wrapped to multiple display " -"lines." -msgstr "Einstellen, ob Zeilen am Fensterrand umbrochen werden sollen." - -#: tips:13 -msgid "Toolbar" -msgstr "Werkzeugleiste" - -#: tips:14 -msgid "Show toolbar" -msgstr "Zeige Werkzeugleiste" - -#: tips:15 tips:16 tips:17 -msgid "Display a toolbar along the top of each window with common tools." -msgstr "Zeige eine Werkzeugleiste mit gebräuchlichen Schaltern am Fensterkopf." - -#: tips:18 -msgid "Spacing" -msgstr "Abstände" - -#: tips:19 -msgid "Margins" -msgstr "Ränder" - -#: tips:20 -msgid "pixels for left margin, and for the right:" -msgstr "Pixel für linken Rand, und für den Rechten:" - -#: tips:21 tips:24 tips:26 tips:28 tips:30 -msgid "pixels" -msgstr "Pixel" - -#: tips:22 -msgid "Paragraphs" -msgstr "Absätze" - -#: tips:23 -msgid "Space above paragraphs" -msgstr "Abstand oberhalb von Absätzen" - -#: tips:25 -msgid "Space below paragraphs" -msgstr "Abstand unterhalb von Absätzen" - -#: tips:27 -msgid "Line spacing within paragraphs" -msgstr "Zeilenabstand zwischen Absätzen" - -#: tips:29 -msgid "New-paragraph indent" -msgstr "Neue Absätze einrücken" - -#: tips:31 -msgid "Editing" -msgstr "Bearbeiten" - -#: tips:32 -msgid "Indentation" -msgstr "Einrücken" - -#: tips:33 -msgid "Automatic indentation" -msgstr "Automatisches Einrücken" - -#: tips:34 -msgid "" -"When you press Return, the next line starts with the same amount of " -"indentation as the previous line." -msgstr "" -"Drücken der Umschalttaste rückt Text entsprechend der vorherigen Zeile ein." - -#: tips:35 -msgid "Show Print Margin" -msgstr "Druckränder zeigen" - -#: tips:36 -msgid "Print Margin" -msgstr "Druckränder" - -#: tips:37 tips:43 -msgid "characters" -msgstr "Zeichen" - -#: tips:38 -msgid "Smart Home/End" -msgstr "Intelligentes Pos 1 / Ende" - -#: tips:39 -msgid "Show Line Numbers" -msgstr "Zeilennummern zeigen" - -#: tips:40 -msgid "Show Line Markers" -msgstr "Zeilenmarkierungen zeigen" - -#: tips:41 -msgid "Use spaces instead of Tabs" -msgstr "Tabulatoren durch Leerzeichen ersetzen" - -#: tips:42 -msgid "Tab width" -msgstr "Tabulatorbreite" - -#: tips:44 -msgid "Changes" -msgstr "Änderungen" - -#: tips:45 -msgid "Colours for Show Changes feature" -msgstr "Farben für 'Änderungen zeigen'" - -#: tips:46 tips:50 tips:54 tips:58 -msgid "Foreground" -msgstr "Vordergrund" - -#: tips:47 tips:51 tips:55 tips:59 -msgid "Background" -msgstr "Hintergrund" - -#: tips:48 tips:49 -msgid "(headers)" -msgstr "(Kopfzeilen)" - -#: tips:52 tips:53 -msgid "(no change)" -msgstr "(keine Änderung)" - -#: tips:56 tips:57 -msgid "(additions)" -msgstr "(hinzugefügt)" - -#: tips:60 tips:61 tips:62 tips:63 tips:64 -msgid "(deletions)" -msgstr "(gelöscht)" - -#~ msgid "Forward search:" -#~ msgstr "Vorwärtssuche:" - -#~ msgid "Backward search:" -#~ msgstr "Rückwärtssuche:" - -#~ msgid "/File/" -#~ msgstr "/Datei/" - -#~ msgid "/Edit/" -#~ msgstr "/Bearbeiten/" - -#~ msgid "/Help" -#~ msgstr "/Hilfe" diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/dist b/source/rox-extra/edit/edit-2.0/Edit/Messages/dist deleted file mode 100755 index a637e09..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Messages/dist +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -echo Making all .mo files... -echo - -for FILE in *.po; do - msgfmt $FILE -o ${FILE%.po}.gmo && echo Created file $OUT OK -done diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/es.gmo b/source/rox-extra/edit/edit-2.0/Edit/Messages/es.gmo deleted file mode 100644 index dcd5f0a..0000000 Binary files a/source/rox-extra/edit/edit-2.0/Edit/Messages/es.gmo and /dev/null differ diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/es.po b/source/rox-extra/edit/edit-2.0/Edit/Messages/es.po deleted file mode 100644 index 0920186..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Messages/es.po +++ /dev/null @@ -1,580 +0,0 @@ -# Spanish translation for Edit. -# Copyright (C) 2003 Ensambl3 -# Nicolás de la Torre , 2003. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Sat May 21 20:07:04 2005\n" -"PO-Revision-Date: 2003-10-05 23:34-0300\n" -"Last-Translator: Nicolás de la Torre \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: ENCODING\n" -"Generated-By: pygettext.py 1.4\n" - -#: EditWindow.py:52 -msgid "Cut" -msgstr "Cortar" - -#: EditWindow.py:53 -msgid "Copy" -msgstr "Copiar" - -#: EditWindow.py:54 -msgid "Paste" -msgstr "Pegar" - -#: EditWindow.py:56 EditWindow.py:221 -msgid "Undo" -msgstr "Deshacer" - -#: EditWindow.py:57 EditWindow.py:220 -msgid "Redo" -msgstr "Rehacer" - -#: EditWindow.py:59 -msgid "Search..." -msgstr "Buscar..." - -#: EditWindow.py:60 -msgid "Search and Replace...." -msgstr "Buscar y Reemplazar..." - -#: EditWindow.py:62 -msgid "Goto line..." -msgstr "Ir a linea..." - -#: EditWindow.py:67 -msgid "Toggle Bookmark" -msgstr "" - -#: EditWindow.py:68 -msgid "Next Bookmark" -msgstr "" - -#: EditWindow.py:69 -msgid "Previous Bookmark" -msgstr "" - -#: EditWindow.py:76 -#, fuzzy -msgid "File" -msgstr "/Archivo" - -#: EditWindow.py:77 EditWindow.py:225 -msgid "Save" -msgstr "Salvar" - -#: EditWindow.py:78 -msgid "Save As..." -msgstr "" - -#: EditWindow.py:79 -msgid "Open Parent" -msgstr "Abrir Origen" - -#: EditWindow.py:80 -msgid "Show Changes" -msgstr "" - -#: EditWindow.py:81 EditWindow.py:216 tips:9 -msgid "Word Wrap" -msgstr "" - -#: EditWindow.py:82 EditWindow.py:227 -msgid "Close" -msgstr "Cerrar" - -#: EditWindow.py:84 -msgid "New" -msgstr "Nuevo" - -#: EditWindow.py:86 -#, fuzzy -msgid "Edit" -msgstr "/Editar" - -#: EditWindow.py:88 -#, fuzzy -msgid "Options" -msgstr "/Opciones" - -#: EditWindow.py:89 EditWindow.py:207 -msgid "Help" -msgstr "Ayuda" - -#: EditWindow.py:208 -msgid "" -"Show changes from saved copy.\n" -"Or, drop a backup file onto this button to see changes from that." -msgstr "" - -#: EditWindow.py:222 -msgid "Replace" -msgstr "Reemplazar" - -#: EditWindow.py:223 -msgid "Search" -msgstr "Buscar" - -#: EditWindow.py:224 -#, fuzzy -msgid "Save As" -msgstr "Salvar" - -#: EditWindow.py:226 -msgid "Up" -msgstr "Arriba" - -#: EditWindow.py:279 -msgid "Line %s of %d" -msgstr "" - -#: EditWindow.py:286 -msgid "One character selected (%s)" -msgstr "" - -#: EditWindow.py:289 -msgid "%d characters selected" -msgstr "" - -#: EditWindow.py:291 -msgid "%d lines selected" -msgstr "" - -#: EditWindow.py:434 -msgid "Untitled" -msgstr "" - -#: EditWindow.py:462 -#, fuzzy -msgid "Encoding:" -msgstr "/Editar" - -#: EditWindow.py:468 -msgid "Ignore errors" -msgstr "" - -#: EditWindow.py:494 -msgid "Unknown encoding '%s'" -msgstr "Codificación desconocia '%s'" - -#: EditWindow.py:518 -msgid "" -"Data is not valid %s. Please select the file's encoding. Turn on 'ignore " -"errors' to try and load it anyway." -msgstr "" -"Los datos %s no son validos. Por favor elija la codificación para el " -"archivo. Seleccione 'ignorar errores' para probar y cargarlo de todas formas." - -#: EditWindow.py:559 -msgid "File is not saved to disk yet" -msgstr "El archivo no se a salvado en el disco todavia" - -#: EditWindow.py:564 -msgid "" -"This file has never been saved; nothing to compare it to!\n" -"Note: you can drop a file onto the toolbar button to see the changes from " -"that file." -msgstr "" - -#: EditWindow.py:761 -msgid "Minibuffer help" -msgstr "Ayuda Minibuffer" - -#: diff.py:78 -msgid "Changes to %s" -msgstr "" - -#: diff.py:129 -msgid "There is no difference between this version and the saved one." -msgstr "" - -#: goto.py:10 -msgid "Goto line:" -msgstr "Ir a linea:" - -#: goto.py:12 -msgid "" -"Enter the line number to go to. Line numbers start from 1. Press Escape to " -"cancel, or Return to jump to the line." -msgstr "" -"Ingrese el número de linea para ir. Los números de lineas empiezan desde 1. " -"Presione Escape para cancelar, o intro para saltar a la linea." - -#: goto.py:22 -msgid "Invalid line number: %s" -msgstr "Número de linea invalida: %s" - -#: search.py:6 -msgid "Matches any character" -msgstr "" - -#: search.py:7 -msgid "Any lowercase letter" -msgstr "" - -#: search.py:8 -msgid "Any character listed (- must be first)" -msgstr "" - -#: search.py:9 -msgid "A only at the start of a line" -msgstr "" - -#: search.py:10 -msgid "A only at the end of a line" -msgstr "" - -#: search.py:11 -msgid "Zero or more A" -msgstr "" - -#: search.py:12 -msgid "One or more A" -msgstr "" - -#: search.py:13 -msgid "Zero or one A" -msgstr "" - -#: search.py:14 -msgid "Between m and n matches of A" -msgstr "" - -#: search.py:15 -msgid "Non-greedy versions of *, +, ? and {}" -msgstr "" - -#: search.py:16 -msgid "Literal \"*\", \"+\"" -msgstr "" - -#: search.py:17 -msgid "Can match A or B" -msgstr "" - -#: search.py:18 -msgid "Group A and B together (for *, \\1, etc)" -msgstr "" - -#: search.py:19 -msgid "The first/second bracketed match (goes in the With: box)" -msgstr "" - -#: search.py:20 -msgid "Word boundary (eg, \\bWord\\b)" -msgstr "" - -#: search.py:21 -msgid "Non-word boundary" -msgstr "" - -#: search.py:22 -msgid "Digit, non-digit" -msgstr "" - -#: search.py:23 -msgid "Whitespace, non-whitespace" -msgstr "" - -#: search.py:24 -msgid "Others" -msgstr "" - -#: search.py:24 -msgid "See the Python regular expression documentation for more" -msgstr "" - -#: search.py:26 -msgid "Examples:" -msgstr "" - -#: search.py:27 -msgid "Matches \"Fred\" anywhere" -msgstr "" - -#: search.py:28 -msgid "A line containing only \"Fred\"" -msgstr "" - -#: search.py:29 -msgid "\"Gogle, Google, Gooogle, etc\"" -msgstr "" - -#: search.py:30 -msgid "Colour or Color" -msgstr "" - -#: search.py:31 -msgid "\"The\" or \"the\"" -msgstr "" - -#: search.py:35 -msgid "Python expressions:" -msgstr "" - -#: search.py:36 -msgid "The text that was matched" -msgstr "" - -#: search.py:37 -msgid "The numerical value of 'old'" -msgstr "" - -#: search.py:38 -msgid "Convert match to uppercase" -msgstr "" - -#: search.py:39 -msgid "Double all matched numbers" -msgstr "" - -#: search.py:56 -msgid "Find Next" -msgstr "" - -#: search.py:61 -msgid "Find Previous" -msgstr "" - -#: search.py:66 -msgid "Match case" -msgstr "" - -#: search.py:80 -msgid "" -"Type a string to search for. The display will scroll to show the next match " -"as you type. Use the Up and Down cursor keys to move to the next or previous " -"match. Press Escape or Return to finish." -msgstr "" - -#: search.py:85 -msgid " Find: " -msgstr "" - -#: search.py:160 -#, fuzzy -msgid "Code" -msgstr "Cerrar" - -#: search.py:162 -msgid "Meaning" -msgstr "" - -#: search.py:213 -#, fuzzy -msgid "Replace:" -msgstr "Reemplazar" - -#: search.py:214 -msgid "With:" -msgstr "" - -#: search.py:221 -#, fuzzy -msgid "Advanced search and replace" -msgstr "Buscar y Reemplazar..." - -#: search.py:229 -msgid "Evaluate 'With' as Python expression" -msgstr "" - -#: search.py:252 -msgid "You need to specify something to search for..." -msgstr "" - -#: search.py:297 -msgid "Search string not found" -msgstr "" - -#: search.py:301 -msgid "One line changed" -msgstr "" - -#: search.py:303 -msgid "%d lines changed" -msgstr "" - -#: tips:1 -msgid "Display" -msgstr "" - -#: tips:2 -msgid "Fonts" -msgstr "" - -#: tips:3 -msgid "Text font" -msgstr "" - -#: tips:4 tips:5 -msgid "Font used for normal text." -msgstr "" - -#: tips:6 -#, fuzzy -msgid "Colours" -msgstr "Cerrar" - -#: tips:7 -msgid "Foreground colour" -msgstr "" - -#: tips:8 -msgid "Background colour" -msgstr "" - -#: tips:10 -msgid "Wrap long lines of text" -msgstr "" - -#: tips:11 tips:12 -msgid "" -"Control whether lines wider than the window are wrapped to multiple display " -"lines." -msgstr "" - -#: tips:13 -msgid "Toolbar" -msgstr "" - -#: tips:14 -msgid "Show toolbar" -msgstr "" - -#: tips:15 tips:16 tips:17 -msgid "Display a toolbar along the top of each window with common tools." -msgstr "" - -#: tips:18 -msgid "Spacing" -msgstr "" - -#: tips:19 -msgid "Margins" -msgstr "" - -#: tips:20 -msgid "pixels for left margin, and for the right:" -msgstr "" - -#: tips:21 tips:24 tips:26 tips:28 tips:30 -msgid "pixels" -msgstr "" - -#: tips:22 -msgid "Paragraphs" -msgstr "" - -#: tips:23 -msgid "Space above paragraphs" -msgstr "" - -#: tips:25 -msgid "Space below paragraphs" -msgstr "" - -#: tips:27 -msgid "Line spacing within paragraphs" -msgstr "" - -#: tips:29 -msgid "New-paragraph indent" -msgstr "" - -#: tips:31 -#, fuzzy -msgid "Editing" -msgstr "/Editar" - -#: tips:32 -msgid "Indentation" -msgstr "" - -#: tips:33 -msgid "Automatic indentation" -msgstr "" - -#: tips:34 -msgid "" -"When you press Return, the next line starts with the same amount of " -"indentation as the previous line." -msgstr "" - -#: tips:35 -msgid "Show Print Margin" -msgstr "" - -#: tips:36 -msgid "Print Margin" -msgstr "" - -#: tips:37 tips:43 -msgid "characters" -msgstr "" - -#: tips:38 -msgid "Smart Home/End" -msgstr "" - -#: tips:39 -msgid "Show Line Numbers" -msgstr "" - -#: tips:40 -msgid "Show Line Markers" -msgstr "" - -#: tips:41 -msgid "Use spaces instead of Tabs" -msgstr "" - -#: tips:42 -msgid "Tab width" -msgstr "" - -#: tips:44 -msgid "Changes" -msgstr "" - -#: tips:45 -msgid "Colours for Show Changes feature" -msgstr "" - -#: tips:46 tips:50 tips:54 tips:58 -msgid "Foreground" -msgstr "" - -#: tips:47 tips:51 tips:55 tips:59 -msgid "Background" -msgstr "" - -#: tips:48 tips:49 -msgid "(headers)" -msgstr "" - -#: tips:52 tips:53 -msgid "(no change)" -msgstr "" - -#: tips:56 tips:57 -msgid "(additions)" -msgstr "" - -#: tips:60 tips:61 tips:62 tips:63 tips:64 -msgid "(deletions)" -msgstr "" - -#~ msgid "/File/" -#~ msgstr "/Archivo/" - -#~ msgid "/Edit/" -#~ msgstr "/Editar/" - -#~ msgid "/Help" -#~ msgstr "/Ayuda" - -#~ msgid "Edit requires ROX-Lib2 1.9.8 or later" -#~ msgstr "Edit requiere ROX-Lib2 1.9.8 o posterior" diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/fr.gmo b/source/rox-extra/edit/edit-2.0/Edit/Messages/fr.gmo deleted file mode 100644 index b034d04..0000000 Binary files a/source/rox-extra/edit/edit-2.0/Edit/Messages/fr.gmo and /dev/null differ diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/fr.po b/source/rox-extra/edit/edit-2.0/Edit/Messages/fr.po deleted file mode 100644 index 2f80418..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Messages/fr.po +++ /dev/null @@ -1,601 +0,0 @@ -# French translation for Edit. -# Copyright (C) 2004 Arnaud CALVO -# Arnaud CALVO , 2004. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Sat May 21 20:07:04 2005\n" -"PO-Revision-Date: 2004-01-28 12:00+0100\n" -"Last-Translator: Arnaud CALVO \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: ENCODING\n" -"Generated-By: pygettext.py 1.5\n" - -#: EditWindow.py:52 -msgid "Cut" -msgstr "Couper" - -#: EditWindow.py:53 -msgid "Copy" -msgstr "Copier" - -#: EditWindow.py:54 -msgid "Paste" -msgstr "Coller" - -#: EditWindow.py:56 EditWindow.py:221 -msgid "Undo" -msgstr "Annuler" - -#: EditWindow.py:57 EditWindow.py:220 -msgid "Redo" -msgstr "Rétablir" - -#: EditWindow.py:59 -msgid "Search..." -msgstr "Chercher..." - -#: EditWindow.py:60 -msgid "Search and Replace...." -msgstr "Chercher et remplacer..." - -#: EditWindow.py:62 -msgid "Goto line..." -msgstr "Aller à la ligne..." - -#: EditWindow.py:67 -msgid "Toggle Bookmark" -msgstr "" - -#: EditWindow.py:68 -msgid "Next Bookmark" -msgstr "" - -#: EditWindow.py:69 -msgid "Previous Bookmark" -msgstr "" - -#: EditWindow.py:76 -#, fuzzy -msgid "File" -msgstr "/Fichier" - -#: EditWindow.py:77 EditWindow.py:225 -msgid "Save" -msgstr "Enregistrer" - -#: EditWindow.py:78 -msgid "Save As..." -msgstr "" - -#: EditWindow.py:79 -msgid "Open Parent" -msgstr "Ouvrir le dossier père" - -#: EditWindow.py:80 -msgid "Show Changes" -msgstr "Afficher les différences" - -#: EditWindow.py:81 EditWindow.py:216 tips:9 -msgid "Word Wrap" -msgstr "" - -#: EditWindow.py:82 EditWindow.py:227 -msgid "Close" -msgstr "Quitter" - -#: EditWindow.py:84 -msgid "New" -msgstr "Nouveau" - -#: EditWindow.py:86 -#, fuzzy -msgid "Edit" -msgstr "/Édition" - -#: EditWindow.py:88 -#, fuzzy -msgid "Options" -msgstr "/Options" - -#: EditWindow.py:89 EditWindow.py:207 -msgid "Help" -msgstr "Aide" - -#: EditWindow.py:208 -msgid "" -"Show changes from saved copy.\n" -"Or, drop a backup file onto this button to see changes from that." -msgstr "" -"Afficher les différences par rapport au dernier enregistrement (vous\n" -"pouvez faire glisser ici une ancienne version de ce fichier pour afficher\n" -"les différences." - -#: EditWindow.py:222 -msgid "Replace" -msgstr "Remplacer" - -#: EditWindow.py:223 -msgid "Search" -msgstr "Chercher" - -#: EditWindow.py:224 -#, fuzzy -msgid "Save As" -msgstr "Enregistrer" - -#: EditWindow.py:226 -msgid "Up" -msgstr "Ouvrir le dossier père" - -#: EditWindow.py:279 -msgid "Line %s of %d" -msgstr "Ligne %s sur %d" - -#: EditWindow.py:286 -msgid "One character selected (%s)" -msgstr "Un caractère sélectionné (%s)" - -#: EditWindow.py:289 -msgid "%d characters selected" -msgstr "%d caractères sélectionnés" - -#: EditWindow.py:291 -msgid "%d lines selected" -msgstr "%d lignes sélectionnées" - -#: EditWindow.py:434 -msgid "Untitled" -msgstr "" - -#: EditWindow.py:462 -#, fuzzy -msgid "Encoding:" -msgstr "Édition" - -#: EditWindow.py:468 -msgid "Ignore errors" -msgstr "" - -#: EditWindow.py:494 -msgid "Unknown encoding '%s'" -msgstr "Encodage de caractères '%s' inconnu" - -#: EditWindow.py:518 -msgid "" -"Data is not valid %s. Please select the file's encoding. Turn on 'ignore " -"errors' to try and load it anyway." -msgstr "" -"Ce fichier contient du texte non %s.\n" -"Choisissez un encodage pour ce fichier.\n" -"Cochez 'Ignorer les erreurs' pour essayer de l'ouvrir quand même." - -#: EditWindow.py:559 -msgid "File is not saved to disk yet" -msgstr "Le fichier n'a pas encore été enregistré" - -#: EditWindow.py:564 -msgid "" -"This file has never been saved; nothing to compare it to!\n" -"Note: you can drop a file onto the toolbar button to see the changes from " -"that file." -msgstr "" -"Ce fichier n'a encore pas été enregistré ; rien à comparer !\n" -"Note : vous pouvez glisser un fichier sur le bouton de la barre d'outils\n" -"pour afficher les différences." - -#: EditWindow.py:761 -msgid "Minibuffer help" -msgstr "Aide du Minibuffer" - -#: diff.py:78 -msgid "Changes to %s" -msgstr "Différences sur %s" - -#: diff.py:129 -msgid "There is no difference between this version and the saved one." -msgstr "" -"Il n'y a aucune différence entre cette version et la dernière enregistrée." - -#: goto.py:10 -msgid "Goto line:" -msgstr "Aller à la ligne :" - -#: goto.py:12 -msgid "" -"Enter the line number to go to. Line numbers start from 1. Press Escape to " -"cancel, or Return to jump to the line." -msgstr "" -"Entrez le numéro de la ligne sur laquelle vous voulez aller.Appuyez sur " -"Échap pour annuler, ou Entrée pour vous déplacer sur la ligne indiquée." - -#: goto.py:22 -msgid "Invalid line number: %s" -msgstr "Numéro de ligne invalide (%s)" - -#: search.py:6 -msgid "Matches any character" -msgstr "" - -#: search.py:7 -msgid "Any lowercase letter" -msgstr "" - -#: search.py:8 -#, fuzzy -msgid "Any character listed (- must be first)" -msgstr "Un caractère sélectionné (%s)" - -#: search.py:9 -msgid "A only at the start of a line" -msgstr "" - -#: search.py:10 -msgid "A only at the end of a line" -msgstr "" - -#: search.py:11 -msgid "Zero or more A" -msgstr "" - -#: search.py:12 -msgid "One or more A" -msgstr "" - -#: search.py:13 -msgid "Zero or one A" -msgstr "" - -#: search.py:14 -msgid "Between m and n matches of A" -msgstr "" - -#: search.py:15 -msgid "Non-greedy versions of *, +, ? and {}" -msgstr "" - -#: search.py:16 -msgid "Literal \"*\", \"+\"" -msgstr "" - -#: search.py:17 -msgid "Can match A or B" -msgstr "" - -#: search.py:18 -msgid "Group A and B together (for *, \\1, etc)" -msgstr "" - -#: search.py:19 -msgid "The first/second bracketed match (goes in the With: box)" -msgstr "" - -#: search.py:20 -msgid "Word boundary (eg, \\bWord\\b)" -msgstr "" - -#: search.py:21 -msgid "Non-word boundary" -msgstr "" - -#: search.py:22 -msgid "Digit, non-digit" -msgstr "" - -#: search.py:23 -msgid "Whitespace, non-whitespace" -msgstr "" - -#: search.py:24 -msgid "Others" -msgstr "" - -#: search.py:24 -msgid "See the Python regular expression documentation for more" -msgstr "" - -#: search.py:26 -msgid "Examples:" -msgstr "" - -#: search.py:27 -msgid "Matches \"Fred\" anywhere" -msgstr "" - -#: search.py:28 -msgid "A line containing only \"Fred\"" -msgstr "" - -#: search.py:29 -msgid "\"Gogle, Google, Gooogle, etc\"" -msgstr "" - -#: search.py:30 -msgid "Colour or Color" -msgstr "" - -#: search.py:31 -msgid "\"The\" or \"the\"" -msgstr "" - -#: search.py:35 -msgid "Python expressions:" -msgstr "" - -#: search.py:36 -msgid "The text that was matched" -msgstr "" - -#: search.py:37 -msgid "The numerical value of 'old'" -msgstr "" - -#: search.py:38 -msgid "Convert match to uppercase" -msgstr "" - -#: search.py:39 -msgid "Double all matched numbers" -msgstr "" - -#: search.py:56 -msgid "Find Next" -msgstr "" - -#: search.py:61 -msgid "Find Previous" -msgstr "" - -#: search.py:66 -msgid "Match case" -msgstr "" - -#: search.py:80 -msgid "" -"Type a string to search for. The display will scroll to show the next match " -"as you type. Use the Up and Down cursor keys to move to the next or previous " -"match. Press Escape or Return to finish." -msgstr "" - -#: search.py:85 -msgid " Find: " -msgstr "" - -#: search.py:160 -#, fuzzy -msgid "Code" -msgstr "Quitter" - -#: search.py:162 -msgid "Meaning" -msgstr "" - -#: search.py:213 -#, fuzzy -msgid "Replace:" -msgstr "Remplacer" - -#: search.py:214 -msgid "With:" -msgstr "" - -#: search.py:221 -#, fuzzy -msgid "Advanced search and replace" -msgstr "Chercher et remplacer..." - -#: search.py:229 -msgid "Evaluate 'With' as Python expression" -msgstr "" - -#: search.py:252 -msgid "You need to specify something to search for..." -msgstr "" - -#: search.py:297 -msgid "Search string not found" -msgstr "" - -#: search.py:301 -msgid "One line changed" -msgstr "" - -#: search.py:303 -#, fuzzy -msgid "%d lines changed" -msgstr "%d lignes sélectionnées" - -#: tips:1 -msgid "Display" -msgstr "Affichage" - -#: tips:2 -msgid "Fonts" -msgstr "Polices" - -#: tips:3 -msgid "Text font" -msgstr "Texte" - -#: tips:4 tips:5 -msgid "Font used for normal text." -msgstr "Police utilisée pour le texte normal" - -#: tips:6 -msgid "Colours" -msgstr "Couleurs" - -#: tips:7 -msgid "Foreground colour" -msgstr "Texte" - -#: tips:8 -msgid "Background colour" -msgstr "Fond" - -#: tips:10 -msgid "Wrap long lines of text" -msgstr "" - -#: tips:11 tips:12 -msgid "" -"Control whether lines wider than the window are wrapped to multiple display " -"lines." -msgstr "" - -#: tips:13 -msgid "Toolbar" -msgstr "" - -#: tips:14 -msgid "Show toolbar" -msgstr "" - -#: tips:15 tips:16 tips:17 -msgid "Display a toolbar along the top of each window with common tools." -msgstr "" - -#: tips:18 -msgid "Spacing" -msgstr "Espacement" - -#: tips:19 -msgid "Margins" -msgstr "Marges" - -#: tips:20 -#, fuzzy -msgid "pixels for left margin, and for the right:" -msgstr "à gauche, et à droite :" - -#: tips:21 tips:24 tips:26 tips:28 tips:30 -msgid "pixels" -msgstr "pixels" - -#: tips:22 -msgid "Paragraphs" -msgstr "Paragraphes" - -#: tips:23 -msgid "Space above paragraphs" -msgstr "Espace au-dessus des paragraphes" - -#: tips:25 -msgid "Space below paragraphs" -msgstr "Espace sous les paragraphes" - -#: tips:27 -msgid "Line spacing within paragraphs" -msgstr "Interlignage intra paragraphes" - -#: tips:29 -msgid "New-paragraph indent" -msgstr "Retrait des nouveaux paragraphes" - -#: tips:31 -msgid "Editing" -msgstr "Édition" - -#: tips:32 -msgid "Indentation" -msgstr "Mises en retrait" - -#: tips:33 -msgid "Automatic indentation" -msgstr "Retraits automatiques" - -#: tips:34 -msgid "" -"When you press Return, the next line starts with the same amount of " -"indentation as the previous line." -msgstr "" -"Quand vous pressez la touche Entrée, la nouvelle ligne commence avec le même " -"retrait que la précédente" - -#: tips:35 -msgid "Show Print Margin" -msgstr "" - -#: tips:36 -#, fuzzy -msgid "Print Margin" -msgstr "Marges" - -#: tips:37 tips:43 -#, fuzzy -msgid "characters" -msgstr "%d caractères sélectionnés" - -#: tips:38 -msgid "Smart Home/End" -msgstr "" - -#: tips:39 -msgid "Show Line Numbers" -msgstr "" - -#: tips:40 -msgid "Show Line Markers" -msgstr "" - -#: tips:41 -msgid "Use spaces instead of Tabs" -msgstr "" - -#: tips:42 -msgid "Tab width" -msgstr "" - -#: tips:44 -msgid "Changes" -msgstr "Différences" - -#: tips:45 -msgid "Colours for Show Changes feature" -msgstr "Couleurs pour la fonction 'Afficher les différences'" - -#: tips:46 tips:50 tips:54 tips:58 -msgid "Foreground" -msgstr "Texte" - -#: tips:47 tips:51 tips:55 tips:59 -msgid "Background" -msgstr "Fond" - -#: tips:48 tips:49 -#, fuzzy -msgid "(headers)" -msgstr "En-têtes :" - -#: tips:52 tips:53 -#, fuzzy -msgid "(no change)" -msgstr "Afficher les différences" - -#: tips:56 tips:57 -#, fuzzy -msgid "(additions)" -msgstr "Ajouts :" - -#: tips:60 tips:61 tips:62 tips:63 tips:64 -#, fuzzy -msgid "(deletions)" -msgstr "Suppressions :" - -#~ msgid "/File/" -#~ msgstr "/Fichier/" - -#~ msgid "/Edit/" -#~ msgstr "/Édition/" - -#~ msgid "/Help" -#~ msgstr "/Aide" - -#~ msgid "Edit requires ROX-Lib2 1.9.8 or later" -#~ msgstr "Edit a besoin de ROX-Lib2 version 1.9.8 ou postérieure" - -#~ msgid "Normal:" -#~ msgstr "Normal :" diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/it.gmo b/source/rox-extra/edit/edit-2.0/Edit/Messages/it.gmo deleted file mode 100644 index bb586a6..0000000 Binary files a/source/rox-extra/edit/edit-2.0/Edit/Messages/it.gmo and /dev/null differ diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/it.po b/source/rox-extra/edit/edit-2.0/Edit/Messages/it.po deleted file mode 100644 index ef17221..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Messages/it.po +++ /dev/null @@ -1,618 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Sat May 21 20:07:04 2005\n" -"PO-Revision-Date: 2003-10-03 18:55+1\n" -"Last-Translator: Roberto Inzerillo \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: ENCODING\n" -"Generated-By: pygettext.py 1.4\n" - -#: EditWindow.py:52 -msgid "Cut" -msgstr "" - -#: EditWindow.py:53 -msgid "Copy" -msgstr "" - -#: EditWindow.py:54 -#, fuzzy -msgid "Paste" -msgstr "/Modifica/Incolla" - -#: EditWindow.py:56 EditWindow.py:221 -msgid "Undo" -msgstr "Annulla" - -#: EditWindow.py:57 EditWindow.py:220 -msgid "Redo" -msgstr "Ripeti" - -#: EditWindow.py:59 -#, fuzzy -msgid "Search..." -msgstr "Cerca" - -#: EditWindow.py:60 -#, fuzzy -msgid "Search and Replace...." -msgstr "/Modifica/Cerca e Sotituisci" - -#: EditWindow.py:62 -#, fuzzy -msgid "Goto line..." -msgstr "Vai alla riga:" - -#: EditWindow.py:67 -msgid "Toggle Bookmark" -msgstr "" - -#: EditWindow.py:68 -msgid "Next Bookmark" -msgstr "" - -#: EditWindow.py:69 -msgid "Previous Bookmark" -msgstr "" - -#: EditWindow.py:76 -#, fuzzy -msgid "File" -msgstr "/File" - -#: EditWindow.py:77 EditWindow.py:225 -msgid "Save" -msgstr "Salva" - -#: EditWindow.py:78 -msgid "Save As..." -msgstr "" - -#: EditWindow.py:79 -#, fuzzy -msgid "Open Parent" -msgstr "/File/Apri Directory" - -#: EditWindow.py:80 -msgid "Show Changes" -msgstr "" - -#: EditWindow.py:81 EditWindow.py:216 tips:9 -msgid "Word Wrap" -msgstr "" - -#: EditWindow.py:82 EditWindow.py:227 -msgid "Close" -msgstr "Chiudi" - -#: EditWindow.py:84 -msgid "New" -msgstr "" - -#: EditWindow.py:86 -#, fuzzy -msgid "Edit" -msgstr "/Modifica" - -#: EditWindow.py:88 -#, fuzzy -msgid "Options" -msgstr "/Opzioni" - -#: EditWindow.py:89 EditWindow.py:207 -msgid "Help" -msgstr "Aiuto" - -#: EditWindow.py:208 -msgid "" -"Show changes from saved copy.\n" -"Or, drop a backup file onto this button to see changes from that." -msgstr "" - -#: EditWindow.py:222 -msgid "Replace" -msgstr "Sostituisci" - -#: EditWindow.py:223 -msgid "Search" -msgstr "Cerca" - -#: EditWindow.py:224 -#, fuzzy -msgid "Save As" -msgstr "Salva" - -#: EditWindow.py:226 -msgid "Up" -msgstr "Apri directory" - -#: EditWindow.py:279 -msgid "Line %s of %d" -msgstr "" - -#: EditWindow.py:286 -msgid "One character selected (%s)" -msgstr "" - -#: EditWindow.py:289 -msgid "%d characters selected" -msgstr "" - -#: EditWindow.py:291 -msgid "%d lines selected" -msgstr "" - -#: EditWindow.py:434 -msgid "Untitled" -msgstr "" - -#: EditWindow.py:462 -#, fuzzy -msgid "Encoding:" -msgstr "/Modifica" - -#: EditWindow.py:468 -msgid "Ignore errors" -msgstr "" - -#: EditWindow.py:494 -#, fuzzy -msgid "Unknown encoding '%s'" -msgstr "Codifica % sconosciuta" - -#: EditWindow.py:518 -#, fuzzy -msgid "" -"Data is not valid %s. Please select the file's encoding. Turn on 'ignore " -"errors' to try and load it anyway." -msgstr "I dati non sono %s validi. Scegliere la codifica del file." - -#: EditWindow.py:559 -msgid "File is not saved to disk yet" -msgstr "Il file non è ancora stato salvato sul disco" - -#: EditWindow.py:564 -msgid "" -"This file has never been saved; nothing to compare it to!\n" -"Note: you can drop a file onto the toolbar button to see the changes from " -"that file." -msgstr "" - -#: EditWindow.py:761 -msgid "Minibuffer help" -msgstr "Aiuto del Minibuffer" - -#: diff.py:78 -msgid "Changes to %s" -msgstr "" - -#: diff.py:129 -msgid "There is no difference between this version and the saved one." -msgstr "" - -#: goto.py:10 -msgid "Goto line:" -msgstr "Vai alla riga:" - -#: goto.py:12 -#, fuzzy -msgid "" -"Enter the line number to go to. Line numbers start from 1. Press Escape to " -"cancel, or Return to jump to the line." -msgstr "" -"Scrivi il numero della riga alla quale andare. Le righe iniziano dalla " -"numero 1.\n" -"Premi ESC per annullare, oppure INVIO per andare alla riga scelta." - -#: goto.py:22 -msgid "Invalid line number: %s" -msgstr "Numero di riga non valido: %" - -#: search.py:6 -msgid "Matches any character" -msgstr "" - -#: search.py:7 -msgid "Any lowercase letter" -msgstr "" - -#: search.py:8 -msgid "Any character listed (- must be first)" -msgstr "" - -#: search.py:9 -msgid "A only at the start of a line" -msgstr "" - -#: search.py:10 -msgid "A only at the end of a line" -msgstr "" - -#: search.py:11 -msgid "Zero or more A" -msgstr "" - -#: search.py:12 -msgid "One or more A" -msgstr "" - -#: search.py:13 -msgid "Zero or one A" -msgstr "" - -#: search.py:14 -msgid "Between m and n matches of A" -msgstr "" - -#: search.py:15 -msgid "Non-greedy versions of *, +, ? and {}" -msgstr "" - -#: search.py:16 -msgid "Literal \"*\", \"+\"" -msgstr "" - -#: search.py:17 -msgid "Can match A or B" -msgstr "" - -#: search.py:18 -msgid "Group A and B together (for *, \\1, etc)" -msgstr "" - -#: search.py:19 -msgid "The first/second bracketed match (goes in the With: box)" -msgstr "" - -#: search.py:20 -msgid "Word boundary (eg, \\bWord\\b)" -msgstr "" - -#: search.py:21 -msgid "Non-word boundary" -msgstr "" - -#: search.py:22 -msgid "Digit, non-digit" -msgstr "" - -#: search.py:23 -msgid "Whitespace, non-whitespace" -msgstr "" - -#: search.py:24 -msgid "Others" -msgstr "" - -#: search.py:24 -msgid "See the Python regular expression documentation for more" -msgstr "" - -#: search.py:26 -msgid "Examples:" -msgstr "" - -#: search.py:27 -msgid "Matches \"Fred\" anywhere" -msgstr "" - -#: search.py:28 -msgid "A line containing only \"Fred\"" -msgstr "" - -#: search.py:29 -msgid "\"Gogle, Google, Gooogle, etc\"" -msgstr "" - -#: search.py:30 -msgid "Colour or Color" -msgstr "" - -#: search.py:31 -msgid "\"The\" or \"the\"" -msgstr "" - -#: search.py:35 -msgid "Python expressions:" -msgstr "" - -#: search.py:36 -msgid "The text that was matched" -msgstr "" - -#: search.py:37 -msgid "The numerical value of 'old'" -msgstr "" - -#: search.py:38 -msgid "Convert match to uppercase" -msgstr "" - -#: search.py:39 -msgid "Double all matched numbers" -msgstr "" - -#: search.py:56 -msgid "Find Next" -msgstr "" - -#: search.py:61 -msgid "Find Previous" -msgstr "" - -#: search.py:66 -msgid "Match case" -msgstr "" - -#: search.py:80 -msgid "" -"Type a string to search for. The display will scroll to show the next match " -"as you type. Use the Up and Down cursor keys to move to the next or previous " -"match. Press Escape or Return to finish." -msgstr "" - -#: search.py:85 -msgid " Find: " -msgstr "" - -#: search.py:160 -#, fuzzy -msgid "Code" -msgstr "Chiudi" - -#: search.py:162 -msgid "Meaning" -msgstr "" - -#: search.py:213 -#, fuzzy -msgid "Replace:" -msgstr "Sostituisci" - -#: search.py:214 -msgid "With:" -msgstr "" - -#: search.py:221 -#, fuzzy -msgid "Advanced search and replace" -msgstr "/Modifica/Cerca e Sotituisci" - -#: search.py:229 -msgid "Evaluate 'With' as Python expression" -msgstr "" - -#: search.py:252 -msgid "You need to specify something to search for..." -msgstr "" - -#: search.py:297 -msgid "Search string not found" -msgstr "" - -#: search.py:301 -msgid "One line changed" -msgstr "" - -#: search.py:303 -msgid "%d lines changed" -msgstr "" - -#: tips:1 -msgid "Display" -msgstr "" - -#: tips:2 -msgid "Fonts" -msgstr "" - -#: tips:3 -msgid "Text font" -msgstr "" - -#: tips:4 tips:5 -msgid "Font used for normal text." -msgstr "" - -#: tips:6 -#, fuzzy -msgid "Colours" -msgstr "Chiudi" - -#: tips:7 -msgid "Foreground colour" -msgstr "" - -#: tips:8 -msgid "Background colour" -msgstr "" - -#: tips:10 -msgid "Wrap long lines of text" -msgstr "" - -#: tips:11 tips:12 -msgid "" -"Control whether lines wider than the window are wrapped to multiple display " -"lines." -msgstr "" - -#: tips:13 -msgid "Toolbar" -msgstr "" - -#: tips:14 -msgid "Show toolbar" -msgstr "" - -#: tips:15 tips:16 tips:17 -msgid "Display a toolbar along the top of each window with common tools." -msgstr "" - -#: tips:18 -msgid "Spacing" -msgstr "" - -#: tips:19 -msgid "Margins" -msgstr "" - -#: tips:20 -msgid "pixels for left margin, and for the right:" -msgstr "" - -#: tips:21 tips:24 tips:26 tips:28 tips:30 -msgid "pixels" -msgstr "" - -#: tips:22 -msgid "Paragraphs" -msgstr "" - -#: tips:23 -msgid "Space above paragraphs" -msgstr "" - -#: tips:25 -msgid "Space below paragraphs" -msgstr "" - -#: tips:27 -msgid "Line spacing within paragraphs" -msgstr "" - -#: tips:29 -msgid "New-paragraph indent" -msgstr "" - -#: tips:31 -#, fuzzy -msgid "Editing" -msgstr "/Modifica" - -#: tips:32 -msgid "Indentation" -msgstr "" - -#: tips:33 -msgid "Automatic indentation" -msgstr "" - -#: tips:34 -msgid "" -"When you press Return, the next line starts with the same amount of " -"indentation as the previous line." -msgstr "" - -#: tips:35 -msgid "Show Print Margin" -msgstr "" - -#: tips:36 -msgid "Print Margin" -msgstr "" - -#: tips:37 tips:43 -msgid "characters" -msgstr "" - -#: tips:38 -msgid "Smart Home/End" -msgstr "" - -#: tips:39 -msgid "Show Line Numbers" -msgstr "" - -#: tips:40 -msgid "Show Line Markers" -msgstr "" - -#: tips:41 -msgid "Use spaces instead of Tabs" -msgstr "" - -#: tips:42 -msgid "Tab width" -msgstr "" - -#: tips:44 -msgid "Changes" -msgstr "" - -#: tips:45 -msgid "Colours for Show Changes feature" -msgstr "" - -#: tips:46 tips:50 tips:54 tips:58 -msgid "Foreground" -msgstr "" - -#: tips:47 tips:51 tips:55 tips:59 -msgid "Background" -msgstr "" - -#: tips:48 tips:49 -msgid "(headers)" -msgstr "" - -#: tips:52 tips:53 -msgid "(no change)" -msgstr "" - -#: tips:56 tips:57 -msgid "(additions)" -msgstr "" - -#: tips:60 tips:61 tips:62 tips:63 tips:64 -msgid "(deletions)" -msgstr "" - -#~ msgid "/File/" -#~ msgstr "/File/" - -#~ msgid "/Edit/" -#~ msgstr "/Modifica/" - -#~ msgid "/Help" -#~ msgstr "/Aiuto" - -#~ msgid "Edit requires ROX-Lib2 1.9.8 or later" -#~ msgstr "Edit necessita di ROX-Lib2 1.9.8 o più recente" - -#~ msgid "/File/Save" -#~ msgstr "/File/Salva" - -#~ msgid "/File/Close" -#~ msgstr "/File/Chiudi" - -#~ msgid "/File/New" -#~ msgstr "/File/Nuovo" - -#~ msgid "/Edit/Cut" -#~ msgstr "/Modifica/Taglia" - -#~ msgid "/Edit/Copy" -#~ msgstr "/Modifica/Copia" - -#~ msgid "/Edit/Undo" -#~ msgstr "/Modifica/Annulla" - -#~ msgid "/Edit/Redo" -#~ msgstr "/Modifica/Ripeti" - -#~ msgid "/Edit/Search..." -#~ msgstr "/Modifica/Cerca..." - -#~ msgid "/Edit/Goto line..." -#~ msgstr "/Modifica/Vai alla riga..." - -#~ msgid "Turn on 'ignore errors' to try and load it anyway." -#~ msgstr "Attiva 'ignora errori' per per provare a caricarlo comunque" diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/tips.py b/source/rox-extra/edit/edit-2.0/Edit/Messages/tips.py deleted file mode 100644 index 19e9592..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Messages/tips.py +++ /dev/null @@ -1,41 +0,0 @@ -# Grab the tips from Options.xml - -from xmllib import * -import string, os - -print "Extracting translatable bits from Options.xml..." - -class Parser(XMLParser): - data = "" - - def unknown_starttag(self, tag, attrs): - for x in ['title', 'label', 'end', 'unit']: - if attrs.has_key(x): - self.trans(attrs[x]) - self.data = "" - - def handle_data(self, data): - self.data = self.data + data - - def unknown_endtag(self, tag): - data = string.strip(self.data) - if data: - self.trans(data) - - def trans(self, data): - data = string.join(string.split(data, '\n'), '\\n') - if data: - out.write('_("%s")\n' % data) - -try: - os.chdir("po") -except OSError: - pass - -file = open('../Options.xml', 'rb') -out = open('../tips', 'wb') -parser = Parser() -parser.feed(file.read()) -file.close() -parser.close() -out.close() diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/update-po b/source/rox-extra/edit/edit-2.0/Edit/Messages/update-po deleted file mode 100755 index dba7ff2..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Messages/update-po +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -echo Extracting messages from source files... -echo - -python ./tips.py -(cd ..; pygettext *.py tips) - -echo -echo Updating all .po files... -echo - -for FILE in *.po; do - echo -n "Updating '$FILE' translation" - mv $FILE $FILE.old - msgmerge $FILE.old ../messages.pot > $FILE -done diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/zh_CN.gmo b/source/rox-extra/edit/edit-2.0/Edit/Messages/zh_CN.gmo deleted file mode 100644 index bab9d21..0000000 Binary files a/source/rox-extra/edit/edit-2.0/Edit/Messages/zh_CN.gmo and /dev/null differ diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/zh_CN.po b/source/rox-extra/edit/edit-2.0/Edit/Messages/zh_CN.po deleted file mode 100644 index 2bbf17f..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Messages/zh_CN.po +++ /dev/null @@ -1,601 +0,0 @@ -# Rox Edit Chinese Tranalation. -# Copyright (C) YEAR ORGANIZATION -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2005-07-10 21:57+HKT\n" -"PO-Revision-Date: 2005-07-10 18:55+1\n" -"Last-Translator: Babyfai Cheung \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: ENCODING\n" -"Generated-By: pygettext.py 1.4\n" - -#: EditWindow.py:81 -msgid "Cut" -msgstr "剪下" - -#: EditWindow.py:82 -msgid "Copy" -msgstr "复制" - -#: EditWindow.py:83 -msgid "Paste" -msgstr "贴上" - -#: EditWindow.py:85 EditWindow.py:259 -msgid "Undo" -msgstr "还原" - -#: EditWindow.py:86 EditWindow.py:258 -msgid "Redo" -msgstr "重做" - -#: EditWindow.py:88 -msgid "Search..." -msgstr "搜寻..." - -#: EditWindow.py:89 -msgid "Search and Replace...." -msgstr "搜寻及取代..." - -#: EditWindow.py:91 -msgid "Goto line..." -msgstr "跳至行数..." - -#: EditWindow.py:96 -msgid "Toggle Bookmark" -msgstr "标记此行" - -#: EditWindow.py:97 -msgid "Next Bookmark" -msgstr "下个标记" - -#: EditWindow.py:98 -msgid "Previous Bookmark" -msgstr "上个标记" - -#: EditWindow.py:105 -msgid "File" -msgstr "文件" - -#: EditWindow.py:106 EditWindow.py:263 -msgid "Save" -msgstr "储存" - -#: EditWindow.py:107 -msgid "Save As..." -msgstr "另存为..." - -#: EditWindow.py:108 -msgid "Open Parent" -msgstr "往上目录" - -#: EditWindow.py:109 -msgid "Show Changes" -msgstr "显示改变" - -#: EditWindow.py:110 EditWindow.py:255 tips:9 -msgid "Word Wrap" -msgstr "自动换行" - -#: EditWindow.py:111 EditWindow.py:265 -msgid "Close" -msgstr "关闭" - -#: EditWindow.py:113 -msgid "New" -msgstr "新增" - -#: EditWindow.py:115 -msgid "Edit" -msgstr "编辑" - -#: EditWindow.py:117 -msgid "Options" -msgstr "选项" - -#: EditWindow.py:118 EditWindow.py:238 -msgid "Help" -msgstr "帮助" - -#: EditWindow.py:239 -msgid "" -"Show changes from saved copy.\n" -"Or, drop a backup file onto this button to see changes from that." -msgstr "" -"显示已作及储存的改变.\n" -"或将备份文件，拖放到这按钮上以检视改变。" - -#: EditWindow.py:249 -msgid "Check Spelling" -msgstr "检查字串拼写" - -#: EditWindow.py:260 -msgid "Replace" -msgstr "取代" - -#: EditWindow.py:261 -msgid "Search" -msgstr "搜寻" - -#: EditWindow.py:262 -msgid "Save As" -msgstr "另存为" - -#: EditWindow.py:264 -msgid "Up" -msgstr "往上" - -#: EditWindow.py:323 -msgid "Line %s of %d" -msgstr "行 %s 总数 %d" - -#: EditWindow.py:330 -msgid "One character selected (%s)" -msgstr "选择了一个字符 (%s)" - -#: EditWindow.py:333 -msgid "%d characters selected" -msgstr "%d 个字符已选择" - -#: EditWindow.py:335 -msgid "%d lines selected" -msgstr "%d 行数已选择" - -#: EditWindow.py:502 -msgid "Untitled" -msgstr "未命名" - -#: EditWindow.py:530 -msgid "Encoding:" -msgstr "编码：" - -#: EditWindow.py:536 -msgid "Ignore errors" -msgstr "忽略错误" - -#: EditWindow.py:562 -msgid "Unknown encoding '%s'" -msgstr "不明编码 '%s'" - -#: EditWindow.py:586 -msgid "" -"Data is not valid %s. Please select the file's encoding. Turn on 'ignore " -"errors' to try and load it anyway." -msgstr "资料不是 %s. 请选择正确的编码，启用 '忽略错误' 以尝试打开。" - -#: EditWindow.py:627 -msgid "File is not saved to disk yet" -msgstr "文件尚未储存" - -#: EditWindow.py:648 -msgid "" -"This file has never been saved; nothing to compare it to!\n" -"Note: you can drop a file onto the toolbar button to see the changes from " -"that file." -msgstr "" -"这文件还未储存；因此没法进行比较！\n" -"注意：您可拖放文件到工具栏的按钮上，来查看已更改的资料。" - -#: EditWindow.py:697 -msgid "TextFile" -msgstr "文字文件" - -#: EditWindow.py:845 -msgid "Minibuffer help" -msgstr "小型帮助框" - -#: diff.py:78 -msgid "Changes to %s" -msgstr "%s 的改变" - -#: diff.py:128 -msgid "There is no difference between this version and the saved one." -msgstr "没有不相同的地方。" - -#: goto.py:10 -msgid "Goto line:" -msgstr "跳至行数：" - -#: goto.py:12 -msgid "" -"Enter the line number to go to. Line numbers start from 1. Press Escape to " -"cancel, or Return to jump to the line." -msgstr "键入行数数字，行数起始为 1。按 Escape 以取消，或按 Enter 以跳至该行。" - -#: goto.py:22 -msgid "Invalid line number: %s" -msgstr "错误的行数：%s" - -#: search.py:6 -msgid "Matches any character" -msgstr "对应任何字符" - -#: search.py:7 -msgid "Any lowercase letter" -msgstr "任何小阶字母" - -#: search.py:8 -msgid "Any character listed (- must be first)" -msgstr "任一列出字符 (- 必须前排)" - -#: search.py:9 -msgid "A only at the start of a line" -msgstr "A 在行的最前" - -#: search.py:10 -msgid "A only at the end of a line" -msgstr "A 在行的最后" - -#: search.py:11 -msgid "Zero or more A" -msgstr "零或更多 A" - -#: search.py:12 -msgid "One or more A" -msgstr "一或更多 A" - -#: search.py:13 -msgid "Zero or one A" -msgstr "零或一个 A" - -#: search.py:14 -msgid "Between m and n matches of A" -msgstr "对应 m 与 n 之间的 A" - -#: search.py:15 -msgid "Non-greedy versions of *, +, ? and {}" -msgstr "包含 *, +, ? 及 {} 的版本" - -#: search.py:16 -msgid "Literal \"*\", \"+\"" -msgstr "正常字符 \"*\", \"+\"" - -#: search.py:17 -msgid "Can match A or B" -msgstr "能对应 A 或 B" - -#: search.py:18 -msgid "Group A and B together (for *, \\1, etc)" -msgstr "A 和 B 一同匹配 (用於 *, \\1, 等等)" - -#: search.py:19 -msgid "The first/second bracketed match (goes in the With: box)" -msgstr "匹配括弧内第一/或第二个字符 (须用於: 盒型括弧内)" - -#: search.py:20 -msgid "Word boundary (eg, \\bWord\\b)" -msgstr "匹配含边沿的整字 (eg, \\bWord\\b)" - -#: search.py:21 -msgid "Non-word boundary" -msgstr "匹配整字内不在边沿的字符" - -#: search.py:22 -msgid "Digit, non-digit" -msgstr "数字，非数字" - -#: search.py:23 -msgid "Whitespace, non-whitespace" -msgstr "空白，非空白" - -#: search.py:24 -msgid "Others" -msgstr "其他" - -#: search.py:24 -msgid "See the Python regular expression documentation for more" -msgstr "详情请参阅 Python 正则表达法文本" - -#: search.py:26 -msgid "Examples:" -msgstr "举例：" - -#: search.py:27 -msgid "Matches \"Fred\" anywhere" -msgstr "任何对应 \"Fred\" " - -#: search.py:28 -msgid "A line containing only \"Fred\"" -msgstr "一行内只包含 \"Fred\"" - -#: search.py:29 -msgid "\"Gogle, Google, Gooogle, etc\"" -msgstr "\"Gogle, Google, Gooogle, 等等\"" - -#: search.py:30 -msgid "Colour or Color" -msgstr "Colour 或 Color" - -#: search.py:31 -msgid "\"The\" or \"the\"" -msgstr "\"The\" 或 \"the\"" - -#: search.py:35 -msgid "Python expressions:" -msgstr "Python 正则表达法：" - -#: search.py:36 -msgid "The text that was matched" -msgstr "匹配的文字" - -#: search.py:37 -msgid "The numerical value of 'old'" -msgstr "'old' 的数值" - -#: search.py:38 -msgid "Convert match to uppercase" -msgstr "将匹配的文字转为大阶字母" - -#: search.py:39 -msgid "Double all matched numbers" -msgstr "将匹配的数值加倍" - -#: search.py:56 -msgid "Find Next" -msgstr "找寻下一个" - -#: search.py:61 -msgid "Find Previous" -msgstr "找寻上一个" - -#: search.py:66 -msgid "Match case" -msgstr "匹配大小阶" - -#: search.py:80 -msgid "" -"Type a string to search for. The display will scroll to show the next match " -"as you type. Use the Up and Down cursor keys to move to the next or previous " -"match. Press Escape or Return to finish." -msgstr "" -"键入要寻找的字串，匹配的将会以卷动型式显示，用往上或往下的箭咀键来浏览结果，" -"按Escape 或 Return 结束。" - -#: search.py:85 -msgid " Find: " -msgstr "找寻：" - -#: search.py:160 -msgid "Code" -msgstr "代码" - -#: search.py:162 -msgid "Meaning" -msgstr "注释" - -#: search.py:213 -msgid "Replace:" -msgstr "取代：" - -#: search.py:214 -msgid "With:" -msgstr "换为：" - -#: search.py:221 -msgid "Advanced search and replace" -msgstr "进阶搜寻及取代" - -#: search.py:229 -msgid "Evaluate 'With' as Python expression" -msgstr "以 Python 正则表达法鉴定" - -#: search.py:252 -msgid "You need to specify something to search for..." -msgstr "请先指明需要搜寻的目标..." - -#: search.py:297 -msgid "Search string not found" -msgstr "找不到要搜寻的字串" - -#: search.py:301 -msgid "One line changed" -msgstr "一行已改变" - -#: search.py:303 -msgid "%d lines changed" -msgstr "%d 行数已改变" - -#: tips:1 -msgid "Display" -msgstr "显示" - -#: tips:2 -msgid "Fonts" -msgstr "字型" - -#: tips:3 -msgid "Text font" -msgstr "内文字型" - -#: tips:4 tips:5 -msgid "Font used for normal text." -msgstr "一般内文的字型" - -#: tips:6 -msgid "Colours" -msgstr "颜色" - -#: tips:7 -msgid "Foreground colour" -msgstr "文字颜色" - -#: tips:8 -msgid "Background colour" -msgstr "背景颜色" - -#: tips:10 -msgid "Wrap long lines of text" -msgstr "对过长文字的行换行" - -#: tips:11 tips:12 -msgid "" -"Control whether lines wider than the window are wrapped to multiple display " -"lines." -msgstr "当内文的字行比窗口要长时，会换到下一行来显示." - -#: tips:13 -msgid "Toolbar" -msgstr "工具栏" - -#: tips:14 -msgid "Show toolbar" -msgstr "显示工具栏" - -#: tips:15 tips:16 tips:17 -msgid "Display a toolbar along the top of each window with common tools." -msgstr "在顶端显示工具栏" - -#: tips:18 -msgid "Spacing" -msgstr "字距" - -#: tips:19 -msgid "Margins" -msgstr "边界" - -#: tips:20 -msgid "pixels for left margin, and for the right:" -msgstr "像素 左面边界；及右面边界：" - -#: tips:21 tips:24 tips:26 tips:28 tips:30 -msgid "pixels" -msgstr "像素" - -#: tips:22 -msgid "Paragraphs" -msgstr "段落" - -#: tips:23 -msgid "Space above paragraphs" -msgstr "对比上段落间的距离" - -#: tips:25 -msgid "Space below paragraphs" -msgstr "对比下段落间的距离" - -#: tips:27 -msgid "Line spacing within paragraphs" -msgstr "段落间的行距" - -#: tips:29 -msgid "New-paragraph indent" -msgstr "换新段落时缩排" - -#: tips:31 -msgid "Editing" -msgstr "编辑" - -#: tips:32 -msgid "Indentation" -msgstr "缩排" - -#: tips:33 -msgid "Automatic indentation" -msgstr "自动缩排" - -#: tips:34 -msgid "" -"When you press Return, the next line starts with the same amount of " -"indentation as the previous line." -msgstr "当按下 Return 键，下一行开始的位置，会自行缩排致跟上行一样。" - -#: tips:35 -msgid "You need the gtksourceview Python module to use these" -msgstr "您须安装 gtksourceview Python 模组才可启用这些功能" - -#: tips:36 -msgid "Show Print Margin" -msgstr "显示可列印边界" - -#: tips:37 -msgid "Draw a line to show the right margin for printing." -msgstr "在右边可列印边界上绘出一条直线" - -#: tips:38 -msgid "Print Margin" -msgstr "可列印边界" - -#: tips:39 tips:49 -msgid "characters" -msgstr "字符" - -#: tips:40 -msgid "Smart Home/End" -msgstr "优化 Home/End 按键 " - -#: tips:41 -msgid "Move to the first/last actual character on the line, ignoring spaces." -msgstr "移到每行的 最前/最后 的字符，并忽略空格。" - -#: tips:42 -msgid "Show Line Numbers" -msgstr "显示行号" - -#: tips:43 -msgid "Add a column on the far left showing line numbers." -msgstr "在最左边加上一列空间来放置行号。" - -#: tips:44 -msgid "Show Bookmarks" -msgstr "显示标记" - -#: tips:45 -msgid "Add a column in the left margin showing which lines are bookmarked." -msgstr "在最左边加上一列空间来显示被标记的行号。" - -#: tips:46 -msgid "Use spaces instead of Tabs" -msgstr "优化 Tab 键输出" - -#: tips:47 -msgid "" -"Pressing the Tab key inserts multiple spaces, instead of a single Tab " -"character." -msgstr "当按 Tab 键时可变为自动输出多个空格字符。" - -#: tips:48 -msgid "Tab width" -msgstr "Tab 宽度" - -#: tips:50 tips:51 tips:52 tips:53 -msgid "" -"Show one tab as this number of spaces or, when 'Use spaces instead of Tabs' " -"is on, insert this many spaces." -msgstr "设定在按 Tab 键时可输出的空格数目。" - -#: tips:54 -msgid "Changes" -msgstr "变更" - -#: tips:55 -msgid "Colours for Show Changes feature" -msgstr "用以显示变更的颜色" - -#: tips:56 tips:60 tips:64 tips:68 -msgid "Foreground" -msgstr "文字" - -#: tips:57 tips:61 tips:65 tips:69 -msgid "Background" -msgstr "背景" - -#: tips:58 tips:59 -msgid "(headers)" -msgstr "(标题)" - -#: tips:62 tips:63 -msgid "(no change)" -msgstr "(没有改变)" - -#: tips:66 tips:67 -msgid "(additions)" -msgstr "(附加)" - -#: tips:70 tips:71 tips:72 tips:73 tips:74 -msgid "(deletions)" -msgstr "(删除)" diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/zh_TW.gmo b/source/rox-extra/edit/edit-2.0/Edit/Messages/zh_TW.gmo deleted file mode 100644 index 22a7d5a..0000000 Binary files a/source/rox-extra/edit/edit-2.0/Edit/Messages/zh_TW.gmo and /dev/null differ diff --git a/source/rox-extra/edit/edit-2.0/Edit/Messages/zh_TW.po b/source/rox-extra/edit/edit-2.0/Edit/Messages/zh_TW.po deleted file mode 100644 index f8179a8..0000000 --- a/source/rox-extra/edit/edit-2.0/Edit/Messages/zh_TW.po +++ /dev/null @@ -1,601 +0,0 @@ -# Rox Edit Chinese Tranalation. -# Copyright (C) YEAR ORGANIZATION -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2005-07-10 21:57+HKT\n" -"PO-Revision-Date: 2005-07-10 18:55+1\n" -"Last-Translator: Babyfai Cheung \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: ENCODING\n" -"Generated-By: pygettext.py 1.4\n" - -#: EditWindow.py:81 -msgid "Cut" -msgstr "剪下" - -#: EditWindow.py:82 -msgid "Copy" -msgstr "複製" - -#: EditWindow.py:83 -msgid "Paste" -msgstr "貼上" - -#: EditWindow.py:85 EditWindow.py:259 -msgid "Undo" -msgstr "還原" - -#: EditWindow.py:86 EditWindow.py:258 -msgid "Redo" -msgstr "重做" - -#: EditWindow.py:88 -msgid "Search..." -msgstr "搜尋..." - -#: EditWindow.py:89 -msgid "Search and Replace...." -msgstr "搜尋及取代..." - -#: EditWindow.py:91 -msgid "Goto line..." -msgstr "跳至行數..." - -#: EditWindow.py:96 -msgid "Toggle Bookmark" -msgstr "標記此行" - -#: EditWindow.py:97 -msgid "Next Bookmark" -msgstr "下個標記" - -#: EditWindow.py:98 -msgid "Previous Bookmark" -msgstr "上個標記" - -#: EditWindow.py:105 -msgid "File" -msgstr "檔案" - -#: EditWindow.py:106 EditWindow.py:263 -msgid "Save" -msgstr "儲存" - -#: EditWindow.py:107 -msgid "Save As..." -msgstr "另存為..." - -#: EditWindow.py:108 -msgid "Open Parent" -msgstr "往上目錄" - -#: EditWindow.py:109 -msgid "Show Changes" -msgstr "顯示改變" - -#: EditWindow.py:110 EditWindow.py:255 tips:9 -msgid "Word Wrap" -msgstr "自動換行" - -#: EditWindow.py:111 EditWindow.py:265 -msgid "Close" -msgstr "關閉" - -#: EditWindow.py:113 -msgid "New" -msgstr "新增" - -#: EditWindow.py:115 -msgid "Edit" -msgstr "編輯" - -#: EditWindow.py:117 -msgid "Options" -msgstr "選項" - -#: EditWindow.py:118 EditWindow.py:238 -msgid "Help" -msgstr "說明" - -#: EditWindow.py:239 -msgid "" -"Show changes from saved copy.\n" -"Or, drop a backup file onto this button to see changes from that." -msgstr "" -"顯示已作及儲存的改變。\n" -"或將備份檔案，拖放到這按鈕上以檢視改變。" - -#: EditWindow.py:249 -msgid "Check Spelling" -msgstr "檢查字串拼寫" - -#: EditWindow.py:260 -msgid "Replace" -msgstr "取代" - -#: EditWindow.py:261 -msgid "Search" -msgstr "搜尋" - -#: EditWindow.py:262 -msgid "Save As" -msgstr "另存為" - -#: EditWindow.py:264 -msgid "Up" -msgstr "往上" - -#: EditWindow.py:323 -msgid "Line %s of %d" -msgstr "行 %s 總數 %d" - -#: EditWindow.py:330 -msgid "One character selected (%s)" -msgstr "選擇了一個字符 (%s)" - -#: EditWindow.py:333 -msgid "%d characters selected" -msgstr "%d 個字符已選擇" - -#: EditWindow.py:335 -msgid "%d lines selected" -msgstr "%d 行數已選擇" - -#: EditWindow.py:502 -msgid "Untitled" -msgstr "未命名" - -#: EditWindow.py:530 -msgid "Encoding:" -msgstr "編碼：" - -#: EditWindow.py:536 -msgid "Ignore errors" -msgstr "忽略錯誤" - -#: EditWindow.py:562 -msgid "Unknown encoding '%s'" -msgstr "不明編碼 '%s'" - -#: EditWindow.py:586 -msgid "" -"Data is not valid %s. Please select the file's encoding. Turn on 'ignore " -"errors' to try and load it anyway." -msgstr "資料不是 %s。請選擇正確的編碼，啟用 '忽略錯誤' 以嘗試打開。" - -#: EditWindow.py:627 -msgid "File is not saved to disk yet" -msgstr "檔案尚未儲存" - -#: EditWindow.py:648 -msgid "" -"This file has never been saved; nothing to compare it to!\n" -"Note: you can drop a file onto the toolbar button to see the changes from " -"that file." -msgstr "" -"這檔案還未儲存；因此沒法進行比較！\n" -"注意：您可拖放檔案到工具欄的按鈕上，來查看已更改的資料。" - -#: EditWindow.py:697 -msgid "TextFile" -msgstr "文字檔案" - -#: EditWindow.py:845 -msgid "Minibuffer help" -msgstr "小型幫助框" - -#: diff.py:78 -msgid "Changes to %s" -msgstr "%s 的改變" - -#: diff.py:128 -msgid "There is no difference between this version and the saved one." -msgstr "沒有不相同的地方。" - -#: goto.py:10 -msgid "Goto line:" -msgstr "跳至行數：" - -#: goto.py:12 -msgid "" -"Enter the line number to go to. Line numbers start from 1. Press Escape to " -"cancel, or Return to jump to the line." -msgstr "鍵入行數數字，行數起始為 1。按 Escape 以取消，或按 Enter 以跳至該行。" - -#: goto.py:22 -msgid "Invalid line number: %s" -msgstr "錯誤的行數：%s" - -#: search.py:6 -msgid "Matches any character" -msgstr "對應任何字符" - -#: search.py:7 -msgid "Any lowercase letter" -msgstr "任何小階字母" - -#: search.py:8 -msgid "Any character listed (- must be first)" -msgstr "任一列出字符 (- 必須前排)" - -#: search.py:9 -msgid "A only at the start of a line" -msgstr "A 在行的最前" - -#: search.py:10 -msgid "A only at the end of a line" -msgstr "A 在行的最後" - -#: search.py:11 -msgid "Zero or more A" -msgstr "零或更多 A" - -#: search.py:12 -msgid "One or more A" -msgstr "一或更多 A" - -#: search.py:13 -msgid "Zero or one A" -msgstr "零或一個 A" - -#: search.py:14 -msgid "Between m and n matches of A" -msgstr "對應 m 與 n 之間的 A" - -#: search.py:15 -msgid "Non-greedy versions of *, +, ? and {}" -msgstr "包含 *, +, ? 及 {} 的版本" - -#: search.py:16 -msgid "Literal \"*\", \"+\"" -msgstr "正常字符 \"*\", \"+\"" - -#: search.py:17 -msgid "Can match A or B" -msgstr "能對應 A 或 B" - -#: search.py:18 -msgid "Group A and B together (for *, \\1, etc)" -msgstr "A 和 B 一同匹配 (用於 *, \\1, 等等)" - -#: search.py:19 -msgid "The first/second bracketed match (goes in the With: box)" -msgstr "匹配括弧內第一/或第二個字符 (須用於: 盒型括弧內)" - -#: search.py:20 -msgid "Word boundary (eg, \\bWord\\b)" -msgstr "匹配含邊沿的整字 (eg, \\bWord\\b)" - -#: search.py:21 -msgid "Non-word boundary" -msgstr "匹配整字內不在邊沿的字符" - -#: search.py:22 -msgid "Digit, non-digit" -msgstr "數字，非數字" - -#: search.py:23 -msgid "Whitespace, non-whitespace" -msgstr "空白，非空白" - -#: search.py:24 -msgid "Others" -msgstr "其他" - -#: search.py:24 -msgid "See the Python regular expression documentation for more" -msgstr "詳情請參閱 Python 正則表達法文本" - -#: search.py:26 -msgid "Examples:" -msgstr "舉例：" - -#: search.py:27 -msgid "Matches \"Fred\" anywhere" -msgstr "任何對應 \"Fred\" " - -#: search.py:28 -msgid "A line containing only \"Fred\"" -msgstr "一行內只包含 \"Fred\"" - -#: search.py:29 -msgid "\"Gogle, Google, Gooogle, etc\"" -msgstr "\"Gogle, Google, Gooogle, 等等\"" - -#: search.py:30 -msgid "Colour or Color" -msgstr "Colour 或 Color" - -#: search.py:31 -msgid "\"The\" or \"the\"" -msgstr "\"The\" 或 \"the\"" - -#: search.py:35 -msgid "Python expressions:" -msgstr "Python 正則表達法：" - -#: search.py:36 -msgid "The text that was matched" -msgstr "匹配的文字" - -#: search.py:37 -msgid "The numerical value of 'old'" -msgstr "'old' 的數值" - -#: search.py:38 -msgid "Convert match to uppercase" -msgstr "將匹配的文字轉為大階字母" - -#: search.py:39 -msgid "Double all matched numbers" -msgstr "將匹配的數值加倍" - -#: search.py:56 -msgid "Find Next" -msgstr "找尋下一個" - -#: search.py:61 -msgid "Find Previous" -msgstr "找尋上一個" - -#: search.py:66 -msgid "Match case" -msgstr "匹配大小階" - -#: search.py:80 -msgid "" -"Type a string to search for. The display will scroll to show the next match " -"as you type. Use the Up and Down cursor keys to move to the next or previous " -"match. Press Escape or Return to finish." -msgstr "" -"鍵入要尋找的字串，匹配的將會以卷動型式顯示，用往上或往下的箭咀鍵來瀏覽結果，" -"按Escape 或 Return 結束。" - -#: search.py:85 -msgid " Find: " -msgstr " 找尋：" - -#: search.py:160 -msgid "Code" -msgstr "代碼" - -#: search.py:162 -msgid "Meaning" -msgstr "註釋" - -#: search.py:213 -msgid "Replace:" -msgstr "取代：" - -#: search.py:214 -msgid "With:" -msgstr "換為：" - -#: search.py:221 -msgid "Advanced search and replace" -msgstr "進階搜尋及取代" - -#: search.py:229 -msgid "Evaluate 'With' as Python expression" -msgstr "以 Python 正則表達法鑒定" - -#: search.py:252 -msgid "You need to specify something to search for..." -msgstr "請先指明需要搜尋的目標..." - -#: search.py:297 -msgid "Search string not found" -msgstr "找不到要搜尋的字串" - -#: search.py:301 -msgid "One line changed" -msgstr "一行已改變" - -#: search.py:303 -msgid "%d lines changed" -msgstr "%d 行數已改變" - -#: tips:1 -msgid "Display" -msgstr "顯示" - -#: tips:2 -msgid "Fonts" -msgstr "字型" - -#: tips:3 -msgid "Text font" -msgstr "內文字型" - -#: tips:4 tips:5 -msgid "Font used for normal text." -msgstr "一般內文的字型" - -#: tips:6 -msgid "Colours" -msgstr "顏色" - -#: tips:7 -msgid "Foreground colour" -msgstr "文字顏色" - -#: tips:8 -msgid "Background colour" -msgstr "背景顏色" - -#: tips:10 -msgid "Wrap long lines of text" -msgstr "對過長文字的行換行" - -#: tips:11 tips:12 -msgid "" -"Control whether lines wider than the window are wrapped to multiple display " -"lines." -msgstr "當內文的字行比窗口要長時，會換到下一行來顯示。" - -#: tips:13 -msgid "Toolbar" -msgstr "工具欄" - -#: tips:14 -msgid "Show toolbar" -msgstr "顯示工具欄" - -#: tips:15 tips:16 tips:17 -msgid "Display a toolbar along the top of each window with common tools." -msgstr "在頂端顯示工具欄。" - -#: tips:18 -msgid "Spacing" -msgstr "字距" - -#: tips:19 -msgid "Margins" -msgstr "邊界" - -#: tips:20 -msgid "pixels for left margin, and for the right:" -msgstr "像素 左面邊界；及右面邊界：" - -#: tips:21 tips:24 tips:26 tips:28 tips:30 -msgid "pixels" -msgstr "像素" - -#: tips:22 -msgid "Paragraphs" -msgstr "段落" - -#: tips:23 -msgid "Space above paragraphs" -msgstr "對比上段落間的距離" - -#: tips:25 -msgid "Space below paragraphs" -msgstr "對比下段落間的距離" - -#: tips:27 -msgid "Line spacing within paragraphs" -msgstr "段落間的行距" - -#: tips:29 -msgid "New-paragraph indent" -msgstr "換新段落時縮排" - -#: tips:31 -msgid "Editing" -msgstr "編輯" - -#: tips:32 -msgid "Indentation" -msgstr "縮排" - -#: tips:33 -msgid "Automatic indentation" -msgstr "自動縮排" - -#: tips:34 -msgid "" -"When you press Return, the next line starts with the same amount of " -"indentation as the previous line." -msgstr "當按下 Return 鍵，下一行開始的位置，會自行縮排致跟上行一樣。" - -#: tips:35 -msgid "You need the gtksourceview Python module to use these" -msgstr "您須安裝 gtksourceview Python 模組才可啟用這些功能 " - -#: tips:36 -msgid "Show Print Margin" -msgstr "顯示可列印邊界" - -#: tips