18 files changed, 5 insertions, 246 deletions

diff --git a/MOVED b/MOVED
index 84b4036e28ad..9eb0069bc3cd 100644
--- a/MOVED
+++ b/MOVED
@@ -2080,3 +2080,4 @@ games/gleyes||2006-01-14|Mastersite disappeared
 mail/yadda||2006-01-14|Mastersite disappeared
 misc/wmproxyper||2006-01-14|Mastersite disappeared
 net/4g8||2006-01-14|No longer developed; authors suggests ettercap instead
+x11-toolkits/freeglut|graphics/freeglut|2006-01-16|Move to category where libglut is
diff --git a/games/cake/Makefile b/games/cake/Makefile
index 3abe807f9b96..72d0824d0c33 100644
--- a/games/cake/Makefile
+++ b/games/cake/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Quake3 map viewer
 
 .if defined(WITH_FREEGLUT)
-LIB_DEPENDS=	glut.11:${PORTSDIR}/x11-toolkits/freeglut
+LIB_DEPENDS=	glut.11:${PORTSDIR}/graphics/freeglut
 .else
 LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
 .endif
diff --git a/games/torcs/Makefile b/games/torcs/Makefile
index 6e2938334353..55b3f7529e77 100644
--- a/games/torcs/Makefile
+++ b/games/torcs/Makefile
@@ -59,7 +59,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -DHAVE_DECL
 .endif
 
 .if !defined(WITHOUT_FREEGLUT)
-LIB_DEPENDS+=	glut.11:${PORTSDIR}/x11-toolkits/freeglut
+LIB_DEPENDS+=	glut.11:${PORTSDIR}/graphics/freeglut
 .else
 USE_GL=		yes
 .endif
diff --git a/graphics/Makefile b/graphics/Makefile
index ddaffe2fb1cc..f99cfac5a08a 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -124,6 +124,7 @@
     SUBDIR += fnlib
     SUBDIR += fracplanet
     SUBDIR += fraqtive
+    SUBDIR += freeglut
     SUBDIR += freeimage
     SUBDIR += frontline
     SUBDIR += ftgl
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index 144b8428f8a5..193204b7d236 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		freeglut
 PORTVERSION=		2.4.0
-CATEGORIES=		x11-toolkits
+CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 5dab1c9c9c7b..808010af3c0a 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -22,7 +22,6 @@
     SUBDIR += fox
     SUBDIR += fox-devel
     SUBDIR += fox12
-    SUBDIR += freeglut
     SUBDIR += fxscintilla
     SUBDIR += fxscintilla-fox10
     SUBDIR += fxscintilla-fox12
