- Fix build on -current New file: files/patch-MString.cpp Remove file: files/patch-makefile
Responsible Changed From-To: freebsd-ports-bugs->miwi miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Remake of the patch against current tree.
State Changed From-To: open->closed Committed. Thanks!
Author: miwi Date: Sat May 17 08:42:00 2014 New Revision: 354299 URL: http://svnweb.freebsd.org/changeset/ports/354299 QAT: https://qat.redports.org/buildarchive/r354299/ Log: - Fix build on -current PR: 188143 Submitted by: Ports Fury Added: head/x11-clocks/glclock/files/patch-MString.cpp (contents, props changed) Deleted: head/x11-clocks/glclock/files/patch-makefile Modified: head/x11-clocks/glclock/Makefile head/x11-clocks/glclock/files/patch-MString.H Modified: head/x11-clocks/glclock/Makefile ============================================================================== --- head/x11-clocks/glclock/Makefile Sat May 17 08:40:47 2014 (r354298) +++ head/x11-clocks/glclock/Makefile Sat May 17 08:42:00 2014 (r354299) @@ -13,37 +13,46 @@ COMMENT= OpenGL spinning pocket watch de 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/\\\"" -PROGRAMS= glclock glclockmark +PLIST_FILES= ${PROGRAMS:S,^,bin/,} ${SCRIPTS:S,^,bin/,} \ + ${TEXTURES:S,^,lib/X11/glclock/,} +PLIST_DIRS= lib/X11/glclock +OPTIONS_DEFINE= OPTIMIZED_CFLAGS + +OPTIMIZED_CFLAGS_CFLAGS=\ + -O3 -fexpensive-optimizations -ffast-math \ + -fomit-frame-pointer -fforce-mem -fforce-addr + +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= ${PROGRAMS:S,^,bin/,} ${SCRIPTS:S,^,bin/,} \ - ${TEXTURES:S,^,lib/X11/glclock/,} -PLIST_DIRS= lib/X11/glclock - -OPTIONS_DEFINE= OPTIMIZED_CFLAGS - -OPTIMIZED_CFLAGS_CFLAGS= -O3 -fexpensive-optimizations \ - -ffast-math -fomit-frame-pointer -fforce-mem -fforce-addr +post-patch: + @${REINPLACE_CMD} -e \ + 's|g\+\+|$${CXX}| ; \ + s|-O2|$${CXXFLAGS}| ; \ + s|/usr/X11R6|$${LOCALBASE}|' ${WRKSRC}/${MAKEFILE} do-install: - ${INSTALL_PROGRAM} ${PROGRAMS:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/bin +.for i in ${PROGRAMS} + (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${i} \ + ${STAGEDIR}${PREFIX}/bin) +.endfor +.for i in ${SCRIPTS} + (cd ${WRKSRC} && ${INSTALL_SCRIPT} ${i} \ + ${STAGEDIR}${PREFIX}/bin) +.endfor @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/glclock - ${INSTALL_DATA} ${TEXTURES:S,^,${WRKSRC}/,} \ - ${STAGEDIR}${PREFIX}/lib/X11/glclock +.for i in ${TEXTURES} + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} \ + ${STAGEDIR}${PREFIX}/lib/X11/glclock) +.endfor .include <bsd.port.mk> Modified: head/x11-clocks/glclock/files/patch-MString.H ============================================================================== --- head/x11-clocks/glclock/files/patch-MString.H Sat May 17 08:40:47 2014 (r354298) +++ head/x11-clocks/glclock/files/patch-MString.H Sat May 17 08:42:00 2014 (r354299) @@ -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 23:58:26.000000000 +0900 ++++ MString.H 2014-04-01 01:01:42.000000000 +0900 @@ -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 @@ - // À°¿ô¤«¤é String ¤Ø - String IntToString(int i) ; + // 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 ; Added: head/x11-clocks/glclock/files/patch-MString.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/glclock/files/patch-MString.cpp Sat May 17 08:42:00 2014 (r354299) @@ -0,0 +1,12 @@ +--- MString.cpp.orig ++++ 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)