Attachment #35561 for bug #57377




# $FreeBSD: ports/x11-toolkits/freeglut/Makefile,v 1.1 2003/05/05 22:16:26 anholt Exp $
#

PORTNAME=		freeglut
PORTVERSION=		2.0.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

SNAPDATE=	2002-01-25

USE_AUTOMAKE=	yes
USE_AUTOHEADER=	yes
HAS_CONFIGURE=	yes
USE_LIBTOOL=	yes
INSTALLS_SHLIB=	yes
USE_XLIB=	yes
USE_GNOME=	glib12
CONFIGURE_ARGS=	--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include"			\
		ACLOCAL="${ACLOCAL}"				\
		AUTOCONF="${AUTOCONF}"				\
		AUTOMAKE="${AUTOMAKE}"				\
		AUTOHEADER="${AUTOHEADER}"

USE_REINPLACE=	yes
REINPLACE_ARGS=	-i ""

DOCS=	download.html freeglut.html freeglut_logo.png		\
	freeglut_user_interface.html index.html ogl_sm.png	\
	progress.html structure.html
BINS=	fractals fractals_random lorenz one

post-patch:
	@${REINPLACE_CMD} -e "s|/usr/X11R6|${X11BASE}|g"	\
			-e "s|/usr/local|${LOCALBASE}|g"	\
		${WRKSRC}/aclocal.m4
.for fract in /fractals.c _random/fractals_random.c
	${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g"	\
		${WRKSRC}/progs/demos/Fractals${fract}
.endfor

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 FILE in ${BINS}
	@${MV} ${PREFIX}/bin/${FILE} ${EXAMPLESDIR}
.endfor
	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
.else
.for FILE in ${BINS}
	@${RM} ${PREFIX}/bin/${FILE}
.endfor
.endif
	@${ECHO_MSG}
	@${CAT} ${PKGMESSAGE} |	\
		${SED} -e "s|/usr/local|${LOCALBASE}|"		\
			-e "s|/usr/X11R6|${X11BASE}|"
	@${ECHO_MSG}

.include <bsd.port.mk>

Line 1 Link Here

(-)x11-toolkits/freeglut/distinfo (-1 / +1 lines)
1	MD5 (freeglut-1.3-2002-01-25.tar.gz) = dbb63a579ba68ee9a1ddecdd9cddc1f2	1	MD5 (freeglut-2.0.0.tar.gz) = 06ab94ab2fbbce61644780e1d746bf34




--- aclocal.m4.orig	Mon Sep 29 22:00:33 2003
+++ aclocal.m4	Mon Sep 29 22:58:34 2003
@@ -77,10 +77,10 @@
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal)
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake)
-AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(ACLOCAL, ${ACLOCAL})
+AM_MISSING_PROG(AUTOCONF, ${AUTOCONF})
+AM_MISSING_PROG(AUTOMAKE, ${AUTOMAKE})
+AM_MISSING_PROG(AUTOHEADER, ${AUTOHEADER})
 AM_MISSING_PROG(MAKEINFO, makeinfo)
 AM_MISSING_PROG(AMTAR, tar)
 AM_PROG_INSTALL_SH
@@ -567,6 +567,7 @@
 AC_CACHE_LOAD
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
 
 # Always use our own libtool.

Lines 1-9 Link Here

(-)x11-toolkits/freeglut/files/patch-configure.in (-4 / +4 lines)
1	--- configure.in.orig Sat Jan 26 05:22:54 2002	1	--- configure.in.orig Sat Sep 20 18:14:07 2003
2	+++ configure.in Fri Apr 25 11:35:52 2003	2	+++ configure.in Mon Sep 22 21:19:52 2003
3	@@ -9,8 +9,7 @@	3	@@ -8,8 +8,7 @@
		4	AC_PROG_CC
4	AC_C_CONST	5	AC_C_CONST
5	AC_EXEEXT	6	AC_EXEEXT
6	AC_PROG_RANLIB
7	-AC_LIBTOOL_DLOPEN	7	-AC_LIBTOOL_DLOPEN
8	-AM_PROG_LIBTOOL	8	-AM_PROG_LIBTOOL
9	+AC_PROG_LIBTOOL	9	+AC_PROG_LIBTOOL

Lines 1-11 Link Here

