From cd3a29447f59ada8ba5f1db6798663e068c43732 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Thu, 9 Apr 2009 12:45:42 +0000
Subject: [PATCH] - hookup freeglut - add a conflict marker to glut

---
 graphics/Makefile       | 3 ++-
 graphics/glut/Makefile  | 4 ++--
 graphics/glut/pkg/PLIST | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/graphics/Makefile b/graphics/Makefile
index 2ae559e6ac2..1f5bf4ce619 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.233 2009/03/20 13:55:35 eric Exp $
+# $OpenBSD: Makefile,v 1.234 2009/04/09 12:45:42 jasper Exp $
 # $FreeBSD: Makefile,v 1.55 1997/11/03 12:12:27 tg Exp $
 #
 
@@ -44,6 +44,7 @@
      SUBDIR += flash
      SUBDIR += fnlib
      SUBDIR += freeimage
+     SUBDIR += freeglut
      SUBDIR += fswebcam
      SUBDIR += fxtv
      SUBDIR += fyre
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index 5bcbd50b247..74cc01fa312 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2008/11/11 12:41:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2009/04/09 12:45:42 jasper Exp $
 
 COMMENT=	OpenGL Utility Toolkit
 
 DISTNAME=	glut-3.7
-PKGNAME=	${DISTNAME}p3
+PKGNAME=	${DISTNAME}p4
 SHARED_LIBS=	glsmap	3.7	\
 		glut	3.7	\
 		mui	3.7
diff --git a/graphics/glut/pkg/PLIST b/graphics/glut/pkg/PLIST
index f42b532e09c..2397b35878a 100644
--- a/graphics/glut/pkg/PLIST
+++ b/graphics/glut/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 00:50:09 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2009/04/09 12:45:42 jasper Exp $
+@conflict freeglut-*
 include/GL/
 include/GL/glsmap.h
 include/GL/glut.h