ports/59538: Fix x11-clocks/wmtz build on 5.X

[Samy Al Bahra]

>Number:         59538
>Category:       ports
>Synopsis:       Fix x11-clocks/wmtz build on 5.X
>Confidential:   no
>Severity:       critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 20 18:40:14 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Samy Al Bahra
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
Kerneled 
>Environment:


System: FreeBSD beastie.freebsd.local 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 20 18:35:24 AST 2003     samy at beastie.freebsd.local:/usr/src/sys/i386/compile/KERNELED i386  


>Description:


x11-clocks/wmtz does not build on 5.X
machines due to its use of multistring
literals (depreciated in gcc 3.X). The
following patch fixes this as well as
supresses some compilation warnings
(in the manner of the author's).



>How-To-Repeat:


Build with gcc 3.X.


>Fix:


diff -ruN wmtz/Makefile /home/samy/tmp/wmtz/Makefile
--- wmtz/Makefile	Thu Nov 20 22:09:38 2003
+++ /home/samy/tmp/wmtz/Makefile	Thu Nov 20 22:10:29 2003
@@ -19,16 +19,10 @@
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 post-install:
 	@${ECHO} "===>   Installing wmtzrc.default in ${PREFIX}/etc."
 	@${ECHO} "===>   Copy it to ~/.wmtzrc or ${PREFIX}/etc/wmtzrc and modify it."
 	@${INSTALL_DATA} ${WRKSRC}/wmtzrc ${PREFIX}/etc/wmtzrc.default
 	@${ECHO} "===>   Run wmtz --help for usage instructions"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN wmtz/files/patch-ac /home/samy/tmp/wmtz/files/patch-ac
--- wmtz/files/patch-ac	Sun Apr 22 03:31:50 2001
+++ /home/samy/tmp/wmtz/files/patch-ac	Thu Nov 20 22:09:23 2003
@@ -1,5 +1,14 @@
---- wmtz.c.orig	Sat Apr 21 20:18:05 2001
-+++ wmtz.c	Sat Apr 21 20:19:47 2001
+--- wmtz.c.orig	Thu Nov 20 22:04:56 2003
++++ wmtz.c	Thu Nov 20 22:06:57 2003
+@@ -51,7 +51,7 @@
+ #define STRSIZE 10
+ #define LMST 1
+ #define GMST 0
+-#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7
++#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7\n\
+ http://www.geocities.com/jl1n/wmtz/wmtz.html\""
+ 
+ 
 @@ -275,15 +275,15 @@
  
          if (!Read_Config_File(config_file))
@@ -19,7 +28,23 @@
          
              Read_Config_File(config_file);
          }
-@@ -729,7 +729,8 @@
+@@ -479,6 +479,7 @@
+ 		   but_stat = -1;
+                    break;
+ 	    default:
++		;
+ 	  }
+         }  
+ 
+@@ -529,6 +530,7 @@
+ 	    exit(0);
+ 	    break;
+ 	default:
++	    ;
+       }
+     return;
+ }
+@@ -729,7 +731,8 @@
  void usage(void)
  {
    fprintf(stderr, "\nwmtz - shows local time around the world and more.\n");



>Release-Note:
>Audit-Trail:
>Unformatted: