- Update to 6.0.b6.0 (6.0 Beta 6.0)

- Pass maintainership to submitter
- Fix build with GCC 4.1
  http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.7.2006092721/glclock-5.0_2.log

PR:		ports/103880
Submitted by:	trasz <trasz at pin.if.uz.zgora.pl>

9 files changed, 155 insertions, 74 deletions

diff --git a/x11-clocks/glclock/Makefile b/x11-clocks/glclock/Makefile
index 42899cfda36e..677b3b9d011b 100644
--- a/x11-clocks/glclock/Makefile
+++ b/x11-clocks/glclock/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	glclock
-PORTVERSION=	5.0
-PORTREVISION=	2
+DISTVERSION=	6.0b6.0
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.daionet.gr.jp/~masa/archives/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	OpenGL Spinning pocketwatch demo and benchmark utility
+MAINTAINER=	trasz@pin.if.uz.zgora.pl
+COMMENT=	OpenGL spinning pocket watch demo and benchmark utility
 
 LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
 
@@ -21,31 +20,48 @@ USE_GL=		yes
 MAKEFILE=	makefile
 MAKE_ARGS=	CC="${CXX}" LN="${CXX}" OPT="${OPT}" \
 		INCLUDE_PATH="-I${X11BASE}/include" \
-		LIB_PATH="-L${X11BASE}/lib" LIBS="${LIBS}"
-ALL_TARGET=	${PORTNAME}
+		LIB_PATH="-L${X11BASE}/lib"
 
-OPT=		${CXXFLAGS} ${PTHREAD_CFLAGS} \
-		-DGLCLOCK_DIR="\\\"${PREFIX}/lib/X11/glclock/\\\""
-LIBS=		-lglut -lGLU -lGL -lXext -lXmu -lX11 -lm -lXi ${PTHREAD_LIBS}
+OPT=		-DIMAGE_PATH="\\\"${PREFIX}/lib/X11/glclock/\\\"" \
+		${CFLAGS}
 
-SCRIPTS=	benchclock crystalclock f_crystalclock f_glclock	\
-	  f_marbleclock f_metalclock f_mwclock f_woodclock marbleclock	\
-	  metalclock mwclock woodclock
+PROGRAMS=	glclock glclockmark
 
-TEXTURES=	marble.ppm sky.ppm wood.ppm
+SCRIPTS=	chromeclock chromeclock_L crystalclock crystalclock_L \
+		glclock_L glclockmark_ALL marbleclock marbleclock_L \
+		metalclock metalclock_L mwclock mwclock_L woodclock \
+		woodclock_L
+
+TEXTURES=	light.ppm marble.ppm sky.ppm wood.ppm detail.pgm \
+		detail2.pgm detail_b.pgm filter.pgm
+
+PLIST_FILES=
+.for f in ${PROGRAMS}
+PLIST_FILES+=	bin/${f}
+.endfor
+.for f in ${SCRIPTS}
+PLIST_FILES+=	bin/${f}
+.endfor
+.for f in ${TEXTURES}
+PLIST_FILES+=	lib/X11/glclock/${f}
+.endfor
+
+PLIST_DIRS=	lib/X11/glclock
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
-CXXFLAGS+=	-O3 -fexpensive-optimizations \
+CFLAGS+=	-O3 -fexpensive-optimizations \
 		-fomit-frame-pointer -fforce-mem -fforce-addr
 .if (${ARCH} != "alpha")
-CXXFLAGS+=	-ffast-math
+CFLAGS+=	-ffast-math
 .endif
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/glclock ${PREFIX}/bin
+.for f in ${PROGRAMS}
+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin
+.endfor
 .for f in ${SCRIPTS}
 	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin
 .endfor
