Attachment 30602 Details for Bug 51453 – freeglut.shar

freeglut.shar

freeglut.shar (text/plain), 9.21 KB, created by Thierry Thomas on 2003-04-27 09:10:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2003-04-27 09:10:10 UTC

Size: 9.21 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	x11-toolkits/freeglut
>#	x11-toolkits/freeglut/files
>#	x11-toolkits/freeglut/files/patch-freeglut-1.3::freeglut_joystick.c
>#	x11-toolkits/freeglut/files/patch-freeglut-1.3::Makefile.am
>#	x11-toolkits/freeglut/files/patch-aclocal.m4
>#	x11-toolkits/freeglut/files/patch-genfonts::Makefile.am
>#	x11-toolkits/freeglut/files/patch-configure.in
>#	x11-toolkits/freeglut/Makefile
>#	x11-toolkits/freeglut/distinfo
>#	x11-toolkits/freeglut/pkg-descr
>#	x11-toolkits/freeglut/pkg-plist
>#
>echo c - x11-toolkits/freeglut
>mkdir -p x11-toolkits/freeglut > /dev/null 2>&1
>echo c - x11-toolkits/freeglut/files
>mkdir -p x11-toolkits/freeglut/files > /dev/null 2>&1
>echo x - x11-toolkits/freeglut/files/patch-freeglut-1.3::freeglut_joystick.c
>sed 's/^X//' >x11-toolkits/freeglut/files/patch-freeglut-1.3::freeglut_joystick.c << 'END-of-x11-toolkits/freeglut/files/patch-freeglut-1.3::freeglut_joystick.c'
>X--- ./freeglut-1.3/freeglut_joystick.c.orig	Wed Jan 12 16:49:08 2000
>X+++ ./freeglut-1.3/freeglut_joystick.c	Thu Apr 24 23:47:21 2003
>X@@ -32,23 +32,23 @@
>X  * PWO: this is not exactly what Steve Baker has done for PLIB, as I had to convert
>X  *      it from C++ to C. And I've also reformatted it a bit (that's my little
>X  *      personal deviation :]) I don't really know if it is still portable...
>X- *      Steve: could you please add some comments to the code? :)
>X+ *      Steve: could you please add some comments to the code? :)
>X  *
>X- * FreeBSD port - courtesy of Stephen Montgomery-Smith <stephen@math.missouri.edu>
>X+ * FreeBSD port - courtesy of Stephen Montgomery-Smith <stephen@math.missouri.edu>
>X  */
>X 
>X #ifdef HAVE_CONFIG_H
>X #include "config.h"
>X #endif
>X-
>X-#define G_LOG_DOMAIN "freeglut-joystick"
>X+
>X+#define G_LOG_DOMAIN "freeglut-joystick"
>X 
>X #include "../include/GL/freeglut.h"
>X #include "../include/GL/freeglut_internal.h"
>X-
>X-/*
>X- * PWO: I don't like it at all. It's a mess. Could it be cleared?
>X- */
>X+
>X+/*
>X+ * PWO: I don't like it at all. It's a mess. Could it be cleared?
>X+ */
>X #ifdef WIN32
>X #   include <windows.h>
>X #   if defined( __CYGWIN32__ ) || defined( __CYGWIN__ )
>X@@ -126,7 +126,7 @@
>X         gint        tmp_buttons;
>X         float       tmp_axes[ _JS_MAX_AXES ];
>X #   else
>X-        JS_DATA_TYPE js;
>X+        struct JS_DATA_TYPE js;
>X #   endif
>X 
>X     gchar fname[ 128 ];
>X@@ -251,7 +251,7 @@
>X 
>X     if( status != JS_RETURN )
>X     {
>X-        g_warning( fname );
>X+        g_warning( joy->fname );
>X         joy->error = TRUE;
>X         return;
>X     }
>X@@ -409,12 +409,12 @@
>X         return;
>X 
>X #   ifdef __FreeBSD__
>X-    fghJoystickRawRead( buttons, axes );
>X+    fghJoystickRawRead(joy, buttons, axes );
>X     joy->error = axes[ 0 ] < -1000000000.0f;
>X     if( joy->error )
>X       return ;
>X 
>X-    sprintf( joyfname, "%s/.joy%drc", g_getenv( "HOME" ), id );
>X+    sprintf( joyfname, "%s/.joy%drc", g_getenv( "HOME" ), joy->id );
>X 
>X     joyfile = fopen( joyfname, "r" );
>X     joy->error = (joyfile == NULL);
>X@@ -435,8 +435,8 @@
>X 
>X     for( i=0 ; i<_JS_MAX_AXES ; i++ )
>X     {
>X-        dead_band[ i ] = 0.0f;
>X-        saturate [ i ] = 1.0f;
>X+        joy->dead_band[ i ] = 0.0f;
>X+        joy->saturate [ i ] = 1.0f;
>X     }
>X #   else
>X 
>END-of-x11-toolkits/freeglut/files/patch-freeglut-1.3::freeglut_joystick.c
>echo x - x11-toolkits/freeglut/files/patch-freeglut-1.3::Makefile.am
>sed 's/^X//' >x11-toolkits/freeglut/files/patch-freeglut-1.3::Makefile.am << 'END-of-x11-toolkits/freeglut/files/patch-freeglut-1.3::Makefile.am'
>X--- freeglut-1.3/Makefile.am.orig	Sun Jan 16 16:20:58 2000
>X+++ freeglut-1.3/Makefile.am	Fri Apr 25 00:38:56 2003
>X@@ -31,7 +31,7 @@
>X #
>X # Additional linker flags
>X #	 
>X-libfreeglut_1_3_la_LIBADD = $(LIBM) -L/usr/X11R6/lib -lGL -lGLU -lXext -lX11 -lXxf86vm -lglib
>X+libfreeglut_1_3_la_LIBADD = $(LIBM) -L%%X11BASE%%/lib -lGL -lGLU -lXext -lX11 -lXxf86vm -lglib12
>X libfreeglut_1_3_la_LDFLAGS = -version-info 0:0:0
>X 
>X #
>END-of-x11-toolkits/freeglut/files/patch-freeglut-1.3::Makefile.am
>echo x - x11-toolkits/freeglut/files/patch-aclocal.m4
>sed 's/^X//' >x11-toolkits/freeglut/files/patch-aclocal.m4 << 'END-of-x11-toolkits/freeglut/files/patch-aclocal.m4'
>X--- aclocal.m4.orig	Sat Jan 26 05:23:11 2002
>X+++ aclocal.m4	Fri Apr 25 11:25:34 2003
>X@@ -36,10 +36,10 @@
>X AC_REQUIRE([AC_ARG_PROGRAM])
>X dnl FIXME This is truly gross.
>X missing_dir=`cd $ac_aux_dir && pwd`
>X-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
>X-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
>X-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
>X-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
>X+AM_MISSING_PROG(ACLOCAL, ${ACLOCAL})
>X+AM_MISSING_PROG(AUTOCONF, ${AUTOCONF})
>X+AM_MISSING_PROG(AUTOMAKE, ${AUTOMAKE})
>X+AM_MISSING_PROG(AUTOHEADER, ${AUTOHEADER})
>X AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
>X AC_REQUIRE([AC_PROG_MAKE_SET])])
>X 
>X@@ -123,7 +123,8 @@
>X AC_CACHE_LOAD
>X 
>X # This can be used to rebuild libtool when needed
>X-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
>X+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
>X+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
>X 
>X # Always use our own libtool.
>X LIBTOOL='$(SHELL) $(top_builddir)/libtool'
>END-of-x11-toolkits/freeglut/files/patch-aclocal.m4
>echo x - x11-toolkits/freeglut/files/patch-genfonts::Makefile.am
>sed 's/^X//' >x11-toolkits/freeglut/files/patch-genfonts::Makefile.am << 'END-of-x11-toolkits/freeglut/files/patch-genfonts::Makefile.am'
>X--- genfonts/Makefile.am.orig	Sat Jan  8 23:02:55 2000
>X+++ genfonts/Makefile.am	Fri Apr 25 00:32:08 2003
>X@@ -3,6 +3,6 @@
>X bin_PROGRAMS      = genfonts genstroke
>X genfonts_SOURCES  = genfonts.c
>X genstroke_SOURCES = genstroke.c
>X-genfonts_LDADD    = -L/usr/X11R6/lib -lglib -lX11 -lXext
>X-genstroke_LDADD   = -lglib
>X+genfonts_LDADD    = -L%%X11BASE%%/lib -lglib12 -lX11 -lXext
>X+genstroke_LDADD   = -lglib12
>X EXTRA_DIST        = genfonts.c genstroke.c
>END-of-x11-toolkits/freeglut/files/patch-genfonts::Makefile.am
>echo x - x11-toolkits/freeglut/files/patch-configure.in
>sed 's/^X//' >x11-toolkits/freeglut/files/patch-configure.in << 'END-of-x11-toolkits/freeglut/files/patch-configure.in'
>X--- configure.in.orig	Sat Jan 26 05:22:54 2002
>X+++ configure.in	Fri Apr 25 11:35:52 2003
>X@@ -9,8 +9,7 @@
>X AC_C_CONST
>X AC_EXEEXT
>X AC_PROG_RANLIB
>X-AC_LIBTOOL_DLOPEN
>X-AM_PROG_LIBTOOL
>X+AC_PROG_LIBTOOL
>X AC_SUBST(LIBTOOL_DEPS)
>X 
>X dnl Checks for libraries.
>END-of-x11-toolkits/freeglut/files/patch-configure.in
>echo x - x11-toolkits/freeglut/Makefile
>sed 's/^X//' >x11-toolkits/freeglut/Makefile << 'END-of-x11-toolkits/freeglut/Makefile'
>X# New ports collection makefile for:	freeglut
>X# Date created:		Wed Apr 23 2003
>X# Whom:			thierry@pompo.net
>X#
>X# $FreeBSD$
>X#
>X
>XPORTNAME=	freeglut
>XPORTVERSION=	1.3
>XCATEGORIES=	x11-toolkits
>XMASTER_SITES=	http://${PORTNAME}.sourceforge.net/
>XDISTNAME=	${PORTNAME}-${PORTVERSION}-${SNAPDATE}
>X
>XMAINTAINER=	ports@FreeBSD.org
>XCOMMENT=	An alternative to the OpenGL Utility Toolkit (GLUT) library
>X
>XSNAPDATE=	2002-01-25
>X
>XUSE_AUTOMAKE=	yes
>XHAS_CONFIGURE=	yes
>XUSE_LIBTOOL=	yes
>XINSTALLS_SHLIB=	yes
>XUSE_XLIB=	yes
>XUSE_GNOME=	glib12
>XCONFIGURE_ARGS=	--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
>XCONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include `${GLIB_CONFIG} --cflags`"	\
>X		LDFLAGS="`${GLIB_CONFIG} --libs`"
>X
>XWRKSRC=		${WRKDIR}/${PORTNAME}-0.1
>X
>XUSE_REINPLACE=	yes
>XREINPLACE_ARGS=	-i ""
>X
>XMK2X11=		freeglut-1.3/Makefile.am genfonts/Makefile.am
>X
>Xpost-patch:
>X.for file in ${MK2X11}
>X	@${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/${file}
>X.endfor
>X
>Xpost-install:
>X	@${ECHO_MSG}
>X	@${ECHO_MSG} "     freeglut requires a DRI enabled-graphic card;"
>X	@${ECHO_MSG} "     You may try to run the program 'one' to check your installation."
>X	@${ECHO_MSG}
>X
>X.include <bsd.port.mk>
>END-of-x11-toolkits/freeglut/Makefile
>echo x - x11-toolkits/freeglut/distinfo
>sed 's/^X//' >x11-toolkits/freeglut/distinfo << 'END-of-x11-toolkits/freeglut/distinfo'
>XMD5 (freeglut-1.3-2002-01-25.tar.gz) = dbb63a579ba68ee9a1ddecdd9cddc1f2
>END-of-x11-toolkits/freeglut/distinfo
>echo x - x11-toolkits/freeglut/pkg-descr
>sed 's/^X//' >x11-toolkits/freeglut/pkg-descr << 'END-of-x11-toolkits/freeglut/pkg-descr'
>Xfreeglut is a completely OpenSourced alternative to the OpenGL Utility
>XToolkit (GLUT) library. GLUT was originally written by Mark Kilgard to
>Xsupport the sample programs in the second edition OpenGL 'RedBook'.
>XSince then, GLUT has been used in a wide variety of practical applications
>Xbecause it is simple, universally available and highly portable.
>X
>XGLUT (and hence freeglut) allows the user to create and manage windows
>Xcontaining OpenGL contexts on a wide range of platforms and also read the
>Xmouse, keyboard and joystick functions.
>X
>Xfreeglut is released under the X-Consortium license.
>X
>XWWW: http://freeglut.sourceforge.net/
>END-of-x11-toolkits/freeglut/pkg-descr
>echo x - x11-toolkits/freeglut/pkg-plist
>sed 's/^X//' >x11-toolkits/freeglut/pkg-plist << 'END-of-x11-toolkits/freeglut/pkg-plist'
>Xbin/genfonts
>Xbin/genstroke
>Xbin/one
>Xinclude/GL/freeglut.h
>Xlib/libfreeglut-1.3.so.0
>Xlib/libfreeglut-1.3.so
>Xlib/libfreeglut-1.3.a
>X@dirrm include/GL
>END-of-x11-toolkits/freeglut/pkg-plist
>exit

Actions: View

Attachments on bug 51453: 30602