Updated to latest stable release. Added dependencies required during configure.

Added dependencies which are linked to buildlink3.mk. Removed glu from
buildlink3.mk, as the resulting library doesn't link to it. patches/patch-{a,b}
were commited upstream - removed. Added patch to fix usb.h include on NetBSD.

From NEWS:
    * Tons of bug fixes
    * Added deprecated, but working Joystick API.
    * Added new constant GLUT_INIT_STATE for glutGet() to check if freeglut is
      already initialized.
    * Added new API entry for full-screen mode
        void glutFullScreenToggle( void );
      with a related new constant GLUT_FULL_SCREEN for glutGet().
    * Added new API entry to de-initialize freeglut:
        void glutExit( void );
    * Added more special keys: GLUT_KEY_NUM_LOCK, GLUT_KEY_BEGIN GLUT_KEY_DELETE
    * Added support for windows without captions and/or borders via two new
      constants GLUT_CAPTIONLESS and GLUT_BORDERLESS for glutInitDisplayMode
      (currently works for Windows only).
    * Added support for multisampling: The number of samples per pixel to use
      when GLUT_MULTISAMPLE is specified in glutInitDisplayMode() can be set via
      glutSetOption() with parameter GLUT_MULTISAMPLE now. glutGet() with the
      same token retrieves that value. The possible number of samples per pixels
      can be queried via the new API entry
        int *glutGetModeValues( GLenum mode, int *size );
      with mode GLUT_MULTISAMPLE. (glutGetModeValues() currently only works for
      X11)
    * Added new constant GLUT_AUX for glutSetOption() to set the number of
      auxiliary buffers. The possible number of auxiliary buffers can be
      queried via glutGetModeValues with mode GLUT_AUX.
    * Added support for versioned (i.e. 3.0) OpenGL contexts: New API entries
        void glutInitContextVersion( int majorVersion, int minorVersion );
        void glutInitContextFlags( int flags );
      with related new constants GLUT_DEBUG and GLUT_FORWARD_COMPATIBLE for
      the latter API entry. Added new constants GLUT_INIT_MAJOR_VERSION,
      GLUT_INIT_MINOR_VERSION and GLUT_INIT_FLAGS  for glutGet().

6 files changed, 38 insertions, 39 deletions

diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index 0cc9722cdfb..5831f13dff5 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.13 2012/10/06 14:10:49 asau Exp $
+# $NetBSD: Makefile,v 1.14 2013/05/04 14:32:20 rodent Exp $
 #
 
-DISTNAME=	freeglut-2.2.0
-PKGREVISION=	3
+DISTNAME=	freeglut-2.8.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freeglut/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://freeglut.sourceforge.net/
 COMMENT=	Alternative to the OpenGL Utility Toolkit (GLUT) library
+LICENSE=	# XXX mit + advertising clause; See discussion on tech-pkg@
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
@@ -18,5 +18,10 @@ CONFIGURE_ARGS+=	--disable-replace-glut
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/freeglut/buildlink3.mk b/graphics/freeglut/buildlink3.mk
index 34c977b2d1e..efddb3240d2 100644
--- a/graphics/freeglut/buildlink3.mk
+++ b/graphics/freeglut/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2013/05/04 14:32:20 rodent Exp $
 
 BUILDLINK_TREE+=	freeglut
 
@@ -10,7 +10,11 @@ BUILDLINK_ABI_DEPENDS.freeglut+=	freeglut>=2.2.0nb3
 BUILDLINK_PKGSRCDIR.freeglut?=	../../graphics/freeglut
 
 .include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .endif # FREEGLUT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-freeglut
diff --git a/graphics/freeglut/distinfo b/graphics/freeglut/distinfo
index dcfc6164cfa..cc43b0bc3e6 100644
--- a/graphics/freeglut/distinfo
+++ b/graphics/freeglut/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2007/10/10 22:22:14 rillig Exp $
+$NetBSD: distinfo,v 1.5 2013/05/04 14:32:20 rodent Exp $
 