diff --git a/x11-toolkits/freeglut/Makefile b/x11-toolkits/freeglut/Makefile
deleted file mode 100644
index 144b8428f8a5..000000000000
--- a/x11-toolkits/freeglut/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# New ports collection makefile for:	freeglut
-# Date created:		Wed Apr 23 2003
-# Whom:			thierry@pompo.net
-#
-# $FreeBSD$
-#
-
-PORTNAME=		freeglut
-PORTVERSION=		2.4.0
-CATEGORIES=		x11-toolkits
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		An alternative to the OpenGL Utility Toolkit (GLUT) library
-
-USE_AUTOTOOLS=	libtool:15
-INSTALLS_SHLIB=		yes
-USE_XLIB=		yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=		--x-includes=${X11BASE}/include	\
-			--x-libraries=${X11BASE}/lib
-CONFIGURE_ENV=		CPPFLAGS="-I${X11BASE}/include" LDFLAGS="-lusbhid"
-
-USE_REINPLACE=		yes
-REINPLACE_ARGS=		-i ""
-
-PKGMESSAGE=		${WRKDIR}/pkg-message
-SUB_FILES=		pkg-message
-
-DOCS=	download.html freeglut.html freeglut_logo.png		\
-	freeglut_user_interface.html index.html ogl_sm.png	\
-	progress.html structure.html
-BINS=	CallbackMaker Fractals Fractals_random Lorenz One shapes
-
-.include <bsd.port.pre.mk>
-
-pre-configure:
-.if ${OSVERSION} < 500000
-	@${REINPLACE_CMD} -e "s|-Werror||" ${WRKSRC}/configure
-.endif
-.for fract in /fractals.c _random/fractals_random.c
-	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g"		\
-		${WRKSRC}/progs/demos/Fractals${fract}
-.endfor
-
-post-build:
-	@${MV} ${WRKSRC}/progs/demos/CallbackMaker/.libs/CallbackMaker	\
-		${WRKSRC}/progs/demos/CallbackMaker/.libs/callbackmaker
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
-.endfor
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/progs/demos/Fractals/fractals.dat	\
-		${EXAMPLESDIR}
-.for prog in ${BINS}
-	@${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/${prog}/.libs/${prog:L} \
-		${EXAMPLESDIR}
-.endfor
-	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
-.endif
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE} |	\
-		${SED} -e "s|/usr/local|${PREFIX}|"		\
-			-e "s|/usr/X11R6|${X11BASE}|"
-	@${ECHO_MSG}
-
-.include <bsd.port.post.mk>
diff --git a/x11-toolkits/freeglut/distinfo b/x11-toolkits/freeglut/distinfo
deleted file mode 100644
index 5f7c297e7107..000000000000
--- a/x11-toolkits/freeglut/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (freeglut-2.4.0.tar.gz) = 6d16873bd876fbf4980a927cfbc496a1
-SHA256 (freeglut-2.4.0.tar.gz) = 269f2d50ba30b381622eb36f20b552ad43a1b43d544b9075e484e7146e81b052
-SIZE (freeglut-2.4.0.tar.gz) = 469557
diff --git a/x11-toolkits/freeglut/files/patch-progs::demos::CallbackMaker::CallbackMaker.c b/x11-toolkits/freeglut/files/patch-progs::demos::CallbackMaker::CallbackMaker.c
deleted file mode 100644
index bbe8f1761274..000000000000
--- a/x11-toolkits/freeglut/files/patch-progs::demos::CallbackMaker::CallbackMaker.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- progs/demos/CallbackMaker/CallbackMaker.c.orig	Mon Nov 10 17:01:05 2003
-+++ progs/demos/CallbackMaker/CallbackMaker.c	Sat Dec 13 14:43:35 2003
-@@ -4,7 +4,7 @@
-  */
- 
- 
--#include <GL/freeglut.h>
-+#include "../../../include/GL/freeglut.h"
- #include <stdio.h>
- #include <stdlib.h>
- 
diff --git a/x11-toolkits/freeglut/files/patch-progs::demos::Fractals::fractals.c b/x11-toolkits/freeglut/files/patch-progs::demos::Fractals::fractals.c
deleted file mode 100644
index 89a3ebe7af57..000000000000
--- a/x11-toolkits/freeglut/files/patch-progs::demos::Fractals::fractals.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- progs/demos/Fractals/fractals.c.orig	Sun Sep 21 15:47:36 2003
-+++ progs/demos/Fractals/fractals.c	Mon Sep 29 23:35:43 2003
-@@ -18,7 +18,7 @@
-  *  Escape - quit
-  */
- 
--#include <GL/freeglut.h>
-+#include "../../../include/GL/freeglut.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <math.h>
-@@ -262,7 +262,7 @@
-   if ( argc > 1 )
-     readConfigFile ( argv[1] ) ;
-   else
--    readConfigFile ( "fractals.dat" ) ;
-+    readConfigFile ( "/usr/local/share/examples/freeglut/fractals.dat" ) ;
- 
-   glutInit(&argc, argv);
-   glutInitWindowSize(500, 250);
diff --git a/x11-toolkits/freeglut/files/patch-progs::demos::Fractals_random::fractals_random.c b/x11-toolkits/freeglut/files/patch-progs::demos::Fractals_random::fractals_random.c
deleted file mode 100644
index 4d97f39f1720..000000000000
--- a/x11-toolkits/freeglut/files/patch-progs::demos::Fractals_random::fractals_random.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- progs/demos/Fractals_random/fractals_random.c.orig	Thu Dec 11 02:32:08 2003
-+++ progs/demos/Fractals_random/fractals_random.c	Sat Dec 13 10:17:10 2003
-@@ -20,7 +20,7 @@
-  *  Escape - quit
-  */
- 
--#include <GL/freeglut.h>
-+#include "../../../include/GL/freeglut.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <math.h>
-@@ -346,7 +346,7 @@
-   if ( argc > 1 )
-     readConfigFile ( argv[1] ) ;
-   else
--    readConfigFile ( "fractals.dat" ) ;
-+    readConfigFile ( "/usr/local/share/examples/freeglut/fractals.dat" ) ;
- 
-   fractal_window = glutCreateWindow( window_title );
- 
diff --git a/x11-toolkits/freeglut/files/patch-progs::demos::Lorenz::lorenz.c b/x11-toolkits/freeglut/files/patch-progs::demos::Lorenz::lorenz.c
deleted file mode 100644
index 508cef726b90..000000000000
--- a/x11-toolkits/freeglut/files/patch-progs::demos::Lorenz::lorenz.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- progs/demos/Lorenz/lorenz.c.orig	Mon Jan  3 11:24:15 2005
-+++ progs/demos/Lorenz/lorenz.c	Sat Jun 11 14:06:07 2005
-@@ -31,7 +31,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
--#include <GL/freeglut.h>
-+#include "../../../include/GL/freeglut.h"
- #ifdef WIN32
- /* DUMP MEMORY LEAKS */
- #include <crtdbg.h>
diff --git a/x11-toolkits/freeglut/files/patch-progs::demos::One::one.c b/x11-toolkits/freeglut/files/patch-progs::demos::One::one.c
deleted file mode 100644
index 580d5048e036..000000000000
--- a/x11-toolkits/freeglut/files/patch-progs::demos::One::one.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- progs/demos/One/one.c.orig	Sat Sep 13 15:35:53 2003
-+++ progs/demos/One/one.c	Mon Sep 22 21:56:03 2003
-@@ -19,7 +19,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
--#include <GL/freeglut.h>
-+#include "../../../include/GL/freeglut.h"
- 
- int g_LeaveGameMode = 0;
- int g_InGameMode = 1;
diff --git a/x11-toolkits/freeglut/files/patch-progs::demos::shapes::shapes.c b/x11-toolkits/freeglut/files/patch-progs::demos::shapes::shapes.c
deleted file mode 100644
index 596ee6c84b98..000000000000
--- a/x11-toolkits/freeglut/files/patch-progs::demos::shapes::shapes.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- progs/demos/shapes/shapes.c.orig	Sun Dec  7 11:12:22 2003
-+++ progs/demos/shapes/shapes.c	Sat Dec 13 14:51:38 2003
-@@ -12,7 +12,7 @@
-  * using the + and - keys.
-  */
- 
--#include <GL/freeglut.h>
-+#include "../../../include/GL/freeglut.h"
- 
- #include <stdlib.h>
- 
diff --git a/x11-toolkits/freeglut/files/patch-src::freeglut_joystick.c b/x11-toolkits/freeglut/files/patch-src::freeglut_joystick.c
deleted file mode 100644
index 23f02203881a..000000000000
--- a/x11-toolkits/freeglut/files/patch-src::freeglut_joystick.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/freeglut_joystick.c.orig	Wed May  4 14:53:48 2005
-+++ src/freeglut_joystick.c	Sat Jun 11 14:40:48 2005
-@@ -80,7 +80,7 @@
- /* XXX The below hack is done until freeglut's autoconf is updated. */
- #        define HAVE_USB_JS    1
- 
--#        if defined(__FreeBSD__) && __FreeBSD_version >= 500000
-+#        if defined(__FreeBSD__)
- #            include <sys/joystick.h>
- #        else
- /*
-@@ -656,9 +656,9 @@
-                if (usage > 0 && usage < _JS_MAX_BUTTONS + 1)
-                {
-                    if (d)
--                       joy->os->cache_buttons |= (1 << usage - 1);
-+                       joy->os->cache_buttons |= (1 << (usage - 1));
-                    else
--                       joy->os->cache_buttons &= ~(1 << usage - 1);
-+                       joy->os->cache_buttons &= ~(1 <<( usage - 1));
-                }
-             }
-         }
-@@ -1060,7 +1060,9 @@
- #    ifdef JS_NEW
-        unsigned char u;
- #    else
--       int counter;
-+#      if defined( __linux__ )
-+         int counter;
-+#      endif
- #    endif
- #endif
- 
diff --git a/x11-toolkits/freeglut/files/pkg-message.in b/x11-toolkits/freeglut/files/pkg-message.in
deleted file mode 100644
index d4009cb79482..000000000000
--- a/x11-toolkits/freeglut/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-******************************************************************
-freeglut requires a DRI / OpenGL enabled-graphic card;
-You may try to run the sample programs to check your installation.
-
-Notice: freeglut is now a GLUT replacement.
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-It has been installed into %%PREFIX%%/lib/
-and the original GLUT is installed under %%X11BASE%%/lib/
-******************************************************************
diff --git a/x11-toolkits/freeglut/pkg-descr b/x11-toolkits/freeglut/pkg-descr
deleted file mode 100644
index 12d15861c66b..000000000000
--- a/x11-toolkits/freeglut/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-freeglut is a completely OpenSourced alternative to the OpenGL Utility
-Toolkit (GLUT) library. GLUT was originally written by Mark Kilgard to
-support the sample programs in the second edition OpenGL 'RedBook'.
-Since then, GLUT has been used in a wide variety of practical applications
-because it is simple, universally available and highly portable.
-
-GLUT (and hence freeglut) allows the user to create and manage windows
-containing OpenGL contexts on a wide range of platforms and also read the
-mouse, keyboard and joystick functions.
-
-freeglut is released under the X-Consortium license.
-
-WWW: http://freeglut.sourceforge.net/
diff --git a/x11-toolkits/freeglut/pkg-plist b/x11-toolkits/freeglut/pkg-plist
deleted file mode 100644
index 9632aa3acec8..000000000000
--- a/x11-toolkits/freeglut/pkg-plist
+++ /dev/null
@@ -1,25 +0,0 @@
-include/GL/freeglut.h
-include/GL/freeglut_ext.h
-include/GL/freeglut_std.h
-include/GL/glut.h
-lib/libglut.a
-lib/libglut.so
-lib/libglut.so.11
-%%PORTDOCS%%%%EXAMPLESDIR%%/callbackmaker
-%%PORTDOCS%%%%EXAMPLESDIR%%/fractals
-%%PORTDOCS%%%%EXAMPLESDIR%%/fractals_random
-%%PORTDOCS%%%%EXAMPLESDIR%%/fractals.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/lorenz
-%%PORTDOCS%%%%EXAMPLESDIR%%/one
-%%PORTDOCS%%%%EXAMPLESDIR%%/shapes
-%%PORTDOCS%%%%DOCSDIR%%/download.html
-%%PORTDOCS%%%%DOCSDIR%%/freeglut.html
-%%PORTDOCS%%%%DOCSDIR%%/freeglut_logo.png
-%%PORTDOCS%%%%DOCSDIR%%/freeglut_user_interface.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/ogl_sm.png
-%%PORTDOCS%%%%DOCSDIR%%/progress.html
-%%PORTDOCS%%%%DOCSDIR%%/structure.html
-@dirrm include/GL
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%