Bug 57377 - x11-toolkits/freeglut: upgrading to 2.0.0.
Summary: x11-toolkits/freeglut: upgrading to 2.0.0.
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-09-30 00:10 UTC by Thierry Thomas
Modified: 2003-10-04 10:50 UTC (History)
0 users

See Also:

Attachments
freeglut.diff (14.74 KB, patch)
2003-09-30 00:10 UTC, Thierry Thomas 		no flags Details | Diff
file.diff (1.18 KB, patch)
2003-09-30 00:10 UTC, Thierry Thomas 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Thierry Thomas 2003-09-30 00:10:22 UTC 
	After seven release candidates, the 2.0.0 final has been released!

	Note: this PR also remove the dependence to freeglut-1.3 from TORCS 1.2.1.
	TORCS-1.2.2 is about to be released, and it uses freeglut 2.0.0 (I have a
	working port of TORCS-1.2.2-pre3 for those interested).

Fix: Please apply the following patches.

	New files:
	- patch-progs::demos::Fractals::fractals.c
	- patch-progs::demos::Fractals_random::fractals_random.c
	- patch-progs::demos::Lorenz::lorenz.c
	- patch-progs::demos::One::one.c
	+ pkg-message

	Removed files:
	- patch-freeglut-1.3::Makefile.am
	- patch-freeglut-1.3::freeglut_joystick.c
	- patch-genfonts::Makefile.am

	Remark: since this patch contains ^M, it might fail... In that case
	the full port is available at <http://pompo.net/ports/freeglut.tar.bz2>.
How-To-Repeat: 	N/A.
Comment 1 Thierry Thomas 2003-09-30 06:21:31 UTC 
Le Mar 30 sep 03 à  0:58:30 +0200, Thierry Thomas <thierry@pompo.net>
 écrivait :
> 
> >Number:         57377
> >Category:       ports
> >Synopsis:       x11-toolkits/freeglut: upgrading to 2.0.0.

Please, don't commit this PR: it's not $PREFIX clean => I shall
re-submit it.

Thanks.
-- 
Th. Thomas.
Comment 2 Thierry Thomas 2003-09-30 20:38:34 UTC 
Le Mar 30 sep 03 à  7:30:13 +0200, Thierry Thomas <thierry@pompo.net>
 écrivait :
>  Please, don't commit this PR: it's not $PREFIX clean => I shall
>  re-submit it.

Hereunder are the new patches. Same new files / removed files, and
<http://pompo.net/ports/freeglut-2.0.0.tar.bz2> has been updated.

--- freeglut.diff begins here ---
diff -urN x11-toolkits/freeglut.orig/Makefile x11-toolkits/freeglut/Makefile
--- x11-toolkits/freeglut.orig/Makefile	Tue May  6 00:16:26 2003
+++ x11-toolkits/freeglut/Makefile	Tue Sep 30 13:14:59 2003
@@ -5,43 +5,68 @@
 # $FreeBSD: ports/x11-toolkits/freeglut/Makefile,v 1.1 2003/05/05 22:16:26 anholt Exp $
 #
 
