Index: head/x11-clocks/glclock/Makefile =================================================================== --- head/x11-clocks/glclock/Makefile (revision 414878) +++ head/x11-clocks/glclock/Makefile (revision 414879) @@ -1,51 +1,51 @@ # Created by: Randall Hopper # $FreeBSD$ PORTNAME= glclock DISTVERSION= 6.0b6.0 PORTREVISION= 5 CATEGORIES= x11-clocks MASTER_SITES= http://www.daionet.gr.jp/~masa/archives/ MAINTAINER= ports@FreeBSD.org COMMENT= OpenGL spinning pocket watch demo and benchmark utility USE_XORG= xi xmu xext x11 USE_GL= gl glu glut MAKEFILE= makefile CFLAGS+= -DIMAGE_PATH="\\\"${PREFIX}/lib/X11/glclock/\\\"" PLIST_FILES= ${PROGRAMS:S,^,bin/,} ${SCRIPTS:S,^,bin/,} \ ${TEXTURES:S,^,lib/X11/glclock/,} OPTIONS_DEFINE= OPTIMIZED_CFLAGS OPTIMIZED_CFLAGS_CFLAGS=\ -O3 -fexpensive-optimizations -ffast-math \ - -fomit-frame-pointer -fforce-mem -fforce-addr + -fomit-frame-pointer PROGRAMS= glclock glclockmark 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 post-patch: @${REINPLACE_CMD} -e \ 's|g\+\+|$${CXX}| ; \ s|-O2|$${CXXFLAGS}| ; \ s|/usr/X11R6|$${LOCALBASE}|' ${WRKSRC}/${MAKEFILE} @${REINPLACE_CMD} -e 's|glPolygonOffsetEXT|glPolygonOffset|' \ ${WRKSRC}/GLextensions.cpp do-install: ${INSTALL_PROGRAM} ${PROGRAMS:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/glclock ${INSTALL_DATA} ${TEXTURES:S,^,${WRKSRC}/,} \ ${STAGEDIR}${PREFIX}/lib/X11/glclock .include Index: head/x11-clocks/glclock/files/patch-GLObject.H =================================================================== --- head/x11-clocks/glclock/files/patch-GLObject.H (revision 414878) +++ head/x11-clocks/glclock/files/patch-GLObject.H (revision 414879) @@ -1,11 +1,11 @@ ---- GLObject.H.orig Sun Oct 1 20:06:31 2006 -+++ GLObject.H Sun Oct 1 20:06:40 2006 +--- GLObject.H.orig 2000-06-22 14:36:07 UTC ++++ GLObject.H @@ -11,7 +11,7 @@ #pragma warning(disable : 4051) // ALPHA #endif -#include +#include #include "GLextensions.H" #include "PnmIO.H" Index: head/x11-clocks/glclock/files/patch-GLextensions.H =================================================================== --- head/x11-clocks/glclock/files/patch-GLextensions.H (revision 414878) +++ head/x11-clocks/glclock/files/patch-GLextensions.H (revision 414879) @@ -1,53 +1,53 @@ ---- GLextensions.H.orig Thu Jun 22 16:36:07 2000 -+++ GLextensions.H Sun Oct 1 20:52:59 2006 +--- GLextensions.H.orig 2000-06-22 14:36:07 UTC ++++ GLextensions.H @@ -12,6 +12,7 @@ #pragma warning(disable : 4051) // ALPHA #endif +#define GL_GLEXT_PROTOTYPES #include #include -@@ -202,7 +203,7 @@ +@@ -202,7 +203,7 @@ float GetOpenGLVersion() ; // multitexture をサポートするバージョン（未定） -#ifdef GL_VERSION_1_ +#if 1 #define GL_VERSION_multitexture #endif #define GL_VERSION_multitexture_F 9999.9f -@@ -232,13 +233,13 @@ +@@ -232,13 +233,13 @@ float GetOpenGLVersion() ; #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 @@ +@@ -592,6 +593,8 @@ char *IsSupported_multitexture(int flag_ #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) +@@ -688,6 +691,8 @@ char *IsSupported_texture_compression_En #define GL_COMPRESSED_RGBA_S3TC_DXT5 ((GLenum)0x83F3) #endif // #ifndef GL_VERSION_texture_compression_s3tc -+ -+#define GL_EXT_texture_compression_s3tc ++#define GL_EXT_texture_compression_s3tc ++ #ifndef GL_EXT_texture_compression_s3tc #define GL_EXT_texture_compression_s3tc + Index: head/x11-clocks/glclock/files/patch-MString.H =================================================================== --- head/x11-clocks/glclock/files/patch-MString.H (revision 414878) +++ head/x11-clocks/glclock/files/patch-MString.H (revision 414879) @@ -1,38 +1,38 @@ ---- MString.H.orig 2000-06-22 23:58:26.000000000 +0900 -+++ MString.H 2014-04-01 01:01:42.000000000 +0900 +--- MString.H.orig 2000-06-22 14:58:26 UTC ++++ MString.H @@ -66,7 +66,7 @@ #ifndef ___STRING_H___ #define ___STRING_H___ -#include +#include #include #include #include @@ -75,6 +75,7 @@ #include "Define.H" +using namespace std; //#define STRING_DEBUG -@@ -307,15 +308,15 @@ +@@ -307,15 +308,15 @@ class String // m 文字目から n 文字 String& Mid(int m, int n = 1) ; - friend String Mid(String s, int m, int n = 1) ; + friend String Mid(String s, int m, int n) ; // 左から n 文字 String& Left(int n = 1) ; - friend String Left(const String& s, int n = 1) ; + friend String Left(const String& s, int n) ; // 右から n 文字 String& Right(int n = 1) ; - friend String Right(const String& s, int n = 1) ; + friend String Right(const String& s, int n) ; String FileDirectory() const ; String FileNamePart() const ; Index: head/x11-clocks/glclock/files/patch-MString.cpp =================================================================== --- head/x11-clocks/glclock/files/patch-MString.cpp (revision 414878) +++ head/x11-clocks/glclock/files/patch-MString.cpp (revision 414879) @@ -1,12 +1,12 @@ ---- MString.cpp.orig +--- MString.cpp.orig 2000-06-22 14:58:41 UTC +++ MString.cpp @@ -1,6 +1,9 @@ #include "MString.H" +String Left(const String &, int); +String Mid(String, int, int); +String Right(const String &, int); // コンストラクタ String::String(int n) Index: head/x11-clocks/glclock/files/patch-glclock.H =================================================================== --- head/x11-clocks/glclock/files/patch-glclock.H (revision 414878) +++ head/x11-clocks/glclock/files/patch-glclock.H (revision 414879) @@ -1,11 +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 @@ +--- glclock.H.orig 2000-06-23 03:16:20 UTC ++++ glclock.H +@@ -279,7 +279,7 @@ typedef int (APIENTRY * PFNGLCLOCKARGPRO #define DEFAULT_GAME_MODE_STRING "" // デフォルトイメージパス -#define IMAGE_PATH "" +//#define IMAGE_PATH "" // スピン関係初期値 #define SPIN_X -18.0f