(-)x11-toolkits/freeglut/files/patch-freeglut-1.3::Makefile.am (-11 lines)
1	--- freeglut-1.3/Makefile.am.orig Sun Jan 16 16:20:58 2000
2	+++ freeglut-1.3/Makefile.am Fri Apr 25 00:38:56 2003
3	@@ -31,7 +31,7 @@
4	#
5	# Additional linker flags
6	#
7	-libfreeglut_1_3_la_LIBADD = $(LIBM) -L/usr/X11R6/lib -lGL -lGLU -lXext -lX11 -lXxf86vm -lglib
8	+libfreeglut_1_3_la_LIBADD = $(LIBM) -L%%X11BASE%%/lib -lGL -lGLU -lXext -lX11 -lXxf86vm -lglib12
9	libfreeglut_1_3_la_LDFLAGS = -version-info 0:0:0
10
11	#




--- freeglut-1.3/freeglut_joystick.c.orig	Wed Jan 12 07:49:08 2000
+++ freeglut-1.3/freeglut_joystick.c	Sun May  4 17:16:24 2003
@@ -32,23 +32,23 @@
  * PWO: this is not exactly what Steve Baker has done for PLIB, as I had to convert
  *      it from C++ to C. And I've also reformatted it a bit (that's my little
  *      personal deviation :]) I don't really know if it is still portable...
- *      Steve: could you please add some comments to the code? :)
+ *      Steve: could you please add some comments to the code? :)
  *
- * FreeBSD port - courtesy of Stephen Montgomery-Smith <stephen@math.missouri.edu>
+ * FreeBSD port - courtesy of Stephen Montgomery-Smith <stephen@math.missouri.edu>
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-
-#define G_LOG_DOMAIN "freeglut-joystick"
+
+#define G_LOG_DOMAIN "freeglut-joystick"
 
 #include "../include/GL/freeglut.h"
 #include "../include/GL/freeglut_internal.h"
-
-/*
- * PWO: I don't like it at all. It's a mess. Could it be cleared?
- */
+
+/*
+ * PWO: I don't like it at all. It's a mess. Could it be cleared?
+ */
 #ifdef WIN32
 #   include <windows.h>
 #   if defined( __CYGWIN32__ ) || defined( __CYGWIN__ )
@@ -61,7 +61,7 @@
 #   include <unistd.h>
 #   include <fcntl.h>
 #   ifdef __FreeBSD__
-#       include <machine/joystick.h>
+#       include <sys/joystick.h>
 #       define JS_DATA_TYPE joystick
 #       define JS_RETURN (sizeof(struct JS_DATA_TYPE))
 #   elif defined(__linux__)
@@ -126,7 +126,7 @@
         gint        tmp_buttons;
         float       tmp_axes[ _JS_MAX_AXES ];
 #   else
-        JS_DATA_TYPE js;
+        struct JS_DATA_TYPE js;
 #   endif
 
     gchar fname[ 128 ];
@@ -251,7 +251,7 @@
 
     if( status != JS_RETURN )
     {
-        g_warning( fname );
+        g_warning( joy->fname );
         joy->error = TRUE;
         return;
     }
@@ -409,12 +409,12 @@
         return;
 
 #   ifdef __FreeBSD__
-    fghJoystickRawRead( buttons, axes );
+    fghJoystickRawRead(joy, buttons, axes );
     joy->error = axes[ 0 ] < -1000000000.0f;
     if( joy->error )
       return ;
 
-    sprintf( joyfname, "%s/.joy%drc", g_getenv( "HOME" ), id );
+    sprintf( joyfname, "%s/.joy%drc", g_getenv( "HOME" ), joy->id );
 
     joyfile = fopen( joyfname, "r" );
     joy->error = (joyfile == NULL);
@@ -435,8 +435,8 @@
 
     for( i=0 ; i<_JS_MAX_AXES ; i++ )
     {
-        dead_band[ i ] = 0.0f;
-        saturate [ i ] = 1.0f;
+        joy->dead_band[ i ] = 0.0f;
+        joy->saturate [ i ] = 1.0f;
     }
 #   else
 

Lines 1-11 Link Here

(-)x11-toolkits/freeglut/files/patch-genfonts::Makefile.am (-11 lines)
1	--- genfonts/Makefile.am.orig Sat Jan 8 23:02:55 2000
2	+++ genfonts/Makefile.am Fri Apr 25 00:32:08 2003
3	@@ -3,6 +3,6 @@
4	bin_PROGRAMS = genfonts genstroke
5	genfonts_SOURCES = genfonts.c
6	genstroke_SOURCES = genstroke.c
7	-genfonts_LDADD = -L/usr/X11R6/lib -lglib -lX11 -lXext
8	-genstroke_LDADD = -lglib
9	+genfonts_LDADD = -L%%X11BASE%%/lib -lglib12 -lX11 -lXext
10	+genstroke_LDADD = -lglib12
11	EXTRA_DIST = genfonts.c genstroke.c




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