-PORTNAME=	freeglut
-PORTVERSION=	1.3
-CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://${PORTNAME}.sourceforge.net/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${SNAPDATE}
+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 `${GLIB_CONFIG} --cflags`"	\
-		LDFLAGS="`${GLIB_CONFIG} --libs`"
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.1
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include"			\
+		ACLOCAL="${ACLOCAL}"				\
+		AUTOCONF="${AUTOCONF}"				\
+		AUTOMAKE="${AUTOMAKE}"				\
+		AUTOHEADER="${AUTOHEADER}"
 
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 
-MK2X11=		freeglut-1.3/Makefile.am genfonts/Makefile.am
+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:
-.for file in ${MK2X11}
-	@${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/${file}
+	@${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|${PREFIX}|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}
-	@${ECHO_MSG} "     freeglut requires a DRI enabled-graphic card;"
-	@${ECHO_MSG} "     You may try to run the program 'one' to check your installation."
+	@${CAT} ${PKGMESSAGE} |	\
+		${SED} -e "s|/usr/local|${PREFIX}|"		\
+			-e "s|/usr/X11R6|${X11BASE}|"
 	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff -urN x11-toolkits/freeglut.orig/distinfo x11-toolkits/freeglut/distinfo
--- x11-toolkits/freeglut.orig/distinfo	Wed Apr 23 23:40:56 2003
+++ x11-toolkits/freeglut/distinfo	Mon Sep 29 22:46:14 2003
@@ -1 +1 @@
-MD5 (freeglut-1.3-2002-01-25.tar.gz) = dbb63a579ba68ee9a1ddecdd9cddc1f2
+MD5 (freeglut-2.0.0.tar.gz) = 06ab94ab2fbbce61644780e1d746bf34
diff -urN x11-toolkits/freeglut.orig/files/patch-aclocal.m4 x11-toolkits/freeglut/files/patch-aclocal.m4
--- x11-toolkits/freeglut.orig/files/patch-aclocal.m4	Fri Apr 25 11:25:50 2003
+++ x11-toolkits/freeglut/files/patch-aclocal.m4	Mon Sep 29 22:59:01 2003
@@ -1,26 +1,24 @@
---- aclocal.m4.orig	Sat Jan 26 05:23:11 2002
-+++ aclocal.m4	Fri Apr 25 11:25:34 2003
-@@ -36,10 +36,10 @@
- AC_REQUIRE([AC_ARG_PROGRAM])
- dnl FIXME This is truly gross.
- missing_dir=`cd $ac_aux_dir && pwd`
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
+--- 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, $missing_dir)
- AC_REQUIRE([AC_PROG_MAKE_SET])])
- 
-@@ -123,7 +123,8 @@
- AC_CACHE_LOAD
+ AM_MISSING_PROG(MAKEINFO, makeinfo)
+ AM_MISSING_PROG(AMTAR, tar)
+ AM_PROG_INSTALL_SH
+@@ -567,6 +567,7 @@
  
  # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+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.
diff -urN x11-toolkits/freeglut.orig/files/patch-configure.in x11-toolkits/freeglut/files/patch-configure.in
--- x11-toolkits/freeglut.orig/files/patch-configure.in	Fri Apr 25 11:36:29 2003
+++ x11-toolkits/freeglut/files/patch-configure.in	Mon Sep 22 21:20:21 2003
@@ -1,9 +1,9 @@
---- configure.in.orig	Sat Jan 26 05:22:54 2002
-+++ configure.in	Fri Apr 25 11:35:52 2003
-@@ -9,8 +9,7 @@
+--- configure.in.orig	Sat Sep 20 18:14:07 2003
++++ configure.in	Mon Sep 22 21:19:52 2003
+@@ -8,8 +8,7 @@
+ AC_PROG_CC
  AC_C_CONST
  AC_EXEEXT
- AC_PROG_RANLIB
 -AC_LIBTOOL_DLOPEN
 -AM_PROG_LIBTOOL
 +AC_PROG_LIBTOOL
