Date: Saturday, October 31, 2009 @ 15:02:18 Author: andrea Revision: 57506
upgpkg: wvdial 1.61-1 upstream release; fixed man pages path Modified: wvdial/trunk/PKGBUILD Deleted: wvdial/trunk/wvdial-1.60-build.patch -------------------------+ PKGBUILD | 30 ++++++++++++--------------- wvdial-1.60-build.patch | 50 ---------------------------------------------- 2 files changed, 14 insertions(+), 66 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2009-10-31 19:01:57 UTC (rev 57505) +++ PKGBUILD 2009-10-31 19:02:18 UTC (rev 57506) @@ -1,26 +1,24 @@ # $Id$ -# Maintainer: dorphell <dorph...@archlinux.org> -# Committer: Judd Vinet <jvi...@zeroflux.org> +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: dorphell <dorph...@archlinux.org> +# Contrubutor: Judd Vinet <jvi...@zeroflux.org> pkgname=wvdial -pkgver=1.60 -pkgrel=3 +pkgver=1.61 +pkgrel=1 pkgdesc="A dialer program to connect to the Internet" +url="http://alumnit.ca/wiki/index.php?page=WvDial" arch=('i686' 'x86_64') license=('custom') -depends=('wvstreams>=4.4.1-2' 'ppp' 'xplc') -source=(http://alumnit.ca/download/${pkgname}-${pkgver}.tar.gz - wvdial-1.60-build.patch) -url="http://alumnit.ca/wiki/index.php?page=WvDial" -md5sums=('27fbbde89f8fd9f6e735a8efa5217fc9' - '1ff24bcd8fa83fa7f8dddc8ce6734b07') +depends=('wvstreams>=4.6.1' 'ppp') +source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +md5sums=('acd3b2050c9b65fff2aecda6576ee7bc') build() { + unset LDFLAGS cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/wvdial-1.60-build.patch || return 1 - sed "s|prefix=.*|prefix=$startdir/pkg/usr|" -i Makefile || return 1 - sed "s|PPPDIR=.*|PPPDIR=$startdir/pkg/etc/ppp/peers|" -i Makefile || return 1 - make PREFIX=${pkgdir}/usr || return 1 - make PREFIX=${pkgdir}/usr PPPDIR=${pkgdir}/etc/ppp/peers install - install -Dm644 COPYING.LIB ${pkgdir}/usr/share/licenses/${pkgname}/COPYING.LIB + ./configure --prefix=usr/ + make || return 1 + make prefix=${pkgdir} PPPDIR=${pkgdir}/etc/ppp/peers MANDIR=${pkgdir}/usr/share/man install || return 1 + install -Dm644 COPYING.LIB ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } Deleted: wvdial-1.60-build.patch =================================================================== --- wvdial-1.60-build.patch 2009-10-31 19:01:57 UTC (rev 57505) +++ wvdial-1.60-build.patch 2009-10-31 19:02:18 UTC (rev 57506) @@ -1,50 +0,0 @@ -diff -urNp wvdial-1.60-orig/wvdialer.cc wvdial-1.60/wvdialer.cc ---- wvdial-1.60-orig/wvdialer.cc 2009-06-11 12:37:13.000000000 +0200 -+++ wvdial-1.60/wvdialer.cc 2009-06-11 13:06:06.000000000 +0200 -@@ -680,7 +680,7 @@ void WvDialer::load_options() - { NULL, NULL, NULL, "", 0 } - }; - -- char * d = "Dialer Defaults"; -+ const char * d = "Dialer Defaults"; - - for( int i=0; opts[i].name != NULL; i++ ) - { -Binární soubory wvdial-1.60-orig/.wvdialer.cc.swp a wvdial-1.60/.wvdialer.cc.swp jsou různé -diff -urNp wvdial-1.60-orig/wvdialer.h wvdial-1.60/wvdialer.h ---- wvdial-1.60-orig/wvdialer.h 2009-06-11 12:37:13.000000000 +0200 -+++ wvdial-1.60/wvdialer.h 2009-06-11 12:39:30.000000000 +0200 -@@ -30,10 +30,10 @@ extern const char wvdial_version_text[]; - struct OptInfo - /************/ - { -- char * name; -+ const char * name; - WvString * str_member; - int * int_member; -- char * str_default; -+ const char * str_default; - int int_default; - }; - -diff -urNp wvdial-1.60-orig/wvmodemscan.cc wvdial-1.60/wvmodemscan.cc ---- wvdial-1.60-orig/wvmodemscan.cc 2007-07-19 23:22:26.000000000 +0200 -+++ wvdial-1.60/wvmodemscan.cc 2009-06-11 13:16:02.000000000 +0200 -@@ -20,7 +20,7 @@ bool default_asyncmap = false; - - // startup at atz atq0 atv1 ate1 ats0 carrier dtr fastdial - // baudstep reinit done --static char *commands[WvModemScan::NUM_STAGES] = { -+static const char *commands[WvModemScan::NUM_STAGES] = { - NULL, "Q0 V1 E1", "Z", "S0=0", - "&C1", "&D2", "+FCLASS=0", NULL, - NULL, "", NULL -@@ -496,7 +496,7 @@ static int fileselect(const struct diren - } - - --static int filesort(const void *_e1, const void *_e2) -+static int filesort(const struct dirent **_e1, const struct dirent **_e2) - { - dirent const * const *e1 = (dirent const * const *)_e1; - dirent const * const *e2 = (dirent const * const *)_e2;