[Midnightbsd-cvs] mports [24770] U trunk/x11-clocks/glclock: bump and update patchset

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Jan 6 15:17:36 EST 2019 

Revision: 24770
          http://svnweb.midnightbsd.org/mports/?rev=24770
Author:   laffer1
Date:     2019-01-06 15:17:15 -0500 (Sun, 06 Jan 2019)
Log Message:
-----------
bump and update patchset

Modified Paths:
--------------
    trunk/x11-clocks/glclock/Makefile
    trunk/x11-clocks/glclock/files/patch-GLObject.H
    trunk/x11-clocks/glclock/files/patch-GLextensions.H
    trunk/x11-clocks/glclock/files/patch-MString.H
    trunk/x11-clocks/glclock/files/patch-glclock.H
    trunk/x11-clocks/glclock/pkg-descr

Added Paths:
-----------
    trunk/x11-clocks/glclock/files/patch-GLObject.cpp
    trunk/x11-clocks/glclock/files/patch-MString.cpp

Property Changed:
----------------
    trunk/x11-clocks/glclock/files/patch-GLObject.H
    trunk/x11-clocks/glclock/files/patch-GLextensions.H
    trunk/x11-clocks/glclock/files/patch-MString.H
    trunk/x11-clocks/glclock/files/patch-glclock.H
    trunk/x11-clocks/glclock/files/patch-makefile
    trunk/x11-clocks/glclock/pkg-descr

Modified: trunk/x11-clocks/glclock/Makefile
===================================================================
--- trunk/x11-clocks/glclock/Makefile	2019-01-06 20:10:17 UTC (rev 24769)
+++ trunk/x11-clocks/glclock/Makefile	2019-01-06 20:17:15 UTC (rev 24770)
@@ -2,6 +2,7 @@
 
 PORTNAME=	glclock
 DISTVERSION=	6.0b6.0
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.daionet.gr.jp/~masa/archives/
 
@@ -13,56 +14,39 @@
 USE_XORG=	xi xmu xext x11
 USE_GL=		gl glu glut
 MAKEFILE=	makefile
-MAKE_ARGS=	CC="${CXX}" LN="${CXX}" OPT="${OPT}" \
-		INCLUDE_PATH="-I${LOCALBASE}/include" \
-		LIB_PATH="-L${LOCALBASE}/lib"
 
-OPT=		-DIMAGE_PATH="\\\"${PREFIX}/lib/X11/glclock/\\\"" \
-		${CFLAGS}
+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
+
 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
+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
 
-PLIST_DIRS=	lib/X11/glclock
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+=	-O3 -fexpensive-optimizations \
-		-fomit-frame-pointer -fforce-mem -fforce-addr
-.if (${ARCH} != "alpha")
-CFLAGS+=	-ffast-math
-.endif
-.endif
-
 do-install:
-.for f in ${PROGRAMS}
-	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin
-.endfor
-.for f in ${SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin
-.endfor
-	@${MKDIR} ${PREFIX}/lib/X11/glclock
-.for f in ${TEXTURES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/X11/glclock
-.endfor
+	${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 <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/x11-clocks/glclock/files/patch-GLObject.H
===================================================================
--- trunk/x11-clocks/glclock/files/patch-GLObject.H	2019-01-06 20:10:17 UTC (rev 24769)
+++ trunk/x11-clocks/glclock/files/patch-GLObject.H	2019-01-06 20:17:15 UTC (rev 24770)
@@ -1,5 +1,5 @@
---- 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


Property changes on: trunk/x11-clocks/glclock/files/patch-GLObject.H
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/x11-clocks/glclock/files/patch-GLObject.cpp
===================================================================
--- trunk/x11-clocks/glclock/files/patch-GLObject.cpp	                        (rev 0)
+++ trunk/x11-clocks/glclock/files/patch-GLObject.cpp	2019-01-06 20:17:15 UTC (rev 24770)
@@ -0,0 +1,15 @@
+GLObject.cpp:843:22: error: non-constant-expression cannot be narrowed from type 'double' to 'GLfloat' (aka 'float') in initializer list [-Wc++11-narrowing]
+        GLfloat lamb[4] = { color[0] * 0.1, color[1] * 0.1, color[2] * 0.1, 1.0f } ;
+                                    ^~~~~~~~~~~~~~
+
+--- GLObject.cpp.orig	2018-07-09 11:47:42 UTC
++++ GLObject.cpp
+@@ -840,7 +840,7 @@ void SetDirectionalLight(GLenum light, GLfloat pos[4],
+ 						 GLfloat amb, GLfloat specularFlag, GLfloat bright, GLfloat *modulate)
+ {
+ 	GLfloat color[4] = { colorRGBA[0], colorRGBA[1], colorRGBA[2], 1.0f } ;	// colorRGBA[3] } ;
+-	GLfloat	lamb[4] = { color[0] * 0.1, color[1] * 0.1, color[2] * 0.1, 1.0f } ;
++	GLfloat	lamb[4] = { color[0] * 0.1f, color[1] * 0.1f, color[2] * 0.1f, 1.0f } ;
+ 	static GLfloat	u_pos[4] ;
+ 	static GLfloat	spec[4] = { 0.0f, 0.0f, 0.0f, 1.0f } ;
+ 


Property changes on: trunk/x11-clocks/glclock/files/patch-GLObject.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11-clocks/glclock/files/patch-GLextensions.H
===================================================================
--- trunk/x11-clocks/glclock/files/patch-GLextensions.H	2019-01-06 20:10:17 UTC (rev 24769)
+++ trunk/x11-clocks/glclock/files/patch-GLextensions.H	2019-01-06 20:17:15 UTC (rev 24770)
@@ -1,5 +1,5 @@
---- 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
@@ -8,7 +8,7 @@
  
  #include <GL/gl.h>
  #include <GL/glut.h>
-@@ -202,7 +203,7 @@
+@@ -202,7 +203,7 @@ float GetOpenGLVersion() ;
  
  
  // multitexture \xA4򥵥ݡ\xBC\xA5Ȥ\xB9\xA4\xEB\xA5С\xBC\xA5\xB8\xA5\xE7\xA5\xF3\xA1\xCA̤\xC4\xEA\xA1\xCB
@@ -17,7 +17,7 @@
  #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 \xA4򥵥ݡ\xBC\xA5Ȥ\xB9\xA4\xEB\xA5С\xBC\xA5\xB8\xA5\xE7\xA5\xF3\xA1\xCA̤\xC4\xEA\xA1\xCB
@@ -33,7 +33,7 @@
  #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
  
@@ -42,12 +42,12 @@
  // 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
+ 


Property changes on: trunk/x11-clocks/glclock/files/patch-GLextensions.H
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/x11-clocks/glclock/files/patch-MString.H
===================================================================
--- trunk/x11-clocks/glclock/files/patch-MString.H	2019-01-06 20:10:17 UTC (rev 24769)
+++ trunk/x11-clocks/glclock/files/patch-MString.H	2019-01-06 20:17:15 UTC (rev 24770)
@@ -1,5 +1,5 @@
---- MString.H.orig	Thu Jun 22 16:58:26 2000
-+++ MString.H	Sun Oct  1 22:32:31 2006
+--- MString.H.orig	2000-06-22 14:58:26 UTC
++++ MString.H
 @@ -66,7 +66,7 @@
  #ifndef ___STRING_H___
  #define ___STRING_H___
@@ -17,14 +17,22 @@
  
  //#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) ;
+@@ -307,15 +308,15 @@ class String
  
- // \xC0\xB0\xBF\xF4\xA4\xAB\xA4\xE9 String \xA4\xD8
- String IntToString(int i) ;
+     // m ʸ\xBB\xFA\xCCܤ\xAB\xA4\xE9 n ʸ\xBB\xFA
+     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) ;
+ 
+     // \xBA\xB8\xA4\xAB\xA4\xE9 n ʸ\xBB\xFA
+     String& Left(int n = 1) ;
+-    friend String Left(const String& s, int n = 1) ;
++    friend String Left(const String& s, int n) ;
+ 
+     // \xB1\xA6\xA4\xAB\xA4\xE9 n ʸ\xBB\xFA
+     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 ;


Property changes on: trunk/x11-clocks/glclock/files/patch-MString.H
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/x11-clocks/glclock/files/patch-MString.cpp
===================================================================
--- trunk/x11-clocks/glclock/files/patch-MString.cpp	                        (rev 0)
+++ trunk/x11-clocks/glclock/files/patch-MString.cpp	2019-01-06 20:17:15 UTC (rev 24770)
@@ -0,0 +1,12 @@
+--- 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);
+ 
+ // \xA5\xB3\xA5󥹥ȥ饯\xA5\xBF
+ String::String(int n)


Property changes on: trunk/x11-clocks/glclock/files/patch-MString.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11-clocks/glclock/files/patch-glclock.H
===================================================================
--- trunk/x11-clocks/glclock/files/patch-glclock.H	2019-01-06 20:10:17 UTC (rev 24769)
+++ trunk/x11-clocks/glclock/files/patch-glclock.H	2019-01-06 20:17:15 UTC (rev 24770)
@@ -1,6 +1,6 @@
---- 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	""
  
  // \xA5ǥե\xA9\xA5\xEB\xA5ȥ\xA4\xA5᡼\xA5\xB8\xA5ѥ\xB9


Property changes on: trunk/x11-clocks/glclock/files/patch-glclock.H
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-clocks/glclock/files/patch-makefile
===================================================================
--- trunk/x11-clocks/glclock/files/patch-makefile	2019-01-06 20:10:17 UTC (rev 24769)
+++ trunk/x11-clocks/glclock/files/patch-makefile	2019-01-06 20:17:15 UTC (rev 24770)

Property changes on: trunk/x11-clocks/glclock/files/patch-makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/x11-clocks/glclock/pkg-descr
===================================================================
--- trunk/x11-clocks/glclock/pkg-descr	2019-01-06 20:10:17 UTC (rev 24769)
+++ trunk/x11-clocks/glclock/pkg-descr	2019-01-06 20:17:15 UTC (rev 24770)
@@ -1,3 +1,3 @@
-glclock is a OpenGL demo with benchmarking capability.  For fun and 
-performance testing, glclock will be of some use for those who have 
-hardware-accelerated 3D cards (see people.FreeBSD.org/~3d) or very fast CPUs.
+glclock is a OpenGL demo with benchmarking capability.  For fun and
+performance testing, glclock will be of some use for those who have
+hardware-accelerated 3D cards, or fast CPUs.


Property changes on: trunk/x11-clocks/glclock/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property

More information about the Midnightbsd-cvs mailing list