diff --git a/x11-clocks/glclock/distinfo b/x11-clocks/glclock/distinfo
index f554b7bf77e1..8ce5e7009781 100644
--- a/x11-clocks/glclock/distinfo
+++ b/x11-clocks/glclock/distinfo
@@ -1,3 +1,3 @@
-MD5 (glclock-5.0.tar.gz) = 191938e1fb9fc1105eaf29e8e7dd954f
-SHA256 (glclock-5.0.tar.gz) = 2fef933930795b43cb10581af3fae76300c3b4b676b3d7d375ca6b586bc187eb
-SIZE (glclock-5.0.tar.gz) = 530737
+MD5 (glclock-6.0b6.0.tar.gz) = 3229946a32f35c083c5ca0f0983c580f
+SHA256 (glclock-6.0b6.0.tar.gz) = 7636e53db08c2c955742590abb62d0b61eee791a801e528892b9269fe05a1fc7
+SIZE (glclock-6.0b6.0.tar.gz) = 811803
diff --git a/x11-clocks/glclock/files/patch-GLObject.H b/x11-clocks/glclock/files/patch-GLObject.H
new file mode 100644
index 000000000000..fb077d7fb10e
--- /dev/null
+++ b/x11-clocks/glclock/files/patch-GLObject.H
@@ -0,0 +1,11 @@
+--- GLObject.H.orig	Sun Oct  1 20:06:31 2006
++++ GLObject.H	Sun Oct  1 20:06:40 2006
+@@ -11,7 +11,7 @@
+ #pragma warning(disable : 4051)     // ALPHA
+ #endif
+ 
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "GLextensions.H"
+ #include "PnmIO.H"
diff --git a/x11-clocks/glclock/files/patch-GLextensions.H b/x11-clocks/glclock/files/patch-GLextensions.H
new file mode 100644
index 000000000000..484d6200f53a
--- /dev/null
+++ b/x11-clocks/glclock/files/patch-GLextensions.H
@@ -0,0 +1,53 @@
+--- GLextensions.H.orig	Thu Jun 22 16:36:07 2000
++++ GLextensions.H	Sun Oct  1 20:52:59 2006
+@@ -12,6 +12,7 @@
+ #pragma warning(disable : 4051)     // ALPHA
+ #endif
+ 
++#define GL_GLEXT_PROTOTYPES
+ 
+ #include <GL/gl.h>
+ #include <GL/glut.h>
+@@ -202,7 +203,7 @@
+ 
+ 
+ // multitexture をサポートするバージョン（未定）
+-#ifdef  GL_VERSION_1_
++#if 1
+ #define GL_VERSION_multitexture
+ #endif
+ #define GL_VERSION_multitexture_F		9999.9f
+@@ -232,13 +233,13 @@
+ #define GL_VERSION_polygon_offset_F		1.1f
+ 
+ // texture_cube_map をサポートするバージョン（未定）
+-#ifdef  GL_VERSION_1_
++#if 1
+ #define GL_VERSION_texture_cube_map
+ #endif
+ #define GL_VERSION_texture_cube_map_F	9999.9f
+ 
+ // texture_compression をサポートするバージョン（未定）
+-#ifdef  GL_VERSION_1_
++#if 1
+ #define GL_VERSION_texture_compression
+ #endif
+ #define GL_VERSION_texture_compression_F	9999.9f
+@@ -592,6 +593,8 @@
+ 
+ #endif	// #ifndef GL_ARB_texture_cube_map
+ 
++#define GL_EXT_texture_cube_map
++
+ // EXT_texture_cube_map
+ #ifndef GL_EXT_texture_cube_map
+ #define GL_EXT_texture_cube_map
+@@ -687,6 +690,8 @@
+ #define GL_COMPRESSED_RGBA_S3TC_DXT3		((GLenum)0x83F2)
+ #define GL_COMPRESSED_RGBA_S3TC_DXT5		((GLenum)0x83F3)
+ #endif	// #ifndef GL_VERSION_texture_compression_s3tc
++
++#define GL_EXT_texture_compression_s3tc
+ 
+ #ifndef GL_EXT_texture_compression_s3tc
+ #define GL_EXT_texture_compression_s3tc
diff --git a/x11-clocks/glclock/files/patch-MString.H b/x11-clocks/glclock/files/patch-MString.H
new file mode 100644
index 000000000000..dc45ba8df70c
--- /dev/null
+++ b/x11-clocks/glclock/files/patch-MString.H
@@ -0,0 +1,30 @@
+--- MString.H.orig	Thu Jun 22 16:58:26 2000
++++ MString.H	Sun Oct  1 22:32:31 2006
+@@ -66,7 +66,7 @@
+ #ifndef ___STRING_H___
+ #define ___STRING_H___
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -75,6 +75,7 @@
+ 
+ #include "Define.H"
+ 
++using namespace std;
+ 
+ //#define STRING_DEBUG
+ 
+@@ -407,6 +408,10 @@
+     friend String& Cut(String      s) ;
+     friend String& Cut(const char *s) ;
+ } ;
++
++String Mid(String, int, int) ;
++String Left(const String&, int) ;
++String Right(const String&, int) ;
+ 
+ // 整数から String へ
+ String IntToString(int i) ;
diff --git a/x11-clocks/glclock/files/patch-ab b/x11-clocks/glclock/files/patch-ab
deleted file mode 100644
index e4db8b07a56e..000000000000
--- a/x11-clocks/glclock/files/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
---- ORIG/glclock.cpp	Wed Aug  4 16:28:02 1999
-+++ glclock.cpp	Mon Sep 20 20:06:09 1999
-@@ -5716,7 +5716,10 @@
- 	o_tick = n_tick ;
- 
- 	if ((n_tick = glutGet((GLenum)GLUT_ELAPSED_TIME)))
--		fps = f_cnt / ((float)(n_tick - o_tick) / 1000) ;
-+		if ( n_tick == o_tick )
-+			fps = 0.0f;
-+		else
-+			fps = f_cnt / ((float)(n_tick - o_tick) / 1000) ;
- 	else
- 		fps = 0.0f ;
- 
-@@ -5768,7 +5771,8 @@
- 	{
- 		if (fps_count)
- 		{
--			spin_x = -360.0f / fps ;
-+			if (fps) spin_x = -360.0f / fps ;
-+			else     spin_x = -30.0f;
- 			if (spin_x < -30.0f) spin_x = -30.0f ;
- 		}
- 
-@@ -7098,6 +7102,13 @@
- 	if (!env_file.Search(".ppm"))   env_file   += ".ppm" ;
- 	if (!solid_file.Search(".ppm")) solid_file += ".ppm" ;
- 	if (sld2_file != String("") && !sld2_file.Search(".ppm")) sld2_file += ".ppm" ;
-+
-+	if ( env_file.Length() && env_file.Character(0) != '/' ) \
-+		env_file = String( GLCLOCK_DIR ) + env_file;
-+	if ( solid_file.Length() && solid_file.Character(0) != '/' ) \
-+		solid_file = String( GLCLOCK_DIR ) + solid_file;
-+	if ( sld2_file.Length() && sld2_file.Character(0) != '/' ) \
-+		sld2_file = String( GLCLOCK_DIR ) + sld2_file;
- 
- 
- 	// 環境マッピングを使用する場合は、メッシュの座標値を多少変更
diff --git a/x11-clocks/glclock/files/patch-glclock.H b/x11-clocks/glclock/files/patch-glclock.H
new file mode 100644
index 000000000000..cdcc4198851c
--- /dev/null
+++ b/x11-clocks/glclock/files/patch-glclock.H
@@ -0,0 +1,11 @@
+--- glclock.H.orig	Sun Oct  1 21:29:41 2006
++++ glclock.H	Sun Oct  1 21:29:57 2006
+@@ -279,7 +279,7 @@
+ #define DEFAULT_GAME_MODE_STRING	""
+ 
+ // デフォルトイメージパス
+-#define IMAGE_PATH			""
++//#define IMAGE_PATH			""
+ 
+ // スピン関係初期値
+ #define SPIN_X		-18.0f
diff --git a/x11-clocks/glclock/files/patch-makefile b/x11-clocks/glclock/files/patch-makefile
new file mode 100644
index 000000000000..82ce366bb6a1
--- /dev/null
+++ b/x11-clocks/glclock/files/patch-makefile
@@ -0,0 +1,15 @@
+--- makefile.orig	Sun Jun 18 16:37:40 2000
++++ makefile	Sun Oct  1 20:39:39 2006
+@@ -11,9 +11,9 @@
+     TARGET_MARK = glclockmark
+ 
+ 
+-       COMPILER = g++ -c
+-         LINKER = g++
+-            OPT = -O2
++       COMPILER = $(CXX) -c
++         LINKER = $(CXX)
++            OPT = $(CFLAGS)
+ 
+    INCLUDE_PATH = -I/usr/X11R6/include
+        LIB_PATH = -L/usr/X11R6/lib
diff --git a/x11-clocks/glclock/pkg-plist b/x11-clocks/glclock/pkg-plist
deleted file mode 100644
index ada4c5e3845e..000000000000
--- a/x11-clocks/glclock/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-bin/benchclock
-bin/crystalclock
-bin/f_crystalclock
-bin/f_glclock
-bin/f_marbleclock
-bin/f_metalclock
-bin/f_mwclock
-bin/f_woodclock
-bin/glclock
-bin/marbleclock
-bin/metalclock
-bin/mwclock
-bin/woodclock
-lib/X11/glclock/marble.ppm
-lib/X11/glclock/sky.ppm
-lib/X11/glclock/wood.ppm
-@dirrm lib/X11/glclock