--- progs/demos/Fractals_random/fractals_random.c.orig	Tue Sep 23 16:17:13 2003
+++ progs/demos/Fractals_random/fractals_random.c	Mon Sep 29 23:37:16 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>
@@ -253,7 +253,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);

Line 0 Link Here

(-)x11-toolkits/freeglut/files/patch-progs::demos::Lorenz::lorenz.c (+11 lines)
	1	--- progs/demos/Lorenz/lorenz.c.orig Thu Jul 10 13:46:34 2003
	2	+++ progs/demos/Lorenz/lorenz.c Mon Sep 22 21:52:40 2003
	3	@@ -32,7 +32,7 @@
	4	#include <string.h>
	5	#include <math.h>
	6	#include <time.h>
	7	-#include <GL/freeglut.h>
	8	+#include "../../../include/GL/freeglut.h"
	9
	10
	11	/************************************ Defined Constants *************************************/

Line 0 Link Here

(-)x11-toolkits/freeglut/files/patch-progs::demos::One::one.c (+11 lines)
	1	--- progs/demos/One/one.c.orig Sat Sep 13 15:35:53 2003
	2	+++ progs/demos/One/one.c Mon Sep 22 21:56:03 2003
	3	@@ -19,7 +19,7 @@
	4	#include <stdio.h>
	5	#include <stdlib.h>
	6
	7	-#include <GL/freeglut.h>
	8	+#include "../../../include/GL/freeglut.h"
	9
	10	int g_LeaveGameMode = 0;
	11	int g_InGameMode = 1;

Line 0 Link Here

(-)x11-toolkits/freeglut/pkg-message (+10 lines)
	1	******************************************************************
	2	freeglut requires a DRI enabled-graphic card;
	3	You may try to run the sample programs to check your installation.
	4
	5	Notice: freeglut is now a GLUT replacement.
	6	=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
	7
	8	It has been installed into /usr/local/lib/
	9	and the original GLUT is installed under /usr/X11R6/lib/
	10	******************************************************************




bin/genfonts
bin/genstroke
bin/one
include/GL/freeglut.h
include/GL/freeglut_ext.h
include/GL/glut.h
lib/libglut.a
lib/libglut.so
lib/libglut.so.11
%%PORTDOCS%%%%EXAMPLESDIR%%/fractals
%%PORTDOCS%%%%EXAMPLESDIR%%/fractals_random
%%PORTDOCS%%%%EXAMPLESDIR%%/fractals.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/lorenz
%%PORTDOCS%%%%EXAMPLESDIR%%/one
%%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%%

Return to bug 57377

Lines 5-47 Link Here

(-)x11-toolkits/freeglut/Makefile (-17 / +42 lines)
5	# $FreeBSD: ports/x11-toolkits/freeglut/Makefile,v 1.1 2003/05/05 22:16:26 anholt Exp $	5	# $FreeBSD: ports/x11-toolkits/freeglut/Makefile,v 1.1 2003/05/05 22:16:26 anholt Exp $
6	#	6	#
7		7
8	PORTNAME= freeglut	8	PORTNAME= freeglut
9	PORTVERSION= 1.3	9	PORTVERSION= 2.0.0
10	CATEGORIES= x11-toolkits	10	CATEGORIES= x11-toolkits
11	MASTER_SITES= http://${PORTNAME}.sourceforge.net/	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	DISTNAME= ${PORTNAME}-${PORTVERSION}-${SNAPDATE}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
13		13
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
15	COMMENT= An alternative to the OpenGL Utility Toolkit (GLUT) library	15	COMMENT= An alternative to the OpenGL Utility Toolkit (GLUT) library
16		16
17	SNAPDATE= 2002-01-25
18
19	USE_AUTOMAKE= yes	17	USE_AUTOMAKE= yes
		18	USE_AUTOHEADER= yes
