ports/103880: [PATCH] x11-clocks/glclock: update to 6.0b6.0, take maintainership
trasz
trasz at pin.if.uz.zgora.pl
Sun Oct 1 21:00:32 UTC 2006
>Number: 103880
>Category: ports
>Synopsis: [PATCH] x11-clocks/glclock: update to 6.0b6.0, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 01 21:00:31 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: trasz
>Release: FreeBSD 6.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sat Jun 3 01:12:10 CEST
>Description:
- Update to 6.0b6.0
- Take maintainership
- Fix build with gcc-4.1 (http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.7.2006092721/glclock-5.0_2.log)
Added file(s):
- files/patch-GLObject.H
- files/patch-GLextensions.H
- files/patch-MString.H
- files/patch-glclock.H
- files/patch-makefile
Removed file(s):
- files/patch-ab
- pkg-plist
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- glclock-6.0b6.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11-clocks/glclock/Makefile /home/trasz/glclock/Makefile
--- /usr/ports/x11-clocks/glclock/Makefile Thu Jan 12 13:54:27 2006
+++ /home/trasz/glclock/Makefile Sun Oct 1 22:50:04 2006
@@ -2,17 +2,16 @@
# Date created: 20 September 1999
# Whom: Randall Hopper <aa8vb at ipass.net>
#
-# $FreeBSD: ports/x11-clocks/glclock/Makefile,v 1.13 2006/01/12 12:54:27 sem Exp $
+# $FreeBSD$
#
PORTNAME= glclock
-PORTVERSION= 5.0
-PORTREVISION= 2
+PORTVERSION= 6.0b6.0
CATEGORIES= x11-clocks
MASTER_SITES= http://www.daionet.gr.jp/~masa/archives/
-MAINTAINER= ports at FreeBSD.org
-COMMENT= OpenGL Spinning pocketwatch demo and benchmark utility
+MAINTAINER= trasz at 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 @@
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}
-
-SCRIPTS= benchclock crystalclock f_crystalclock f_glclock \
- f_marbleclock f_metalclock f_mwclock f_woodclock marbleclock \
- metalclock mwclock woodclock
+OPT= -DIMAGE_PATH="\\\"${PREFIX}/lib/X11/glclock/\\\"" \
+ ${CFLAGS}
-TEXTURES= marble.ppm sky.ppm wood.ppm
+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
+
+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 -ruN --exclude=CVS /usr/ports/x11-clocks/glclock/distinfo /home/trasz/glclock/distinfo
--- /usr/ports/x11-clocks/glclock/distinfo Fri Nov 25 20:16:29 2005
+++ /home/trasz/glclock/distinfo Sun Oct 1 22:50:04 2006
@@ -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 -ruN --exclude=CVS /usr/ports/x11-clocks/glclock/files/patch-GLObject.H /home/trasz/glclock/files/patch-GLObject.H
--- /usr/ports/x11-clocks/glclock/files/patch-GLObject.H Thu Jan 1 01:00:00 1970
+++ /home/trasz/glclock/files/patch-GLObject.H Sun Oct 1 22:50:03 2006
@@ -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 -ruN --exclude=CVS /usr/ports/x11-clocks/glclock/files/patch-GLextensions.H /home/trasz/glclock/files/patch-GLextensions.H
--- /usr/ports/x11-clocks/glclock/files/patch-GLextensions.H Thu Jan 1 01:00:00 1970
+++ /home/trasz/glclock/files/patch-GLextensions.H Sun Oct 1 22:50:03 2006
@@ -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 -ruN --exclude=CVS /usr/ports/x11-clocks/glclock/files/patch-MString.H /home/trasz/glclock/files/patch-MString.H
--- /usr/ports/x11-clocks/glclock/files/patch-MString.H Thu Jan 1 01:00:00 1970
+++ /home/trasz/glclock/files/patch-MString.H Sun Oct 1 22:50:03 2006
@@ -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 -ruN --exclude=CVS /usr/ports/x11-clocks/glclock/files/patch-ab /home/trasz/glclock/files/patch-ab
--- /usr/ports/x11-clocks/glclock/files/patch-ab Sun Sep 26 00:29:13 1999
+++ /home/trasz/glclock/files/patch-ab Thu Jan 1 01:00:00 1970
@@ -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 -ruN --exclude=CVS /usr/ports/x11-clocks/glclock/files/patch-glclock.H /home/trasz/glclock/files/patch-glclock.H
--- /usr/ports/x11-clocks/glclock/files/patch-glclock.H Thu Jan 1 01:00:00 1970
+++ /home/trasz/glclock/files/patch-glclock.H Sun Oct 1 22:50:03 2006
@@ -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 -ruN --exclude=CVS /usr/ports/x11-clocks/glclock/files/patch-makefile /home/trasz/glclock/files/patch-makefile
--- /usr/ports/x11-clocks/glclock/files/patch-makefile Thu Jan 1 01:00:00 1970
+++ /home/trasz/glclock/files/patch-makefile Sun Oct 1 22:50:03 2006
@@ -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 -ruN --exclude=CVS /usr/ports/x11-clocks/glclock/pkg-plist /home/trasz/glclock/pkg-plist
--- /usr/ports/x11-clocks/glclock/pkg-plist Sun Sep 26 00:29:13 1999
+++ /home/trasz/glclock/pkg-plist Thu Jan 1 01:00:00 1970
@@ -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
- at dirrm lib/X11/glclock
--- glclock-6.0b6.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list