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

Ronald van Haren ronald at archlinux.org
Wed Sep 9 22:11:15 UTC 2009


    Date: Wednesday, September 9, 2009 @ 18:11:15
  Author: ronald
Revision: 51613

fix svnmerge error

Modified:
  netcdf/repos/extra-x86_64/	(properties)
  netcdf/repos/extra-x86_64/PKGBUILD
Deleted:
  netcdf/repos/extra-x86_64/string-include.patch

----------------------+
 PKGBUILD             |   26 ++++++++++++--------------
 string-include.patch |   21 ---------------------
 2 files changed, 12 insertions(+), 35 deletions(-)


Property changes on: netcdf/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /netcdf/trunk:1
   + /netcdf/trunk:1-51612

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-09-09 22:09:08 UTC (rev 51612)
+++ extra-x86_64/PKGBUILD	2009-09-09 22:11:15 UTC (rev 51613)
@@ -1,30 +1,28 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: damir <damir at archlinux.org>
 
 pkgname=netcdf
-pkgver=3.6.2
-pkgrel=2
+pkgver=3.6.3
+pkgrel=1
 pkgdesc="network Common Data Form interface for array-oriented data access and corresponding library"
 arch=("i686" "x86_64")
 url="http://my.unidata.ucar.edu/content/software/netcdf/index.html"
 depends=('gcc-libs>=4.3.0')
 options=('force' '!libtool' '!makeflags')
 license=('custom')
-source=(http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-${pkgver}.tar.gz
-	string-include.patch)
-md5sums=('a7d450da9081e4a6e440705ea31868d3'
-         'eafa1dd0b97a520227414e91c5fecc1b')
+source=(http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-${pkgver}.tar.gz)
+md5sums=('334e9bdc010b6cd03fd6531a45fe50ad')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np0 -i ${startdir}/src/string-include.patch || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --enable-shared
   make || return 1
   make check || return 1
-  install -m755 -d ${startdir}/pkg/usr/lib
-  install -m755 -d ${startdir}/pkg/usr/share/man
-  make DESTDIR=${startdir}/pkg install || return 1
+  install -m755 -d ${pkgdir}/usr/lib
+  install -m755 -d ${pkgdir}/usr/share/man
+  make DESTDIR=${pkgdir} install || return 1
 
-  install -m755 -d ${startdir}/pkg/usr/share/licenses/${pkgname}
-  install -m644 ${startdir}/src/${pkgname}-${pkgver}/COPYRIGHT ${startdir}/pkg/usr/share/licenses/${pkgname}/
+  install -Dm644 ${srcdir}/${pkgname}-${pkgver}/COPYRIGHT \
+	${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT
 }

Deleted: extra-x86_64/string-include.patch
===================================================================
--- extra-x86_64/string-include.patch	2009-09-09 22:09:08 UTC (rev 51612)
+++ extra-x86_64/string-include.patch	2009-09-09 22:11:15 UTC (rev 51613)
@@ -1,21 +0,0 @@
---- cxx/ncvalues.cpp.orig	2008-03-08 22:09:19.000000000 +0000
-+++ cxx/ncvalues.cpp	2008-03-08 22:08:30.000000000 +0000
-@@ -9,7 +9,7 @@
- 
- #include <config.h>
- #include <iostream>
--#include <string>
-+#include <string.h>
- 
- #include "ncvalues.h"
- 
---- examples/CXX/sfc_pres_temp_rd.cpp.orig	2008-03-08 22:12:05.000000000 +0000
-+++ examples/CXX/sfc_pres_temp_rd.cpp	2008-03-08 22:13:41.000000000 +0000
-@@ -18,6 +18,7 @@
- 
- #include <iostream>
- #include <netcdfcpp.h>
-+#include <string.h>
- 
- using namespace std;
- 




More information about the arch-commits mailing list