This port replaces graphics/glut (the annoying lib that doesn't come
with a proper license - therefore no packages)
Included are fixes for all ports that used glut plus wantlib for
for the two makehuman ports (+ Xxf86vm)
Tested on i386, please test, this is one of the prerequisites for torcs ;)
Index: games/crack-attack/Makefile
===================================================================
RCS file: /data/data2/cvs/ports/games/crack-attack/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- games/crack-attack/Makefile 15 Jun 2008 00:08:09 -0000 1.3
+++ games/crack-attack/Makefile 9 Nov 2008 17:56:16 -0000
@@ -3,7 +3,7 @@
COMMENT= OpenGL game based on SNES classic Tetris Attack
DISTNAME= crack-attack-1.1.14
-PKGNAME= ${DISTNAME}p1
+PKGNAME= ${DISTNAME}p2
CATEGORIES= games
MAINTAINER= Mattieu Baptiste <[EMAIL PROTECTED]>
@@ -27,7 +27,7 @@ MASTER_SITES= http://savannah.nongnu.org
MODULES= devel/gettext
LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
- glut.>=3::graphics/glut
+ glut.>=4::graphics/freeglut
USE_X11= Yes
Index: games/crack-attack/patches/patch-src_Attack_cxx
===================================================================
RCS file: games/crack-attack/patches/patch-src_Attack_cxx
diff -N games/crack-attack/patches/patch-src_Attack_cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ games/crack-attack/patches/patch-src_Attack_cxx 9 Nov 2008 17:46:25
-0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/Attack.cxx.orig Sun Nov 9 18:45:06 2008
++++ src/Attack.cxx Sun Nov 9 18:45:58 2008
+@@ -83,6 +83,7 @@ int main ( int argc, char **argv )
+ int height = -1, width = -1;
+
+ player_name[0] = '\0';
++ glutInit(&argc, argv);
+ parseCommandLine(argc, argv, mode, port, host_name, player_name, height,
width);
+ run_crack_attack(mode, port, host_name, player_name, height, width);
+
Index: games/crossfire-client/Makefile
===================================================================
RCS file: /data/data2/cvs/ports/games/crossfire-client/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- games/crossfire-client/Makefile 15 Jun 2008 00:08:09 -0000 1.19
+++ games/crossfire-client/Makefile 9 Nov 2008 17:59:26 -0000
@@ -4,7 +4,7 @@ COMMENT= graphical networked AD&D style
VERSION= 1.11.0
DISTNAME= crossfire-client-${VERSION}
-PKGNAME= ${DISTNAME}p0
+PKGNAME= ${DISTNAME}p1
CATEGORIES= games x11
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -30,7 +30,7 @@ MODULES= devel/gettext
LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
SDL_image.>=2::devel/sdl-image \
- glut.>=3::graphics/glut \
+ glut.>=4::graphics/freeglut \
curl.>=8::net/curl
USE_X11= Yes
Index: games/glsfcave/Makefile
===================================================================
RCS file: /data/data2/cvs/ports/games/glsfcave/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- games/glsfcave/Makefile 8 May 2008 06:48:37 -0000 1.2
+++ games/glsfcave/Makefile 9 Nov 2008 18:22:37 -0000
@@ -4,7 +4,7 @@ COMMENT= control a ribbon to avoid hitti
V= 1.0
DISTNAME= glsfcave-$V-mitl
-PKGNAME= glsfcave-$Vp0
+PKGNAME= glsfcave-$Vp1
CATEGORIES= games
EXTRACT_SUFX= .tar.bz2
@@ -21,7 +21,7 @@ PERMIT_PACKAGE_FTP= Yes
WANTLIB= GL GLU X11 Xext Xi Xmu c m
-LIB_DEPENDS= glut::graphics/glut
+LIB_DEPENDS= glut.>=4::graphics/freeglut
WRKDIST= ${WRKDIR}/glsfcave
Index: graphics/freeglut/Makefile
===================================================================
RCS file: graphics/freeglut/Makefile
diff -N graphics/freeglut/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/freeglut/Makefile 9 Nov 2008 19:59:32 -0000
@@ -0,0 +1,27 @@
+# $OpenBSD$
+
+COMMENT = open source alternative to glut
+DISTNAME = freeglut-2.4.0
+SHARED_LIBS = glut 4.0
+CATEGORIES = graphics
+HOMEPAGE = http://freeglut.sourceforge.net/
+MAINTAINER = Tobias Ulmer <[EMAIL PROTECTED]>
+
+# X11
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
+
+WANTLIB = GL GLU X11 Xau Xdmcp Xext Xxf86vm m
+
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=freeglut/}
+
+USE_X11 = Yes
+USE_LIBTOOL = Yes
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS += ${CONFIGURE_SHARED} --enable-warnings=no
+
+NO_REGRESS = Yes
+
+.include <bsd.port.mk>
Index: graphics/freeglut/distinfo
===================================================================
RCS file: graphics/freeglut/distinfo
diff -N graphics/freeglut/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/freeglut/distinfo 9 Nov 2008 19:36:42 -0000
@@ -0,0 +1,5 @@
+MD5 (freeglut-2.4.0.tar.gz) = bRaHO9h2+/SYCpJ8+8SWoQ==
+RMD160 (freeglut-2.4.0.tar.gz) = d0ZWR/PWX7tc8lPrk6x0CeDDexQ=
+SHA1 (freeglut-2.4.0.tar.gz) = kaUoqnJ1i3KIoNaalksbfj8yKhI=
+SHA256 (freeglut-2.4.0.tar.gz) = Jp8tULows4FiLrNvILVSrUOhtD1US5B15ITnFG6BsFI=
+SIZE (freeglut-2.4.0.tar.gz) = 469557
Index: graphics/freeglut/pkg/DESCR
===================================================================
RCS file: graphics/freeglut/pkg/DESCR
diff -N graphics/freeglut/pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/freeglut/pkg/DESCR 9 Nov 2008 19:58:23 -0000
@@ -0,0 +1,2 @@
+freeglut is a completely OpenSourced alternative to the OpenGL
+Utility Toolkit (GLUT) library written by Mark Kilgard.
Index: graphics/freeglut/pkg/PFRAG.shared
===================================================================
RCS file: graphics/freeglut/pkg/PFRAG.shared
diff -N graphics/freeglut/pkg/PFRAG.shared
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/freeglut/pkg/PFRAG.shared 9 Nov 2008 19:36:42 -0000
@@ -0,0 +1,2 @@
[EMAIL PROTECTED] $OpenBSD$
[EMAIL PROTECTED] lib/libglut.so.${LIBglut_VERSION}
Index: graphics/freeglut/pkg/PLIST
===================================================================
RCS file: graphics/freeglut/pkg/PLIST
diff -N graphics/freeglut/pkg/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/freeglut/pkg/PLIST 9 Nov 2008 19:36:42 -0000
@@ -0,0 +1,10 @@
[EMAIL PROTECTED] $OpenBSD$
[EMAIL PROTECTED] glut-*
+%%SHARED%%
+include/GL/
+include/GL/freeglut.h
+include/GL/freeglut_ext.h
+include/GL/freeglut_std.h
+include/GL/glut.h
+lib/libglut.a
+lib/libglut.la
Index: graphics/glpng/Makefile
===================================================================
RCS file: /data/data2/cvs/ports/graphics/glpng/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- graphics/glpng/Makefile 15 Sep 2007 20:09:41 -0000 1.4
+++ graphics/glpng/Makefile 9 Nov 2008 18:37:05 -0000
@@ -4,7 +4,7 @@ COMMENT= load PNG graphics files and bin
VERSION= 1.45
DISTNAME= glpng
-PKGNAME= ${DISTNAME}-${VERSION}p0
+PKGNAME= ${DISTNAME}-${VERSION}p1
SHARED_LIBS= glpng 0.0
CATEGORIES= graphics
@@ -29,7 +29,7 @@ USE_X11= Yes
# This regression test wants an X11 display
REGRESS_IS_INTERACTIVE= Yes
-REGRESS_DEPENDS= ::graphics/glut
+REGRESS_DEPENDS= ::graphics/freeglut
DIST_SUBDIR= ${DISTNAME}-${VERSION}
WRKDIST= ${WRKDIR}
Index: graphics/glpng/patches/patch-Example_Test_c
===================================================================
RCS file: /data/data2/cvs/ports/graphics/glpng/patches/patch-Example_Test_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Example_Test_c
--- graphics/glpng/patches/patch-Example_Test_c 20 Nov 2006 09:35:48 -0000
1.1.1.1
+++ graphics/glpng/patches/patch-Example_Test_c 9 Nov 2008 18:40:45 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Example_Test_c,v 1.1.1.1 2006/11/20 09:35:48 ajacoutot Exp $
---- Example/Test.c.orig Sun Nov 19 18:49:52 2006
-+++ Example/Test.c Sun Nov 19 18:50:04 2006
+$OpenBSD$
+--- Example/Test.c.orig Sun Nov 9 19:39:38 2008
++++ Example/Test.c Sun Nov 9 19:40:32 2008
@@ -6,8 +6,8 @@
* http://www.wyatt100.freeserve.co.uk/download.htm
*/
@@ -12,3 +12,16 @@ $OpenBSD: patch-Example_Test_c,v 1.1.1.1
#include <stdlib.h>
int angle = 0;
+@@ -64,10 +64,11 @@ void Reshape(int w, int h) {
+
+ /***** Main function *****/
+
+-void main() {
++void main(int argc, char **argv) {
+ pngInfo info;
+ GLuint texture;
+
++ glutInit(&argc, argv);
+ glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB);
+ glutInitWindowSize(300, 300);
+ glutCreateWindow("glpng test");
Index: graphics/makehuman/Makefile
===================================================================
RCS file: /data/data2/cvs/ports/graphics/makehuman/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- graphics/makehuman/Makefile 15 Sep 2007 20:09:42 -0000 1.6
+++ graphics/makehuman/Makefile 9 Nov 2008 19:18:14 -0000
@@ -3,7 +3,7 @@
COMMENT= parametrical modeling of 3D humanoid characters
DISTNAME= makehuman-0.9
-PKGNAME= ${DISTNAME}p2
+PKGNAME= ${DISTNAME}p3
CATEGORIES= graphics
HOMEPAGE= http://www.dedalo-3d.com/
@@ -18,11 +18,11 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=makehuman/}
-WANTLIB= GL GLU ICE SM X11 Xi Xmu c m stdc++ z Xau Xdmcp Xext Xt
+WANTLIB= GL GLU ICE SM X11 Xi Xmu c m stdc++ z Xau Xdmcp Xext Xt Xxf86vm
RUN_DEPENDS= ::graphics/aqsis
LIB_DEPENDS= animorph::graphics/animorph \
- glut.>=3::graphics/glut \
+ glut.>=4::graphics/freeglut \
mhgui::graphics/mhgui \
png.>=5::graphics/png
Index: graphics/mhgui/Makefile
===================================================================
RCS file: /data/data2/cvs/ports/graphics/mhgui/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- graphics/mhgui/Makefile 15 Sep 2007 20:09:42 -0000 1.5
+++ graphics/mhgui/Makefile 9 Nov 2008 18:59:03 -0000
@@ -3,7 +3,7 @@
COMMENT= GUI widget library used in MakeHuman
DISTNAME= mhgui-0.1
-PKGNAME= ${DISTNAME}p1
+PKGNAME= ${DISTNAME}p2
SHARED_LIBS += mhgui 0.0 # .0.0
CATEGORIES= graphics
@@ -19,10 +19,10 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=makehuman/}
-WANTLIB= GL GLU ICE SM X11 Xi Xmu Xau Xdmcp Xext Xt m z
+WANTLIB= GL GLU ICE SM X11 Xi Xmu Xau Xdmcp Xext Xt m z Xxf86vm
LIB_DEPENDS= animorph::graphics/animorph \
- glut.>=3:glut->=3.7p2:graphics/glut \
+ glut.>=4::graphics/freeglut \
png.>=5::graphics/png
USE_X11= Yes
