Hi, 

Marc, i'm CC-ing you because there is a x11/xglobe diff with "surprising"
results (at the bottom). 

Here is another round of macppc fixes that should also help for other gcc4
archs. 


> http://build-failures.rhaalovely.net//powerpc/2018-12-01/net/xprobe.log

Yet another one with missing includes. Build [1] and runtime is ok.
But honestly OS signatures are super old ;) It doesn't break on amd64.

[1] http://ix.io/1vZJ


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/xprobe/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile    24 Oct 2018 14:28:09 -0000      1.23
+++ Makefile    14 Dec 2018 17:45:07 -0000
@@ -3,7 +3,7 @@
 COMMENT=               ICMP active OS fingerprint scanner
 
 DISTNAME=              xprobe2-0.3
-REVISION =             3
+REVISION =             4
 CATEGORIES=                    net security
 
 HOMEPAGE=              http://xprobe.sourceforge.net/
Index: patches/patch-libs-external_USI++_src_ip_cc
===================================================================
RCS file: patches/patch-libs-external_USI++_src_ip_cc
diff -N patches/patch-libs-external_USI++_src_ip_cc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs-external_USI++_src_ip_cc 14 Dec 2018 17:45:07 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+ip.cc:34:19: error: 'srand' was not declared in this scope with ports-gcc
+Index: libs-external/USI++/src/ip.cc
+--- libs-external/USI++/src/ip.cc.orig
++++ libs-external/USI++/src/ip.cc
+@@ -16,6 +16,7 @@
+ #include <iostream>
+ #include <string.h>
+ #include <errno.h>
++#include <stdlib.h>
+ #include <new>
+ #include <vector>
+ 
Index: patches/patch-libs-external_USI++_usi++_tcp_h
===================================================================
RCS file: patches/patch-libs-external_USI++_usi++_tcp_h
diff -N patches/patch-libs-external_USI++_usi++_tcp_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs-external_USI++_usi++_tcp_h       14 Dec 2018 17:45:07 
-0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+usi++/tcp.h:175:47: 'memset' was not declared in this scope with ports-gcc
+Index: libs-external/USI++/usi++/tcp.h
+--- libs-external/USI++/usi++/tcp.h.orig
++++ libs-external/USI++/usi++/tcp.h
+@@ -12,6 +12,7 @@
+ #ifndef _TCP_H_
+ #define _TCP_H_
+ 
++#include <string.h>
+ #include "usi-structs.h"
+ #include "datalink.h"
+ #include "ip.h"


> http://build-failures.rhaalovely.net//powerpc/2018-12-01/productivity/devtodo.log

A single missing include. Build is fine [2], and so is runtime [3].
Doesn't break the amd64 build.

[2] http://ix.io/1w03
[3] https://bsd.network/web/statuses/101241080087100263

Index: Makefile
===================================================================
RCS file: /cvs/ports/productivity/devtodo/Makefile,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 Makefile
--- Makefile    24 Oct 2018 14:28:10 -0000      1.28
+++ Makefile    14 Dec 2018 19:39:36 -0000
@@ -3,7 +3,7 @@
 COMMENT=               reminder/task program aimed at developers
 
 DISTNAME=              devtodo-0.1.20
-REVISION =             4
+REVISION =             5
 CATEGORIES=            productivity devel
 
 HOMEPAGE=              http://swapoff.org/devtodo1.html
Index: patches/patch-src_todoterm_cc
===================================================================
RCS file: patches/patch-src_todoterm_cc
diff -N patches/patch-src_todoterm_cc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_todoterm_cc       14 Dec 2018 19:39:36 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+fix for ports-gcc-4.9
+todoterm.cc:18:38: error: 'getenv' was not declared in this scope
+Index: src/todoterm.cc
+--- src/todoterm.cc.orig
++++ src/todoterm.cc
+@@ -7,6 +7,7 @@
+ #include <stdexcept>
+ #include <curses.h>
+ #include <term.h>
++#include <stdlib.h>
+ 
+ static char info[2048];
+ static bool term_initialized;


