From 351991ce3e10dfae9cf57e7cf79fcca9b01c585b Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Mon, 1 Mar 2010 20:37:34 +0100 Subject: update Signed-off-by: Florian Pritz --- cdrtools/PKGBUILD | 10 +++++----- firefox-nightly/ChangeLog | 3 +++ firefox-nightly/PKGBUILD | 5 +++-- gimp-git/PKGBUILD | 2 +- gspoof/PKGBUILD | 4 +--- gvim/PKGBUILD | 17 ++++++++++------- gvim/fetch_patches.sh | 23 ++++++++++++++--------- libjpeg6/PKGBUILD | 13 +++++++++---- mplayer-vdpau-nogui/PKGBUILD | 2 +- mtr-cli/PKGBUILD | 5 +++-- mumble-git/PKGBUILD | 2 +- smplayer-svn/PKGBUILD | 2 +- vim-nerdtree/PKGBUILD | 8 ++++---- vim/PKGBUILD | 27 ++++++++++++++------------- vim/vimrc | 6 +++--- wireshark/PKGBUILD | 29 ----------------------------- wireshark/wireshark.desktop | 10 ---------- wireshark/wireshark.png | Bin 18535 -> 0 bytes 18 files changed, 73 insertions(+), 95 deletions(-) delete mode 100644 wireshark/PKGBUILD delete mode 100644 wireshark/wireshark.desktop delete mode 100644 wireshark/wireshark.png diff --git a/cdrtools/PKGBUILD b/cdrtools/PKGBUILD index 5196fd1..19fc892 100644 --- a/cdrtools/PKGBUILD +++ b/cdrtools/PKGBUILD @@ -1,7 +1,7 @@ -# Former contributor: Tuxbubling , alejandronova -# Contributor: Lukas Jirkovsky +# Maintainer: Lukas Jirkovsky +# Contributor: Tuxbubling , alejandronova pkgname=cdrtools -pkgver=2.01.01a66 +pkgver=2.01.01a76 pkgrel=1 pkgdesc="Original cdrtools, supporting CD, DVD and BluRay burning" arch=('i686' 'x86_64') @@ -12,8 +12,8 @@ conflicts=('cdrkit') provides=('cdrkit') backup=('etc/default/cdrecord' 'etc/default/rscsi') install=cdrtools.install -source=(ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.gz) -md5sums=('b9d40bddf1ce75989d0a36b939f0c3fb') +source=(http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.gz) +md5sums=('1cc6e28c7eeee39d21dec5dfc5b851ef') build() { cd "$srcdir"/cdrtools-${pkgver%%a*} diff --git a/firefox-nightly/ChangeLog b/firefox-nightly/ChangeLog index 606e7d9..74ab85e 100644 --- a/firefox-nightly/ChangeLog +++ b/firefox-nightly/ChangeLog @@ -1,3 +1,6 @@ +firefox-nightly 3.7a2pre-1 + + New version + firefox-nightly 3.7a1pre-2 + Fixed wrong url, thanks to kumyco diff --git a/firefox-nightly/PKGBUILD b/firefox-nightly/PKGBUILD index a74ab05..009bc84 100644 --- a/firefox-nightly/PKGBUILD +++ b/firefox-nightly/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: coderoar +# Maintainer: Cedric MATHIEU +# Contributor: coderoar arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') @@ -6,7 +7,7 @@ license=('MPL' 'GPL' 'LGPL') pkgname=firefox-nightly pkgdesc='Standalone web browser from mozilla.org, nightly build.' url='http://www.mozilla.org/projects/firefox' -pkgver=3.7a1pre +pkgver=3.7a2pre pkgrel=$(date +%Y_%m_%d_%T) source=( 'firefox-nightly.desktop' 'firefox-nightly-safe.desktop' ) diff --git a/gimp-git/PKGBUILD b/gimp-git/PKGBUILD index f248c6e..58223f8 100644 --- a/gimp-git/PKGBUILD +++ b/gimp-git/PKGBUILD @@ -1,7 +1,7 @@ # Contributor: Alessio Biancalana pkgname=gimp-git -pkgver=20100109 +pkgver=20100131 pkgrel=1 pkgdesc="GNU Image Manipulation Program (GIT Version)" arch=('i686' 'x86_64') diff --git a/gspoof/PKGBUILD b/gspoof/PKGBUILD index fe656d8..856f8c2 100755 --- a/gspoof/PKGBUILD +++ b/gspoof/PKGBUILD @@ -1,5 +1,4 @@ # Contributor: Florian Pritz - pkgname=gspoof pkgver=3.2 pkgrel=1 @@ -10,6 +9,7 @@ license=('GPL') depends=('libnet>=1.1.1' 'gtk') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) noextract=() +md5sums=('7a1d124a1d0bed87e19b239d559ba880') build() { cd "$srcdir/$pkgname-$pkgver" @@ -21,5 +21,3 @@ build() { cp -r pixmap $pkgdir/usr/share/$pkgname/pixmap/ } -md5sums=('7a1d124a1d0bed87e19b239d559ba880') -sha256sums=('65f12bf8ca23d3fa6af0cedda4fb6c28c955a909e1787bd5dda14404a0280019') diff --git a/gvim/PKGBUILD b/gvim/PKGBUILD index 6d48d95..47e42f5 100644 --- a/gvim/PKGBUILD +++ b/gvim/PKGBUILD @@ -1,22 +1,25 @@ -# $Id$ +# $Id: PKGBUILD 53532 2009-10-02 06:43:56Z francois $ # Maintainer: tobias [ tobias at archlinux org ] pkgname=gvim _srcver=7.2 -_patchlevel=218 +_patchlevel=359 pkgver=${_srcver}.${_patchlevel} -pkgrel=1 +pkgrel=2 pkgdesc="the vim text editor with advanced features enabled, such as a gui mode" arch=(i686 x86_64) license=('custom:vim') url="http://www.vim.org" -depends=("vim=${pkgver}" 'perl' 'python' 'libxt' 'desktop-file-utils' 'gtk2') -makedepends=('pkgconfig' 'sed') +depends=("vim>=${pkgver}" 'python' 'libxt' 'desktop-file-utils' 'gtk2') +makedepends=('pkgconfig' 'sed' 'perl') install=${pkgname}.install source=(ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2 \ ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-extra.tar.gz \ ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-lang.tar.gz \ ${pkgname}.desktop fetch_patches.sh) +md5sums=('f0901284b338e448bfd79ccca0041254' '35e04482f07c57221c9a751aaa3b8dac' \ + 'd8884786979e0e520c112faf2e176f05' '2be104c0372dd6dae19cb7968c03cd4f' \ + 'df640c8196c480795fdda24c817e0f11') build() { @@ -31,8 +34,8 @@ build() ./configure --prefix=/usr --localstatedir=/var/lib/vim --mandir=/usr/share/man \ --with-compiledby=ArchLinux --with-features=big \ --with-x=yes --disable-gpm --enable-gui=gtk2 \ - --enable-multibyte --enable-cscope \ - --enable-perlinterp --enable-pythoninterp + --enable-multibyte --enable-cscope --enable-netbeans \ + --enable-perlinterp --enable-pythoninterp --disable-rubyinterp make || return 1 # install everything first ... make VIMRCLOC=/etc DESTDIR=${pkgdir} install diff --git a/gvim/fetch_patches.sh b/gvim/fetch_patches.sh index 41b8564..56ba47b 100644 --- a/gvim/fetch_patches.sh +++ b/gvim/fetch_patches.sh @@ -1,8 +1,8 @@ # the external logic for pulling in patches get_patches() { - _patchdir=${startdir}/src/patches - cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//") + _patchdir=${srcdir}/patches + cd ${srcdir}/vim$(echo ${_srcver} | sed "s/\.//") if [ -d ${_patchdir} ]; then rm -rf ${_patchdir} echo -e "\tremove patches from old build" @@ -19,9 +19,10 @@ get_patches() { downloads=0 for _line in $(/bin/cat MD5SUMS); do + _file=$(echo $_line | cut -d ' ' -f3) + [ ${_file##*.} == "gz" ] && continue downloads=$((${downloads} + 1)) _md5=$(echo $_line | cut -d ' ' -f1) - _file=$(echo $_line | cut -d ' ' -f3) if [ -f ${SRCDEST}/vim-${_srcver}/${_file} ]; then echo -e "\thaving patch file:${_file}" cp ${SRCDEST}/vim-${_srcver}/${_file} ./ @@ -44,17 +45,21 @@ get_patches() { done ######## - - rm *.gz - + if [ ${downloads} != ${_patchlevel} ]; then - echo -e "Number of patches does not match the patchlevel!\nEdit the PKGBUILD accordingly!" - # return 1 + echo "" + echo -e "\t\tWARNING!" + echo "You are not building the latest available version! A newer patchlevel" + echo "seems to be available. Please edit the PKGBUILD and add the latest" + echo "${downloads} as pkgrel number!" + echo "" + sleep 10 fi IFS=$_OLDIFS rm MD5SUMS cd ${startdir}/src/vim$(echo ${_srcver} | sed "s/\.//") - for _patch in $(/bin/ls ${_patchdir}); do + for _patchnum in $(/usr/bin/seq 1 ${_patchlevel}); do + _patch=${_srcver}.$(printf "%03d" ${_patchnum}) patch -Np0 -i ${_patchdir}/${_patch} || return 1 done rm -rf ${_patchdir} diff --git a/libjpeg6/PKGBUILD b/libjpeg6/PKGBUILD index 50f5701..6a24d66 100644 --- a/libjpeg6/PKGBUILD +++ b/libjpeg6/PKGBUILD @@ -5,7 +5,7 @@ pkgname=libjpeg6 pkgver=6b -pkgrel=7 +pkgrel=9 pkgdesc="Library of JPEG support functions" arch=('i686' 'x86_64') url="http://www.ijg.org/" @@ -13,15 +13,18 @@ license=('custom') depends=('glibc') makedepends=('libtool') options=(!libtool) -source=(ftp://ftp.debian.org/debian/pool/main/libj/libjpeg6b/libjpeg6b_6b.orig.tar.gz) -md5sums=('dbd5f3b47ed13132f04c685d608a7547') +source=("ftp://ftp.debian.org/debian/pool/main/libj/libjpeg6b/libjpeg6b_6b.orig.tar.gz" + "locale-fixes.patch") +md5sums=('dbd5f3b47ed13132f04c685d608a7547' + 'a0910de4ba7bb7526032d86bb0297de4') build() { cd $srcdir/jpeg-$pkgver cp /usr/share/libtool/config/config.{guess,sub} . sed -i "s#./libtool#libtool#" configure + patch -p1 -i "$srcdir/locale-fixes.patch" ./configure --prefix=/usr --enable-shared --enable-static - make || return 1 + make LIBTOOL="libtool --tag=CC" || return 1 mkdir -p $pkgdir/usr/{bin,lib,include,share/man/man1} make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man/man1 install install -m644 jpegint.h $pkgdir/usr/include @@ -36,3 +39,5 @@ build() { mkdir -p $pkgdir/usr/include/libjpeg6 mv $pkgdir/usr/include/*.h $pkgdir/usr/include/libjpeg6 } + +# vim:set ts=2 sw=2 et: diff --git a/mplayer-vdpau-nogui/PKGBUILD b/mplayer-vdpau-nogui/PKGBUILD index 78587d0..37c3c83 100644 --- a/mplayer-vdpau-nogui/PKGBUILD +++ b/mplayer-vdpau-nogui/PKGBUILD @@ -1,7 +1,7 @@ #Contributor: Reiser pkgname=mplayer-vdpau-nogui -pkgver=30337 +pkgver=30385 pkgrel=1 pkgdesc="Famous multimedia player, dev. version, without its GUI and support for nvidia VDPAU" arch=('i686' 'x86_64') diff --git a/mtr-cli/PKGBUILD b/mtr-cli/PKGBUILD index bde81eb..9db3001 100644 --- a/mtr-cli/PKGBUILD +++ b/mtr-cli/PKGBUILD @@ -3,18 +3,19 @@ pkgname=mtr-cli pkgver=0.75 -pkgrel=4 +pkgrel=5 pkgdesc="Combines the functionality of traceroute and ping into one tool" arch=('i686' 'x86_64') license=('GPL') depends=('ncurses>=5.7') +conflicts=('mtr') source=(ftp://ftp.bitwizard.nl/mtr/mtr-${pkgver}.tar.gz) url="http://www.bitwizard.nl/mtr/" md5sums=('23baca52d0922c2ecba7eba05317868c') build() { cd "${srcdir}/mtr-${pkgver}" - ./configure --prefix=/usr --disable-gtk2 || return 1 + ./configure --prefix=/usr --disable-gtktest --without-gtk || return 1 make || return 1 make DESTDIR="${pkgdir}" install || return 1 } diff --git a/mumble-git/PKGBUILD b/mumble-git/PKGBUILD index 4ecb52e..134bfc3 100644 --- a/mumble-git/PKGBUILD +++ b/mumble-git/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: schlaefer pkgname=mumble-git -pkgver=20091223 +pkgver=20100225 pkgrel=1 pkgdesc="A voice chat application similar to TeamSpeak" arch=('i686' 'x86_64') diff --git a/smplayer-svn/PKGBUILD b/smplayer-svn/PKGBUILD index a67f38f..9a7eed3 100644 --- a/smplayer-svn/PKGBUILD +++ b/smplayer-svn/PKGBUILD @@ -3,7 +3,7 @@ # Fixes by: WAntilles pkgname=smplayer-svn -pkgver=3238 +pkgver=3412 pkgrel=1 _latestver=0.6.8 pkgdesc="A complete front-end for MPlayer" diff --git a/vim-nerdtree/PKGBUILD b/vim-nerdtree/PKGBUILD index a321e33..80bb044 100644 --- a/vim-nerdtree/PKGBUILD +++ b/vim-nerdtree/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Laszlo Papp pkgname=vim-nerdtree -pkgver=4.0.0 -_scriptid=11500 -pkgrel=3 +pkgver=4.1.0 +_scriptid=11834 +pkgrel=4 pkgdesc="A tree explorer plugin for navigating the filesystem" arch=('i686' 'x86_64') url="http://www.vim.org/scripts/script.php?script_id=1658" @@ -12,7 +12,7 @@ groups=('vim-plugins') install=vimdoc.install source=(${pkgname}.zip::http://www.vim.org/scripts/download_script.php?src_id=${_scriptid} license.txt) -md5sums=('a359ce8f9bf5ccf238a53df5dd94725a' +md5sums=('a15fa66b36c3261e598d93dc830398f6' 'efbd5986e691ce8c876fb86e8f5961ea') build() { diff --git a/vim/PKGBUILD b/vim/PKGBUILD index d879d73..746c917 100644 --- a/vim/PKGBUILD +++ b/vim/PKGBUILD @@ -1,18 +1,17 @@ -# $Id$ +# $Id: PKGBUILD 68412 2010-02-12 20:04:30Z dgriffiths $ # Maintainer: tobias [ tobias at archlinux org ] pkgname=vim _srcver=7.2 -_patchlevel=267 +_patchlevel=359 pkgver=${_srcver}.${_patchlevel} pkgrel=1 pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' arch=(i686 x86_64) license=('custom:vim') url="http://www.vim.org" -depends=('gpm' 'coreutils' 'python') -makedepends=('wget' 'sed' 'grep' 'gettext' 'perl') -optdepends=('perl: the runtime provides a few useful perl scripts') +depends=('gpm' 'coreutils' 'perl') +makedepends=('wget' 'sed' 'grep' 'gettext') backup=(etc/vimrc) install=${pkgname}.install # we need the extra-stuff to get all patches applied smoothly @@ -20,6 +19,10 @@ source=(ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2 \ ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-extra.tar.gz \ ftp://ftp.vim.org/pub/vim/extra/vim-${_srcver}-lang.tar.gz \ fetch_patches.sh fetch_runtime.sh vimrc archlinux.vim) +md5sums=('f0901284b338e448bfd79ccca0041254' '35e04482f07c57221c9a751aaa3b8dac' \ + 'd8884786979e0e520c112faf2e176f05' '6d7e8d7868e8bfaa9a5880cd9c439320' \ + '45c1c3c6aff7de0d8fc2a9d8cd5cec7d' '3f42c68545b5b1afb2e9a5b2731ef063' \ + '10353a61aadc3f276692d0e17db1478e') build() { @@ -28,6 +31,7 @@ build() . ${srcdir}/fetch_patches.sh . ${srcdir}/fetch_runtime.sh get_patches || return 1 + cd ${srcdir}/${_versiondir} sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' src/feature.h sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' src/feature.h @@ -36,7 +40,7 @@ build() --with-compiledby=ArchLinux --with-features=big \ --enable-gpm --enable-acl --with-x=no --disable-gui \ --enable-multibyte --enable-cscope \ - --enable-perlinterp --enable-pythoninterp + --enable-perlinterp #--with-global-runtime=/usr/share/vim --with-vim-name=vim \ make || return 1 make VIMRCLOC=/etc DESTDIR=${pkgdir} install @@ -57,6 +61,10 @@ build() rm -f evim.1 # this does not make sense in the console version done + # fix FS#17216 + sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \ + ${pkgdir}/usr/share/vim/vim72/filetype.vim + _runtimedir="${pkgdir}/usr/share/vim/${_versiondir}/" update_runtime cd ${srcdir}/${_versiondir} @@ -67,10 +75,3 @@ build() cd ${pkgdir}/usr/share/licenses/vim ln -s ../../vim/${_versiondir}/doc/uganda.txt license.txt } -md5sums=('f0901284b338e448bfd79ccca0041254' - '35e04482f07c57221c9a751aaa3b8dac' - 'd8884786979e0e520c112faf2e176f05' - '6d7e8d7868e8bfaa9a5880cd9c439320' - '45c1c3c6aff7de0d8fc2a9d8cd5cec7d' - '98a6065e21cba417870a66b78e9f0210' - '10353a61aadc3f276692d0e17db1478e') diff --git a/vim/vimrc b/vim/vimrc index 627d028..f292bd5 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -10,7 +10,7 @@ " properly set to work with the Vim-related packages available in Debian. runtime! archlinux.vim - -" For more option refer to /usr/share/vim/vim72/vimrc_example.vim or the vim -" manual +" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' +" Or better yet, read /usr/share/vim/vim72/vimrc_example.vim or the vim manual +" and configure vim to your own liking! diff --git a/wireshark/PKGBUILD b/wireshark/PKGBUILD deleted file mode 100644 index 56ac8b7..0000000 --- a/wireshark/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id$ -# Maintainer: Hugo Doria - -pkgname=wireshark -pkgver=1.2.1 -pkgrel=1 -pkgdesc="A free network protocol analyzer for Unix/Linux and Windows" -arch=('i686' 'x86_64') -license=('GPL2') -depends=('gtk2>=2.14.5' 'heimdal>=1.2.1' 'libpcap>=1.0.0' 'bash' 'gnutls>=2.4.1' 'libcap>=2.16') -makedepends=('bison' 'flex') -url="http://www.wireshark.org/" -replaces=('ethereal') -options=(!libtool) -source=(http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.gz wireshark.desktop wireshark.png) -md5sums=('56d760eeec0001b9a0b816ace3e99e44' - '504ede44c02b2a52f6cbd3bffdf93b8d' - 'e771800a8c977fe223583a453bc27397') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - export CFLAGS="-fno-unit-at-a-time ${CFLAGS}" - ./configure --prefix=/usr --with-ssl || return 1 - make all || return 1 - make DESTDIR=${pkgdir} install || return 1 - - install -Dm644 ${srcdir}/wireshark.png ${pkgdir}/usr/share/icons/wireshark.png - install -Dm644 ${srcdir}/wireshark.desktop ${pkgdir}/usr/share/applications/wireshark.desktop -} diff --git a/wireshark/wireshark.desktop b/wireshark/wireshark.desktop deleted file mode 100644 index f4317f6..0000000 --- a/wireshark/wireshark.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -GenericName=Wireshark -Comment=Network protocol analyzer -Name=wireshark -Exec=wireshark -Icon=/usr/share/icons/wireshark.png -Type=Application -Terminal=false -Categories=Application;Network; diff --git a/wireshark/wireshark.png b/wireshark/wireshark.png deleted file mode 100644 index 4e40263..0000000 Binary files a/wireshark/wireshark.png and /dev/null differ -- cgit v1.2.3-24-g4f1b