20	HAS_CONFIGURE= yes	19	HAS_CONFIGURE= yes
21	USE_LIBTOOL= yes	20	USE_LIBTOOL= yes
22	INSTALLS_SHLIB= yes	21	INSTALLS_SHLIB= yes
23	USE_XLIB= yes	22	USE_XLIB= yes
24	USE_GNOME= glib12
25	CONFIGURE_ARGS= --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib	23	CONFIGURE_ARGS= --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
26	CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include `${GLIB_CONFIG} --cflags`" \	24	CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
27	LDFLAGS="`${GLIB_CONFIG} --libs`"	25	ACLOCAL="${ACLOCAL}" \
28		26	AUTOCONF="${AUTOCONF}" \
29	WRKSRC= ${WRKDIR}/${PORTNAME}-0.1	27	AUTOMAKE="${AUTOMAKE}" \
		28	AUTOHEADER="${AUTOHEADER}"
30		29
31	USE_REINPLACE= yes	30	USE_REINPLACE= yes
32	REINPLACE_ARGS= -i ""	31	REINPLACE_ARGS= -i ""
33		32
34	MK2X11= freeglut-1.3/Makefile.am genfonts/Makefile.am	33	DOCS= download.html freeglut.html freeglut_logo.png \
		34	freeglut_user_interface.html index.html ogl_sm.png \
		35	progress.html structure.html
		36	BINS= fractals fractals_random lorenz one
35		37
36	post-patch:	38	post-patch:
37	.for file in ${MK2X11}	39	@${REINPLACE_CMD} -e "s\|/usr/X11R6\|${X11BASE}\|g" \
38	@${REINPLACE_CMD} -e "s\|%%X11BASE%%\|${X11BASE}\|g" ${WRKSRC}/${file}	40	-e "s\|/usr/local\|${LOCALBASE}\|g" \
		41	${WRKSRC}/aclocal.m4
		42	.for fract in /fractals.c _random/fractals_random.c
		43	${REINPLACE_CMD} -e "s\|/usr/local\|${LOCALBASE}\|g" \
		44	${WRKSRC}/progs/demos/Fractals${fract}
39	.endfor	45	.endfor
40		46
41	post-install:	47	post-install:
		48	.if !defined(NOPORTDOCS)
		49	@${MKDIR} ${DOCSDIR}
		50	.for FILE in ${DOCS}
		51	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
		52	.endfor
		53	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
		54	@${MKDIR} ${EXAMPLESDIR}
		55	@${INSTALL_DATA} ${WRKSRC}/progs/demos/Fractals/fractals.dat \
		56	${EXAMPLESDIR}
		57	.for FILE in ${BINS}
		58	@${MV} ${PREFIX}/bin/${FILE} ${EXAMPLESDIR}
		59	.endfor
		60	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
		61	.else
		62	.for FILE in ${BINS}
		63	@${RM} ${PREFIX}/bin/${FILE}
		64	.endfor
		65	.endif
42	@${ECHO_MSG}	66	@${ECHO_MSG}
43	@${ECHO_MSG} " freeglut requires a DRI enabled-graphic card;"	67	@${CAT} ${PKGMESSAGE} \| \
44	@${ECHO_MSG} " You may try to run the program 'one' to check your installation."	68	${SED} -e "s\|/usr/local\|${LOCALBASE}\|" \
		69	-e "s\|/usr/X11R6\|${X11BASE}\|"
45	@${ECHO_MSG}	70	@${ECHO_MSG}
46		71
47	.include <bsd.port.mk>	72	.include <bsd.port.mk>

Lines 1-26 Link Here