diff -urN x11-toolkits/freeglut.orig/files/patch-freeglut-1.3::Makefile.am x11-toolkits/freeglut/files/patch-freeglut-1.3::Makefile.am
--- x11-toolkits/freeglut.orig/files/patch-freeglut-1.3::Makefile.am	Fri Apr 25 00:39:43 2003
+++ x11-toolkits/freeglut/files/patch-freeglut-1.3::Makefile.am	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- freeglut-1.3/Makefile.am.orig	Sun Jan 16 16:20:58 2000
-+++ freeglut-1.3/Makefile.am	Fri Apr 25 00:38:56 2003
-@@ -31,7 +31,7 @@
- #
- # Additional linker flags
- #	 
--libfreeglut_1_3_la_LIBADD = $(LIBM) -L/usr/X11R6/lib -lGL -lGLU -lXext -lX11 -lXxf86vm -lglib
-+libfreeglut_1_3_la_LIBADD = $(LIBM) -L%%X11BASE%%/lib -lGL -lGLU -lXext -lX11 -lXxf86vm -lglib12
- libfreeglut_1_3_la_LDFLAGS = -version-info 0:0:0
- 
- #
diff -urN x11-toolkits/freeglut.orig/files/patch-freeglut-1.3::freeglut_joystick.c x11-toolkits/freeglut/files/patch-freeglut-1.3::freeglut_joystick.c
--- x11-toolkits/freeglut.orig/files/patch-freeglut-1.3::freeglut_joystick.c	Tue May  6 00:16:26 2003
+++ x11-toolkits/freeglut/files/patch-freeglut-1.3::freeglut_joystick.c	Thu Jan  1 01:00:00 1970
@@ -1,87 +0,0 @@
---- 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
- 
diff -urN x11-toolkits/freeglut.orig/files/patch-genfonts::Makefile.am x11-toolkits/freeglut/files/patch-genfonts::Makefile.am
--- x11-toolkits/freeglut.orig/files/patch-genfonts::Makefile.am	Fri Apr 25 00:41:43 2003
+++ x11-toolkits/freeglut/files/patch-genfonts::Makefile.am	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- genfonts/Makefile.am.orig	Sat Jan  8 23:02:55 2000
-+++ genfonts/Makefile.am	Fri Apr 25 00:32:08 2003
-@@ -3,6 +3,6 @@
- bin_PROGRAMS      = genfonts genstroke
- genfonts_SOURCES  = genfonts.c
- genstroke_SOURCES = genstroke.c
--genfonts_LDADD    = -L/usr/X11R6/lib -lglib -lX11 -lXext
--genstroke_LDADD   = -lglib
-+genfonts_LDADD    = -L%%X11BASE%%/lib -lglib12 -lX11 -lXext
-+genstroke_LDADD   = -lglib12
- EXTRA_DIST        = genfonts.c genstroke.c
diff -urN x11-toolkits/freeglut.orig/files/patch-progs::demos::Fractals::fractals.c x11-toolkits/freeglut/files/patch-progs::demos::Fractals::fractals.c
--- x11-toolkits/freeglut.orig/files/patch-progs::demos::Fractals::fractals.c	Thu Jan  1 01:00:00 1970
+++ x11-toolkits/freeglut/files/patch-progs::demos::Fractals::fractals.c	Mon Sep 29 23:36:21 2003
@@ -0,0 +1,20 @@
+--- 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 -urN x11-toolkits/freeglut.orig/files/patch-progs::demos::Fractals_random::fractals_random.c x11-toolkits/freeglut/files/patch-progs::demos::Fractals_random::fractals_random.c
--- x11-toolkits/freeglut.orig/files/patch-progs::demos::Fractals_random::fractals_random.c	Thu Jan  1 01:00:00 1970
+++ x11-toolkits/freeglut/files/patch-progs::demos::Fractals_random::fractals_random.c	Mon Sep 29 23:37:41 2003
@@ -0,0 +1,20 @@
+--- 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);
diff -urN x11-toolkits/freeglut.orig/files/patch-progs::demos::Lorenz::lorenz.c x11-toolkits/freeglut/files/patch-progs::demos::Lorenz::lorenz.c
--- x11-toolkits/freeglut.orig/files/patch-progs::demos::Lorenz::lorenz.c	Thu Jan  1 01:00:00 1970
+++ x11-toolkits/freeglut/files/patch-progs::demos::Lorenz::lorenz.c	Mon Sep 22 21:53:11 2003
@@ -0,0 +1,11 @@
+--- progs/demos/Lorenz/lorenz.c.orig	Thu Jul 10 13:46:34 2003
++++ progs/demos/Lorenz/lorenz.c	Mon Sep 22 21:52:40 2003
+@@ -32,7 +32,7 @@
+ #include <string.h>
+ #include <math.h>
+ #include <time.h>
+-#include <GL/freeglut.h>
++#include "../../../include/GL/freeglut.h"
+ 
+ 
+ /************************************** Defined Constants ***************************************/
diff -urN x11-toolkits/freeglut.orig/files/patch-progs::demos::One::one.c x11-toolkits/freeglut/files/patch-progs::demos::One::one.c
--- x11-toolkits/freeglut.orig/files/patch-progs::demos::One::one.c	Thu Jan  1 01:00:00 1970
+++ x11-toolkits/freeglut/files/patch-progs::demos::One::one.c	Mon Sep 22 21:56:32 2003
@@ -0,0 +1,11 @@
+--- 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 -urN x11-toolkits/freeglut.orig/pkg-message x11-toolkits/freeglut/pkg-message
--- x11-toolkits/freeglut.orig/pkg-message	Thu Jan  1 01:00:00 1970
+++ x11-toolkits/freeglut/pkg-message	Mon Sep 29 23:43:25 2003
@@ -0,0 +1,10 @@
+******************************************************************
+freeglut requires a DRI 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 /usr/local/lib/
+and the original GLUT is installed under /usr/X11R6/lib/
+******************************************************************
diff -urN x11-toolkits/freeglut.orig/pkg-plist x11-toolkits/freeglut/pkg-plist
--- x11-toolkits/freeglut.orig/pkg-plist	Fri Apr 25 09:59:00 2003
+++ x11-toolkits/freeglut/pkg-plist	Mon Sep 29 23:53:24 2003
@@ -1,8 +1,22 @@
-bin/genfonts
-bin/genstroke
-bin/one
 include/GL/freeglut.h
