[arch-commits] Commit in speedtouch/repos (3 files)

[Eric Bélanger]

    Date: Saturday, April 18, 2009 @ 02:39:39
  Author: eric
Revision: 35909

Merged revisions 356,35900 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/speedtouch/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r35900 | eric | 2009-04-18 02:01:39 -0400 (Sat, 18 Apr 2009) | 2 lines
  
  upgpkg: speedtouch 1.3.1-2
      Added license, Added arch array, FHS man pages, Added gcc 4.3 build patch
........

Added:
  speedtouch/repos/extra-i686/speedtouch-1.3.1-gcc4.patch
    (from rev 35900, speedtouch/trunk/speedtouch-1.3.1-gcc4.patch)
Modified:
  speedtouch/repos/extra-i686/	(properties)
  speedtouch/repos/extra-i686/PKGBUILD

-----------------------------+
 PKGBUILD                    |   17 ++++++++++-------
 speedtouch-1.3.1-gcc4.patch |   11 +++++++++++
 2 files changed, 21 insertions(+), 7 deletions(-)


Property changes on: speedtouch/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /speedtouch/trunk:1
   + /speedtouch/trunk:1-35908

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-18 06:36:21 UTC (rev 35908)
+++ extra-i686/PKGBUILD	2009-04-18 06:39:39 UTC (rev 35909)
@@ -3,16 +3,19 @@
 # Contributor: Aurelien Foret <orelien at chez.com>
 pkgname=speedtouch
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Driver for the ADSL Speed Touch USB modem"
+arch=('i686' 'x86_64')
+url="http://speedtouch.sourceforge.net/"
+license=('GPL')
 depends=('bash')
-source=(http://dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
-url="http://speedtouch.sourceforge.net/"
-md5sums=('0848a120ae0eeab6c8ab378e11dc4fa2')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 speedtouch-1.3.1-gcc4.patch)
+md5sums=('0848a120ae0eeab6c8ab378e11dc4fa2' '4191035925db745944c75e26937c42a3')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc
+  cd $srcdir/$pkgname-$pkgver
+  patch -p1 < ../speedtouch-1.3.1-gcc4.patch || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man || return 1
   make || return 1
-  make prefix=$startdir/pkg/usr sysconfdir=$startdir/pkg/etc install || return 1
+  make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc mandir=$pkgdir/usr/share/man install || return 1
 }

Copied: speedtouch/repos/extra-i686/speedtouch-1.3.1-gcc4.patch (from rev 35900, speedtouch/trunk/speedtouch-1.3.1-gcc4.patch)
===================================================================
--- extra-i686/speedtouch-1.3.1-gcc4.patch	                        (rev 0)
+++ extra-i686/speedtouch-1.3.1-gcc4.patch	2009-04-18 06:39:39 UTC (rev 35909)
@@ -0,0 +1,11 @@
+--- speedtouch-1.3.1/src/modem.h        2004-09-29 21:56:31.000000000 +0100
++++ speedtouch-1.3.1-gcc4/src/modem.h   2005-07-21 07:15:03.000000000 +0100
+@@ -38,7 +38,4 @@
+ #define EP_CODE_IN  0x85
+ #define EP_CODE_OUT 0x05
+
+-/* Global Variables */
+-extern int verbose;
+-
+ #endif
+ 
\ No newline at end of file