[arch-commits] Commit in commoncpp2/trunk (PKGBUILD commoncpp2-1.7.3-gcc44.patch)

[Andrea Scarpino]

    Date: Sunday, April 18, 2010 @ 21:46:54
  Author: andrea
Revision: 77897

upgpkg: commoncpp2 1.8.0-1
upstream release

Modified:
  commoncpp2/trunk/PKGBUILD
Deleted:
  commoncpp2/trunk/commoncpp2-1.7.3-gcc44.patch

------------------------------+
 PKGBUILD                     |   20 +++++++++++---------
 commoncpp2-1.7.3-gcc44.patch |   21 ---------------------
 2 files changed, 11 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-18 21:49:46 UTC (rev 77896)
+++ PKGBUILD	2010-04-19 01:46:54 UTC (rev 77897)
@@ -1,27 +1,29 @@
 # $Id$
-# Maintainer: Jeff Mickey <jeff at archlinux.org>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Jeff Mickey <jeff at archlinux.org>
 # Contributor: John Proctor <jproctor at prium.net>
 
 pkgname=commoncpp2
-pkgver=1.7.3
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="GNU Common C++ 2"
 arch=('i686' 'x86_64')
 url='http://www.gnu.org/software/commoncpp/'
 license=('GPL' 'custom')
-depends=('gcc-libs' 'zlib' 'bash')
+depends=('gcc-libs' 'zlib' 'sh')
 options=('!libtool' '!makeflags')
-source=(http://ftp.gnu.org/pub/gnu/commoncpp/${pkgname}-${pkgver}.tar.gz
-        commoncpp2-1.7.3-gcc44.patch)
-md5sums=('ca741179a728d264eb276ae471ebaf70'
-         '120dc19fa21b78a18caf2e1db8a66a97')
+source=("http://ftp.gnu.org/pub/gnu/commoncpp/${pkgname}-${pkgver}.tar.gz")
+md5sums=('502c34af4661ea77849ee1edc4a23042')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/commoncpp2-1.7.3-gcc44.patch || return 1
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=${pkgdir} install
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install || return 1
   
   gzip -9 ${pkgdir}/usr/share/info/commoncpp2.info
   rm ${pkgdir}/usr/share/info/dir

Deleted: commoncpp2-1.7.3-gcc44.patch
===================================================================
--- commoncpp2-1.7.3-gcc44.patch	2010-04-18 21:49:46 UTC (rev 77896)
+++ commoncpp2-1.7.3-gcc44.patch	2010-04-19 01:46:54 UTC (rev 77897)
@@ -1,21 +0,0 @@
-diff -up commoncpp2-1.7.3/src/cidr.cpp.orig commoncpp2-1.7.3/src/cidr.cpp
---- commoncpp2-1.7.3/src/cidr.cpp.orig	2009-04-06 21:24:07.857718325 +0200
-+++ commoncpp2-1.7.3/src/cidr.cpp	2009-04-06 21:50:26.874088776 +0200
-@@ -202,7 +202,7 @@ void IPV4Cidr::set(const char *cp)
- #if defined(_MSC_VER) && _MSC_VER >= 1500
- 	ep = (char *)strchr(cp, '/');
- #else
-- 	ep = strchr(cp, '/');
-+ 	ep = (char *)strchr(cp, '/');
- #endif
- 
- 	if(ep)
-@@ -332,7 +332,7 @@ void IPV6Cidr::set(const char *cp)
- 	memset(&netmask, 0, sizeof(netmask));
- 	bitset((bit_t *)&netmask, getMask(cp));
- 	setString(cbuf, sizeof(cbuf), cp);
--	ep = strchr(cp, '/');
-+	ep = (char *)strchr(cp, '/');
- 	if(ep)
- 		*ep = 0;
-