(-)x11-toolkits/freeglut/files/patch-aclocal.m4 (-17 / +15 lines)
1	--- aclocal.m4.orig Sat Jan 26 05:23:11 2002	1	--- aclocal.m4.orig Mon Sep 29 22:00:33 2003
2	+++ aclocal.m4 Fri Apr 25 11:25:34 2003	2	+++ aclocal.m4 Mon Sep 29 22:58:34 2003
3	@@ -36,10 +36,10 @@	3	@@ -77,10 +77,10 @@
4	AC_REQUIRE([AC_ARG_PROGRAM])	4	# Some tools Automake needs.
5	dnl FIXME This is truly gross.	5	AC_REQUIRE([AM_SANITY_CHECK])dnl
6	missing_dir=`cd $ac_aux_dir && pwd`	6	AC_REQUIRE([AC_ARG_PROGRAM])dnl
7	-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)	7	-AM_MISSING_PROG(ACLOCAL, aclocal)
8	-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)	8	-AM_MISSING_PROG(AUTOCONF, autoconf)
9	-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)	9	-AM_MISSING_PROG(AUTOMAKE, automake)
10	-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)	10	-AM_MISSING_PROG(AUTOHEADER, autoheader)
11	+AM_MISSING_PROG(ACLOCAL, ${ACLOCAL})	11	+AM_MISSING_PROG(ACLOCAL, ${ACLOCAL})
12	+AM_MISSING_PROG(AUTOCONF, ${AUTOCONF})	12	+AM_MISSING_PROG(AUTOCONF, ${AUTOCONF})
13	+AM_MISSING_PROG(AUTOMAKE, ${AUTOMAKE})	13	+AM_MISSING_PROG(AUTOMAKE, ${AUTOMAKE})
14	+AM_MISSING_PROG(AUTOHEADER, ${AUTOHEADER})	14	+AM_MISSING_PROG(AUTOHEADER, ${AUTOHEADER})
15	AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)	15	AM_MISSING_PROG(MAKEINFO, makeinfo)
16	AC_REQUIRE([AC_PROG_MAKE_SET])])	16	AM_MISSING_PROG(AMTAR, tar)
17		17	AM_PROG_INSTALL_SH
18	@@ -123,7 +123,8 @@	18	@@ -567,6 +567,7 @@
19	AC_CACHE_LOAD
20		19
21	# This can be used to rebuild libtool when needed	20	# This can be used to rebuild libtool when needed
22	-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"	21	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
23	+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
24	+$ac_aux_dir/ltconfig $LIBTOOL_DEPS	22	+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
25		23
26	# Always use our own libtool.	24	# Always use our own libtool.

Lines 1-87 Link Here

(-)x11-toolkits/freeglut/files/patch-freeglut-1.3::freeglut_joystick.c (-87 lines)
1	--- freeglut-1.3/freeglut_joystick.c.orig Wed Jan 12 07:49:08 2000
2	+++ freeglut-1.3/freeglut_joystick.c Sun May 4 17:16:24 2003
3	@@ -32,23 +32,23 @@
4	* PWO: this is not exactly what Steve Baker has done for PLIB, as I had to convert
5	* it from C++ to C. And I've also reformatted it a bit (that's my little
6	* personal deviation :]) I don't really know if it is still portable...
7	- * Steve: could you please add some comments to the code? :)
8	+ * Steve: could you please add some comments to the code? :)
9	*
10	- * FreeBSD port - courtesy of Stephen Montgomery-Smith <stephen@math.missouri.edu>
11	+ * FreeBSD port - courtesy of Stephen Montgomery-Smith <stephen@math.missouri.edu>
12	*/
13
14	#ifdef HAVE_CONFIG_H
15	#include "config.h"
16	#endif
17	-
18	-#define G_LOG_DOMAIN "freeglut-joystick"
19	+
20	+#define G_LOG_DOMAIN "freeglut-joystick"
21
22	#include "../include/GL/freeglut.h"
23	#include "../include/GL/freeglut_internal.h"
24	-
25	-/*
26	- * PWO: I don't like it at all. It's a mess. Could it be cleared?
27	- */
28	+
29	+/*
30	+ * PWO: I don't like it at all. It's a mess. Could it be cleared?
31	+ */
32	#ifdef WIN32
33	# include <windows.h>
34	# if defined( __CYGWIN32__ ) \|\| defined( __CYGWIN__ )
35	@@ -61,7 +61,7 @@
36	# include <unistd.h>
37	# include <fcntl.h>
38	# ifdef __FreeBSD__
39	-# include <machine/joystick.h>
40	+# include <sys/joystick.h>
41	# define JS_DATA_TYPE joystick
42	# define JS_RETURN (sizeof(struct JS_DATA_TYPE))
43	# elif defined(__linux__)
44	@@ -126,7 +126,7 @@
45	gint tmp_buttons;
46	float tmp_axes[ _JS_MAX_AXES ];
47	# else
48	- JS_DATA_TYPE js;
49	+ struct JS_DATA_TYPE js;
50	# endif
51
52	gchar fname[ 128 ];
53	@@ -251,7 +251,7 @@
54
55	if( status != JS_RETURN )
56	{
57	- g_warning( fname );
58	+ g_warning( joy->fname );
59	joy->error = TRUE;
60	return;
61	}
62	@@ -409,12 +409,12 @@
63	return;
64
65	# ifdef __FreeBSD__
66	- fghJoystickRawRead( buttons, axes );
67	+ fghJoystickRawRead(joy, buttons, axes );
68	joy->error = axes[ 0 ] < -1000000000.0f;
69	if( joy->error )
70	return ;
71
72	- sprintf( joyfname, "%s/.joy%drc", g_getenv( "HOME" ), id );
73	+ sprintf( joyfname, "%s/.joy%drc", g_getenv( "HOME" ), joy->id );
74
75	joyfile = fopen( joyfname, "r" );
76	joy->error = (joyfile == NULL);
77	@@ -435,8 +435,8 @@
78
79	for( i=0 ; i<_JS_MAX_AXES ; i++ )
80	{
81	- dead_band[ i ] = 0.0f;
82	- saturate [ i ] = 1.0f;
83	+ joy->dead_band[ i ] = 0.0f;
84	+ joy->saturate [ i ] = 1.0f;
85	}
86	# else
87

