12 files changed, 144 insertions, 154 deletions

diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index 8786e74dc6e1..a6a9f94accbb 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -5,43 +5,68 @@
 # $FreeBSD$
 #
 
-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 --git a/graphics/freeglut/distinfo b/graphics/freeglut/distinfo
index e1a6d3a707ff..08804cae1c2b 100644
--- a/graphics/freeglut/distinfo
+++ b/graphics/freeglut/distinfo
@@ -1 +1 @@
-MD5 (freeglut-1.3-2002-01-25.tar.gz) = dbb63a579ba68ee9a1ddecdd9cddc1f2
+MD5 (freeglut-2.0.0.tar.gz) = 06ab94ab2fbbce61644780e1d746bf34
diff --git a/graphics/freeglut/files/patch-aclocal.m4 b/graphics/freeglut/files/patch-aclocal.m4
index 32ea07f4c2e4..e577623d2ff3 100644
--- a/graphics/freeglut/files/patch-aclocal.m4
+++ b/graphics/freeglut/files/patch-aclocal.m4
@@ -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 --git a/graphics/freeglut/files/patch-configure.in b/graphics/freeglut/files/patch-configure.in
index 6c263eaf6ef7..be7bb60f73f6 100644
--- a/graphics/freeglut/files/patch-configure.in
+++ b/graphics/freeglut/files/patch-configure.in
@@ -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 --git a/graphics/freeglut/files/patch-freeglut-1.3::Makefile.am b/graphics/freeglut/files/patch-freeglut-1.3::Makefile.am
deleted file mode 100644
index 689c09f320e2..000000000000
--- a/graphics/freeglut/files/patch-freeglut-1.3::Makefile.am
+++ /dev/null
@@ -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 --git a/graphics/freeglut/files/patch-freeglut-1.3::freeglut_joystick.c b/graphics/freeglut/files/patch-freeglut-1.3::freeglut_joystick.c
deleted file mode 100644
index ac3b2bc15fb6..000000000000
--- a/graphics/freeglut/files/patch-freeglut-1.3::freeglut_joystick.c
+++ /dev/null
@@ -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 --git a/graphics/freeglut/files/patch-genfonts::Makefile.am b/graphics/freeglut/files/patch-genfonts::Makefile.am
deleted file mode 100644
index a593b966ee59..000000000000
--- a/graphics/freeglut/files/patch-genfonts::Makefile.am
+++ /dev/null
@@ -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 --git a/graphics/freeglut/files/patch-progs::demos::Fractals::fractals.c b/graphics/freeglut/files/patch-progs::demos::Fractals::fractals.c
new file mode 100644
index 000000000000..89a3ebe7af57
--- /dev/null
+++ b/graphics/freeglut/files/patch-progs::demos::Fractals::fractals.c
@@ -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 --git a/graphics/freeglut/files/patch-progs::demos::Fractals_random::fractals_random.c b/graphics/freeglut/files/patch-progs::demos::Fractals_random::fractals_random.c
new file mode 100644
index 000000000000..6c57c49b571b
--- /dev/null
+++ b/graphics/freeglut/files/patch-progs::demos::Fractals_random::fractals_random.c
@@ -0,0 +1,20 @@
+--- progs/demos/Fractals_random/fractals_random.c.orig	Tue Sep 23 07:17:13 2003
++++ progs/demos/Fractals_random/fractals_random.c	Sat Oct  4 02:43:15 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 --git a/graphics/freeglut/files/patch-progs::demos::Lorenz::lorenz.c b/graphics/freeglut/files/patch-progs::demos::Lorenz::lorenz.c
new file mode 100644
index 000000000000..43c9adda3bec
--- /dev/null
+++ b/graphics/freeglut/files/patch-progs::demos::Lorenz::lorenz.c
@@ -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 --git a/graphics/freeglut/files/patch-progs::demos::One::one.c b/graphics/freeglut/files/patch-progs::demos::One::one.c
new file mode 100644
index 000000000000..580d5048e036
--- /dev/null
+++ b/graphics/freeglut/files/patch-progs::demos::One::one.c
@@ -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 --git a/graphics/freeglut/pkg-plist b/graphics/freeglut/pkg-plist
index 263f0a6f4fe5..c27f90b0525c 100644
--- a/graphics/freeglut/pkg-plist
+++ b/graphics/freeglut/pkg-plist
@@ -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%%