> http://build-failures.rhaalovely.net//powerpc/2018-12-01/x11/xglobe%2Cno_map.log

Once again a missing include. I built the standard [4] and no_map [5]
flavors without issues. Runtime works as expected [6]. 

For some reason an old patch is present in the diff, to me it looks like
the diff(1) algo probably changed meanwhile and it's reflecting that? 

[4] http://ix.io/1w1A
[5] http://ix.io/1w1M
[6] https://bsd.network/@julianaito/101242469086735925


Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/xglobe/Makefile,v
retrieving revision 1.77
diff -u -p -u -p -r1.77 Makefile
--- Makefile    24 Oct 2018 14:28:14 -0000      1.77
+++ Makefile    15 Dec 2018 00:25:47 -0000
@@ -9,7 +9,7 @@ HOMEPAGE=       http://www.shaderwrangler.com/
 MASTER_SITES=  https://distfiles.nl/
 DISTNAME=      xglobe-0.5p2
 PKGNAME=       xglobe-0.5
-REVISION=      43
+REVISION=      44
 
 MAINTAINER=    Marc Espie <es...@openbsd.org>
 
Index: patches/patch-desktopwidget_cpp
===================================================================
RCS file: patches/patch-desktopwidget_cpp
diff -N patches/patch-desktopwidget_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-desktopwidget_cpp     15 Dec 2018 00:25:47 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+Fix for ports-gcc-4.9:
+desktopwidget.cpp:34:5: error: '::exit' has not been declared
+Index: desktopwidget.cpp
+--- desktopwidget.cpp.orig
++++ desktopwidget.cpp
+@@ -31,7 +31,7 @@ DesktopWidget::DesktopWidget(QWidget *parent, const ch
+   if(!currentImage)
+   {
+     fprintf(stderr, "Not enough memory!\n");
+-    ::exit(1);
++    std::exit(1);
+   }
+ //  fprintf(stderr, "Desktop size: %dx%d\n",width(), height());
+ }
Index: patches/patch-desktopwidget_h
===================================================================
RCS file: patches/patch-desktopwidget_h
diff -N patches/patch-desktopwidget_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-desktopwidget_h       15 Dec 2018 00:25:47 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+Fix for ports-gcc-4.9:
+desktopwidget.cpp:34:5: error: '::exit' has not been declared
+Index: desktopwidget.h
+--- desktopwidget.h.orig
++++ desktopwidget.h
+@@ -26,6 +26,7 @@
+ #include <qwidget.h>
+ #include <qpixmap.h>
+ #include <qpainter.h>
++#include <cstdlib>
+ 
+ class DesktopWidget : public QWidget
+ {
Index: patches/patch-renderer_cpp
===================================================================
RCS file: /cvs/ports/x11/xglobe/patches/patch-renderer_cpp,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-renderer_cpp
--- patches/patch-renderer_cpp  23 Nov 2002 15:45:19 -0000      1.5
+++ patches/patch-renderer_cpp  15 Dec 2018 00:25:47 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-renderer_cpp,v 1.5 2002/11/23 15:45:19 espie Exp $
---- renderer.cpp.orig  Sat Nov 23 16:34:35 2002
-+++ renderer.cpp       Sat Nov 23 16:34:49 2002
-@@ -91,6 +91,8 @@ Renderer::Renderer(const QSize &size, co
+Index: renderer.cpp
+--- renderer.cpp.orig
++++ renderer.cpp
+@@ -91,6 +91,8 @@ Renderer::Renderer(const QSize &size, const char *mapf
    mapcloud = NULL;
    track_clouds = NULL;
    
@@ -10,7 +11,7 @@ $OpenBSD: patch-renderer_cpp,v 1.5 2002/
    renderedImage = new QImage(size, 32);
    if(!renderedImage)
    {
-@@ -98,8 +100,6 @@ Renderer::Renderer(const QSize &size, co
+@@ -98,8 +100,6 @@ Renderer::Renderer(const QSize &size, const char *mapf
      ::exit(1);
    }
  


Charlène. 

Reply via email to