-SHA1 (freeglut-2.2.0.tar.gz) = 87c762bd9653fe844f67e1944f1397061b590dc8
-RMD160 (freeglut-2.2.0.tar.gz) = 854de841d634074aac0df1cd62c8ca236570419a
-Size (freeglut-2.2.0.tar.gz) = 384055 bytes
-SHA1 (patch-aa) = 94fbd8965fa42db9c6c57c2b4089c764f9e7bcc0
-SHA1 (patch-ab) = ec636c3684a2d64c1a7c47e1ff95651ce0061b30
+SHA1 (freeglut-2.8.1.tar.gz) = 7330b622481e2226c0c9f6d2e72febe96b03f9c4
+RMD160 (freeglut-2.8.1.tar.gz) = 22a8de93e68657bb34200fba0124c99704b34f93
+Size (freeglut-2.8.1.tar.gz) = 1005343 bytes
+SHA1 (patch-src_freeglut__joystick.c) = b2baf2f79113c3daa30cc77e483d1a4248f79ac8
diff --git a/graphics/freeglut/patches/patch-aa b/graphics/freeglut/patches/patch-aa
deleted file mode 100644
index d072f492357..00000000000
--- a/graphics/freeglut/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/10/14 01:17:47 rillig Exp $
-
---- configure.orig	2006-10-14 03:16:15.000000000 +0200
-+++ configure	2006-10-14 03:16:35.000000000 +0200
-@@ -6880,7 +6880,7 @@ fi
- # Check whether --enable-warnings or --disable-warnings was given.
- if test "${enable_warnings+set}" = set; then
-   enableval="$enable_warnings"
--  if test "x$GCC" == xyes
-+  if test "x$GCC" = xyes
- then
-  CFLAGS="$CFLAGS -Wall -Wno-parentheses -Werror"
- fi
diff --git a/graphics/freeglut/patches/patch-ab b/graphics/freeglut/patches/patch-ab
deleted file mode 100644
index 567a9a5c2ec..00000000000
--- a/graphics/freeglut/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/10/10 22:22:14 rillig Exp $
-
-lvalues are more complicated than rvalues.
-
---- src/freeglut_internal.h.orig	2003-12-11 18:02:13.000000000 +0100
-+++ src/freeglut_internal.h	2007-10-11 00:20:38.000000000 +0200
-@@ -384,7 +384,7 @@ struct tagSFG_WindowState
-  * type.
-  */
- #define FETCH_WCB(window,cbname) \
--    ((FGCB ## cbname)((window).CallBacks[CB_ ## cbname]))
-+    (*((FGCB ## cbname *)&((window).CallBacks[CB_ ## cbname])))
- 
- /*
-  * INVOKE_WCB() is used as:
diff --git a/graphics/freeglut/patches/patch-src_freeglut__joystick.c b/graphics/freeglut/patches/patch-src_freeglut__joystick.c
new file mode 100644
index 00000000000..c948d12cf4b
--- /dev/null
+++ b/graphics/freeglut/patches/patch-src_freeglut__joystick.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_freeglut__joystick.c,v 1.1 2013/05/04 14:32:20 rodent Exp $
+
+Fix usb.h include for NetBSD.
+
+--- src/freeglut_joystick.c.orig	2011-09-28 01:37:26.000000000 +0000
++++ src/freeglut_joystick.c
+@@ -152,7 +152,11 @@
+ #                include <libusbhid.h>
+ #            endif
+ #        endif
+-#        include <legacy/dev/usb/usb.h>
++#        if defined(__NetBSD__)
++#            include <dev/usb/usb.h>
++#        else
++#            include <legacy/dev/usb/usb.h>
++#        endif
+ #        include <dev/usb/usbhid.h>
+ 
+ /* Compatibility with older usb.h revisions */