mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

- Move freeglut from x11-toolkits to graphics, where libglut already is

Browse Source 
PR:		ports/91711
Submitted by:	Sangwoo Shim <sangwoos@gmail.com>
Repocopied by:	marcus
This commit is contained in:
Pav Lucistnik 2006-01-16 00:07:03 +00:00
parent 32c40c6316
commit 8341fbe6a4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=153604
18 changed files with 5 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MOVED
View File

@ -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

2
games/cake/Makefile
View File

@ -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

2
games/torcs/Makefile
View File

@ -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

1
graphics/Makefile
View File

@ -124,6 +124,7 @@
SUBDIR += fnlib
SUBDIR += fracplanet
SUBDIR += fraqtive
SUBDIR += freeglut
SUBDIR += freeimage
SUBDIR += frontline
SUBDIR += ftgl

2
graphics/freeglut/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= freeglut
PORTVERSION= 2.4.0
CATEGORIES= x11-toolkits
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}

1
x11-toolkits/Makefile
View File

@ -22,7 +22,6 @@
SUBDIR += fox
SUBDIR += fox-devel
SUBDIR += fox12
SUBDIR += freeglut
SUBDIR += fxscintilla
SUBDIR += fxscintilla-fox10
SUBDIR += fxscintilla-fox12

73
x11-toolkits/freeglut/Makefile
View File

@ -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>

3
x11-toolkits/freeglut/distinfo
View File

@ -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

11
x11-toolkits/freeglut/files/patch-progs::demos::CallbackMaker::CallbackMaker.c
View File

@ -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>

20
x11-toolkits/freeglut/files/patch-progs::demos::Fractals::fractals.c
View File

@ -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);

20
x11-toolkits/freeglut/files/patch-progs::demos::Fractals_random::fractals_random.c
View File

@ -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 );

11
x11-toolkits/freeglut/files/patch-progs::demos::Lorenz::lorenz.c
View File

@ -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>

11
x11-toolkits/freeglut/files/patch-progs::demos::One::one.c
View File

@ -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;

11
x11-toolkits/freeglut/files/patch-progs::demos::shapes::shapes.c
View File

@ -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>

34
x11-toolkits/freeglut/files/patch-src::freeglut_joystick.c
View File

@ -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

10
x11-toolkits/freeglut/files/pkg-message.in
View File

@ -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/
******************************************************************

13
x11-toolkits/freeglut/pkg-descr
View File

@ -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/

25
x11-toolkits/freeglut/pkg-plist
View File

@ -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%%