svn commit: r563807 - in head/sysutils/wmcube: . files

[Renato Botelho]

Author: garga
Date: Tue Feb  2 13:15:58 2021
New Revision: 563807
URL: https://svnweb.freebsd.org/changeset/ports/563807

Log:
  sysutils/wmcube: Fix build and other small tweaks
  
  - Add -fcommon to CFLAGS to fix build
  - Add minsing Xorg dependencies
  - Regenerate patches with make makepatch
  
  Sponsored by:	Rubicon Communications, LLC ("Netgate")

Modified:
  head/sysutils/wmcube/Makefile
  head/sysutils/wmcube/files/patch-Makefile.FREEBSD
  head/sysutils/wmcube/files/patch-wmcube.c

Modified: head/sysutils/wmcube/Makefile
==============================================================================
--- head/sysutils/wmcube/Makefile	Tue Feb  2 13:07:00 2021	(r563806)
+++ head/sysutils/wmcube/Makefile	Tue Feb  2 13:15:58 2021	(r563807)
@@ -15,8 +15,9 @@ COMMENT=	Window Maker dockapp that displays cpu load a
 LICENSE=	GPLv2
 
 USES=		xorg
-USE_XORG=	xpm
+USE_XORG=	x11 xext xpm
 
+CFLAGS+=	-fcommon
 OPTIONS_DEFINE=	DOCS
 WRKSRC=		${WRKDIR}/${PORTNAME}/${PORTNAME}
 MAKEFILE=	Makefile.FREEBSD

Modified: head/sysutils/wmcube/files/patch-Makefile.FREEBSD
==============================================================================
--- head/sysutils/wmcube/files/patch-Makefile.FREEBSD	Tue Feb  2 13:07:00 2021	(r563806)
+++ head/sysutils/wmcube/files/patch-Makefile.FREEBSD	Tue Feb  2 13:15:58 2021	(r563807)
@@ -1,5 +1,5 @@
---- Makefile.FREEBSD.orig	Thu Aug 16 14:22:12 2001
-+++ Makefile.FREEBSD	Thu Aug 16 14:21:42 2001
+--- Makefile.FREEBSD.orig	2000-10-08 20:38:46 UTC
++++ Makefile.FREEBSD
 @@ -1,15 +1,13 @@
 -CC = gcc
  OS = -DFREEBSD
@@ -19,7 +19,7 @@
  
  OBJS =	wmcube.o \
  	../wmgeneral/wmgeneral.o \
-@@ -20,7 +18,7 @@
+@@ -20,7 +18,7 @@ OBJS =	wmcube.o \
  	$(CC) $(CFLAGS) $(INCDIR) -c $< -o $*.o
  
  wmcube: $(OBJS)

Modified: head/sysutils/wmcube/files/patch-wmcube.c
==============================================================================
--- head/sysutils/wmcube/files/patch-wmcube.c	Tue Feb  2 13:07:00 2021	(r563806)
+++ head/sysutils/wmcube/files/patch-wmcube.c	Tue Feb  2 13:15:58 2021	(r563807)
@@ -1,5 +1,5 @@
---- wmcube.c.orig	2000-10-23 18:11:47.000000000 -0200
-+++ wmcube.c	2010-01-20 13:20:56.000000000 -0200
+--- wmcube.c.orig	2000-10-23 20:11:47 UTC
++++ wmcube.c
 @@ -42,7 +42,6 @@
  #include <sys/ioctl.h>
  #include <sys/socket.h>
@@ -8,7 +8,7 @@
  #include <dirent.h>
  
  #include <X11/Xlib.h>
-@@ -125,6 +124,7 @@
+@@ -125,6 +124,7 @@ float	lum_vector[3] = { 0, 0, 100 };  // Lightsource v
  #ifdef FREEBSD
  static kvm_t            *kd;
  static struct nlist     nlst[] = { {"_cp_time"}, {0} };
@@ -16,7 +16,7 @@
  #endif
  
  int main(int argc, char **argv)
-@@ -913,7 +913,7 @@
+@@ -913,7 +913,7 @@ int loadobj(char *filename) {
  		exit(0);
  	}
  
@@ -25,7 +25,7 @@
  	
  	if (strcmp(tmp,"WMCUBE_COORDINATES") != 0) { 
  		printf("\nError in objectfile: it must start with WMCUBE_COORDINATES\n\n");
-@@ -921,7 +921,7 @@
+@@ -921,7 +921,7 @@ int loadobj(char *filename) {
  		exit(0);
  	}
  
@@ -34,7 +34,7 @@
  	counter = atoi(tmp);
  
  	while ((strcmp(tmp,"WMCUBE_LINES") != 0) && (strcmp(tmp,"WMCUBE_PLANES") != 0)) {		
-@@ -938,7 +938,7 @@
+@@ -938,7 +938,7 @@ int loadobj(char *filename) {
  			fclose(fp);
  			exit(0);
  		}
@@ -43,7 +43,7 @@
  
  		if (feof(fp)) {
  			printf("\nError in objectfile: you must have a section WMCUBE_LINES or WMCUBE_PLANES\n\n");
-@@ -1224,9 +1224,14 @@
+@@ -1224,9 +1224,14 @@ int calc_cpu_total()
  #include <nlist.h>
  #include <fcntl.h>
  #include <sys/dkstat.h>
@@ -58,7 +58,7 @@
  
          if ((kd = kvm_open(NULL, NULL, NULL, O_RDONLY, "kvm_open")) == NULL)
          {
-@@ -1249,6 +1254,13 @@
+@@ -1249,6 +1254,13 @@ int calc_cpu_total() {
          int cpu,nice,system,idle;
          unsigned long int cpu_time[CPUSTATES];