From de83d1a9287e1d73029b1202069e3cefae26bb31 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Thu, 21 Jun 2012 00:17:59 -0400
Subject: ~lukeshu/freeglut26: fix conflicting provides= lines

---
 ~lukeshu/freeglut26/PKGBUILD | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to '~lukeshu/freeglut26/PKGBUILD')

diff --git a/~lukeshu/freeglut26/PKGBUILD b/~lukeshu/freeglut26/PKGBUILD
index 5245eca9d..25569e60d 100644
--- a/~lukeshu/freeglut26/PKGBUILD
+++ b/~lukeshu/freeglut26/PKGBUILD
@@ -5,11 +5,7 @@
 _pkgname=freeglut
 pkgname=freeglut26
 pkgver=2.6.0
-pkgrel=1
-
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-
+pkgrel=2
 pkgdesc="Provides functionality for small OpenGL programs"
 arch=('i686' 'x86_64')
 url="http://freeglut.sourceforge.net/"
@@ -18,6 +14,7 @@ depends=('libxxf86vm' 'mesa' 'libxi')
 replaces=('glut')
 provides=('glut')
 conflicts=('glut')
+provides+=("$_pkgname=$pkgver")
 options=('!libtool')
 source=(http://downloads.sourceforge.net/freeglut/${_pkgname}-${pkgver}.tar.gz \
         2.6.0-GFX_radeon.patch)
@@ -32,7 +29,7 @@ build() {
 
   ./autogen.sh
   ./configure --prefix=/usr --disable-static
-  make all
+  make
 }
 
 package() {
-- 
cgit v1.2.3-54-g00ecf