Line 0 Link Here

(-)x11-toolkits/freeglut/files/patch-progs::demos::Fractals::fractals.c (+20 lines)
	1	--- progs/demos/Fractals/fractals.c.orig Sun Sep 21 15:47:36 2003
	2	+++ progs/demos/Fractals/fractals.c Mon Sep 29 23:35:43 2003
	3	@@ -18,7 +18,7 @@
	4	* Escape - quit
	5	*/
	6
	7	-#include <GL/freeglut.h>
	8	+#include "../../../include/GL/freeglut.h"
	9	#include <stdio.h>
	10	#include <stdlib.h>
	11	#include <math.h>
	12	@@ -262,7 +262,7 @@
	13	if ( argc > 1 )
	14	readConfigFile ( argv[1] ) ;
	15	else
	16	- readConfigFile ( "fractals.dat" ) ;
	17	+ readConfigFile ( "/usr/local/share/examples/freeglut/fractals.dat" ) ;
	18
	19	glutInit(&argc, argv);
	20	glutInitWindowSize(500, 250);

Line 0 Link Here

(-)x11-toolkits/freeglut/files/patch-progs::demos::Fractals_random::fractals_random.c (+20 lines)
	1	--- progs/demos/Fractals_random/fractals_random.c.orig Tue Sep 23 16:17:13 2003
	2	+++ progs/demos/Fractals_random/fractals_random.c Mon Sep 29 23:37:16 2003
	3	@@ -20,7 +20,7 @@
	4	* Escape - quit
	5	*/
	6
	7	-#include <GL/freeglut.h>
	8	+#include "../../../include/GL/freeglut.h"
	9	#include <stdio.h>
	10	#include <stdlib.h>
	11	#include <math.h>
	12	@@ -253,7 +253,7 @@
	13	if ( argc > 1 )
	14	readConfigFile ( argv[1] ) ;
	15	else
	16	- readConfigFile ( "fractals.dat" ) ;
	17	+ readConfigFile ( "/usr/local/share/examples/freeglut/fractals.dat" ) ;
	18
	19	glutInit(&argc, argv);
	20	glutInitWindowSize(500, 250);

Lines 1-8 Link Here

(-)x11-toolkits/freeglut/pkg-plist (-6 / +20 lines)
1	bin/genfonts
2	bin/genstroke
3	bin/one
4	include/GL/freeglut.h	1	include/GL/freeglut.h
5	lib/libfreeglut-1.3.so.0	2	include/GL/freeglut_ext.h
6	lib/libfreeglut-1.3.so	3	include/GL/glut.h
7	lib/libfreeglut-1.3.a	4	lib/libglut.a
		5	lib/libglut.so
		6	lib/libglut.so.11
		7	%%PORTDOCS%%%%EXAMPLESDIR%%/fractals
		8	%%PORTDOCS%%%%EXAMPLESDIR%%/fractals_random
		9	%%PORTDOCS%%%%EXAMPLESDIR%%/fractals.dat
		10	%%PORTDOCS%%%%EXAMPLESDIR%%/lorenz
		11	%%PORTDOCS%%%%EXAMPLESDIR%%/one
		12	%%PORTDOCS%%%%DOCSDIR%%/download.html
		13	%%PORTDOCS%%%%DOCSDIR%%/freeglut.html
		14	%%PORTDOCS%%%%DOCSDIR%%/freeglut_logo.png
		15	%%PORTDOCS%%%%DOCSDIR%%/freeglut_user_interface.html
		16	%%PORTDOCS%%%%DOCSDIR%%/index.html
		17	%%PORTDOCS%%%%DOCSDIR%%/ogl_sm.png
		18	%%PORTDOCS%%%%DOCSDIR%%/progress.html
		19	%%PORTDOCS%%%%DOCSDIR%%/structure.html
8	@dirrm include/GL	20	@dirrm include/GL
		21	%%PORTDOCS%%@dirrm %%DOCSDIR%%
		22	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%