-lib/libfreeglut-1.3.so.0
-lib/libfreeglut-1.3.so
-lib/libfreeglut-1.3.a
+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%%
--- freeglut.diff ends here ---

--- torcs.diff begins here ---
diff -urN games/torcs.orig/Makefile games/torcs/Makefile
--- games/torcs.orig/Makefile	Tue May  6 00:31:27 2003
+++ games/torcs/Makefile	Tue Sep 30 13:26:14 2003
@@ -7,6 +7,7 @@
 
 PORTNAME=	torcs
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,11 +24,7 @@
 BUILD_DEPENDS=	${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
 # doxygen would be required to build the doc (TODO?)
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
-.if !defined(WITHOUT_FREEGLUT)
-LIB_DEPENDS+=	freeglut-1.3.0:${PORTSDIR}/x11-toolkits/freeglut
-.else
 USE_MESA=	yes
-.endif
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
 
 GNU_CONFIGURE=	yes
@@ -66,11 +63,6 @@
 PLIST_SUB+=	K1999="@comment "
 .endif
 
-.if !defined(WITHOUT_FREEGLUT)
-CFLAGSD=	-DFREEGLUT
-CONFIGURE_ENV+=	USE_FREEGLUT=yes
-.endif
-
 2BCLEANED=	Make-config src/libs/txml/gennmtab/gennmtab.o
 BASH2FIX=	src/modules/telemetry/telemetry.sh src/tools/launcher/torcs.in	\
 		Make-default.mk robotgen		\
@@ -78,8 +70,6 @@
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "	You might define these options:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "	- WITHOUT_FREEGLUT: do not link against freeglut;"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "	- WITHOUT_BERNIW and WITHOUT_K1999: do not install optional"
 	@${ECHO_MSG} "	  robots."
--- torcs.diff ends here ---

Sorry for the inconvenience, but this is cleaner that way.

Regards,
-- 
Th. Thomas.
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2003-10-04 10:18:34 UTC 
State Changed
From-To: open->feedback

The file you have on your website (http://pompo.net/ports/freeglut.tar.bz2) 
is the 1.3 version.
Comment 4 Edwin Groothuis freebsd_committer freebsd_triage 2003-10-04 10:50:12 UTC 
State Changed
From-To: feedback->closed

Commited, thanks!