[arch-commits] Commit in freeglut/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Jan de Groot]

    Date: Sunday, August 16, 2009 @ 16:00:39
  Author: jgc
Revision: 49889

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

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r49888 | jgc | 2009-08-16 21:59:59 +0200 (Sun, 16 Aug 2009) | 2 lines
  
  upgpkg: freeglut 2.4.0-4
      Rebuild to get rid of .FILELIST
........

Modified:
  freeglut/repos/extra-x86_64/	(properties)
  freeglut/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-08-16 19:59:59 UTC (rev 49888)
+++ extra-x86_64/PKGBUILD	2009-08-16 20:00:39 UTC (rev 49889)
@@ -4,7 +4,7 @@
 
 pkgname=freeglut
 pkgver=2.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Provides functionality for small OpenGL programs"
 arch=('i686' 'x86_64')
 url="http://freeglut.sourceforge.net/"
@@ -15,16 +15,19 @@
 conflicts=('glut')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz \
-	glut-cursor-inherit.patch)
-md5sums=('6d16873bd876fbf4980a927cfbc496a1' 'd6ba7e22ebb0fd7904b8e18c97475ba6')
-sha1sums=('91a528aa72758b7288a0d69a964b1b7e3f322a12' '9353d7b811fdfd6f0c5766f0e93924ca63e9d6a9')
+        glut-cursor-inherit.patch)
+md5sums=('6d16873bd876fbf4980a927cfbc496a1'
+         'd6ba7e22ebb0fd7904b8e18c97475ba6')
+sha1sums=('91a528aa72758b7288a0d69a964b1b7e3f322a12'
+          '9353d7b811fdfd6f0c5766f0e93924ca63e9d6a9')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/src/glut-cursor-inherit.patch || return 1
-  sed -i 's/-Werror//' configure
-  ./configure --prefix=/usr 
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/glut-cursor-inherit.patch" || return 1
+  sed -i 's/-Werror//' configure || return 1
+  ./configure --prefix=/usr || return 1
   make all || return 1
-  make DESTDIR=${startdir}/pkg install
-  install -D -m644 COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING
+  make DESTDIR="${pkgdir}" install || return 1
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }