[pkgsrc/trunk]: pkgsrc/graphics/freeglut Make non-conflicting with glut. Rem...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f24a1d028dcc
branches:  trunk
changeset: 475284:f24a1d028dcc
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu May 13 12:59:37 2004 +0000

description:
Make non-conflicting with glut.  Remove dependency on GNU make.
Add missing bl3 files.  From Richard Rauch in PR 25353.
Bump PKGREVISION to 1.

diffstat:

 graphics/freeglut/Makefile |   9 +++++----
 graphics/freeglut/PLIST    |  13 ++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diffs (52 lines):

diff -r 3983990b4cdf -r f24a1d028dcc graphics/freeglut/Makefile
--- a/graphics/freeglut/Makefile        Thu May 13 12:57:42 2004 +0000
+++ b/graphics/freeglut/Makefile        Thu May 13 12:59:37 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/05/07 01:14:48 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2004/05/13 12:59:37 wiz Exp $
 #
 
 DISTNAME=      freeglut-2.2.0
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=freeglut/}
 
@@ -9,14 +10,14 @@
 HOMEPAGE=      http://freeglut.sourceforge.net/
 COMMENT=       Alternative to the OpenGL Utility Toolkit (GLUT) library
 
-CONFLICTS=     glut-[0-9]*:../../graphics/glut
-
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 USE_BUILDLINK3=        yes
 USE_LIBTOOL=   yes
 GNU_CONFIGURE= yes
-USE_GNU_TOOLS+=        make
+CONFIGURE_ARGS=        --disable-replace-glut
 USE_X11=       yes
 
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 3983990b4cdf -r f24a1d028dcc graphics/freeglut/PLIST
--- a/graphics/freeglut/PLIST   Thu May 13 12:57:42 2004 +0000
+++ b/graphics/freeglut/PLIST   Thu May 13 12:59:37 2004 +0000
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/19 18:36:02 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/05/13 12:59:37 wiz Exp $
 include/GL/freeglut.h
 include/GL/freeglut_ext.h
 include/GL/freeglut_std.h
-include/GL/glut.h
-lib/libglut.a
-lib/libglut.la
-lib/libglut.so
-lib/libglut.so.11
-lib/libglut.so.11.0
+lib/libfreeglut.a
+lib/libfreeglut.la
+lib/libfreeglut.so
+lib/libfreeglut.so.11
+lib/libfreeglut.so.11.0
 @unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}