summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2017-05-24 19:33:53 (GMT)
committerespie <espie@openbsd.org>2017-05-24 19:33:53 (GMT)
commit8be45a3569a4a1839b2dcb9ec3e549c55b5c054c (patch)
treec0a4e9d294ef2af0c32fd1b9a78c10de5c9d9a8c
parent5cfa4d30f98830b8a26dff15f9e0322deb11b52f (diff)
downloadopenbsd-ports-8be45a3569a4a1839b2dcb9ec3e549c55b5c054c.tar.gz
openbsd-ports-8be45a3569a4a1839b2dcb9ec3e549c55b5c054c.tar.xz
let it compile with clang without too much noise
-rw-r--r--graphics/gfract/Makefile4
-rw-r--r--graphics/gfract/patches/patch-Makefile9
-rw-r--r--graphics/gfract/patches/patch-Tool_cpp13
-rw-r--r--graphics/gfract/patches/patch-color_cpp13
4 files changed, 33 insertions, 6 deletions
diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile
index f7def98..9e7e60c 100644
--- a/graphics/gfract/Makefile
+++ b/graphics/gfract/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2017/04/10 11:46:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.28 2017/05/24 19:33:53 espie Exp $
COMMENT= fractal program with GTK interface
GH_ACCOUNT= oskusalerma
@@ -44,7 +44,7 @@ post-extract:
cd ${WRKDIR} && mv monk2\'.map monk2.map
pre-build:
- sed -i 's,/usr/local,${LOCALBASE},' ${WRKSRC}/main.cpp
+ sed -i.beforesubst 's,/usr/local,${LOCALBASE},' ${WRKSRC}/main.cpp
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/gfract/palettes
diff --git a/graphics/gfract/patches/patch-Makefile b/graphics/gfract/patches/patch-Makefile
index 68095ef..c6ba5ed 100644
--- a/graphics/gfract/patches/patch-Makefile
+++ b/graphics/gfract/patches/patch-Makefile
@@ -1,12 +1,13 @@
-$OpenBSD: patch-Makefile,v 1.5 2016/10/28 13:45:22 ajacoutot Exp $
---- Makefile.orig Mon Feb 1 13:31:34 2010
-+++ Makefile Thu Oct 27 14:58:32 2016
+$OpenBSD: patch-Makefile,v 1.6 2017/05/24 19:33:53 espie Exp $
+Index: Makefile
+--- Makefile.orig
++++ Makefile
@@ -10,7 +10,7 @@ ICON_FILES := mandel_icon.pix
CXX := g++
-DEFS := -Wall -ansi -pedantic -D_REENTRANT -D_GNU_SOURCE
-+DEFS := -Wall -ansi -D_REENTRANT -D_GNU_SOURCE
++DEFS := -Wall -ansi -Wno-mismatched-tags -D_REENTRANT -D_GNU_SOURCE
DEFS := $(shell pkg-config --cflags gtk+-2.0 libpng) $(DEFS)
CXXFLAGS := $(DEFS) -O2 -fomit-frame-pointer -ffast-math
diff --git a/graphics/gfract/patches/patch-Tool_cpp b/graphics/gfract/patches/patch-Tool_cpp
new file mode 100644
index 0000000..bfbd72a
--- /dev/null
+++ b/graphics/gfract/patches/patch-Tool_cpp
@@ -0,0 +1,13 @@
+$OpenBSD: patch-Tool_cpp,v 1.1 2017/05/24 19:33:53 espie Exp $
+
+Index: Tool.cpp
+--- Tool.cpp.orig
++++ Tool.cpp
+@@ -1,6 +1,7 @@
+ #include "Tool.h"
+ #include <gdk/gdkkeysyms.h>
+ #include "main.h"
++#include <cstdlib>
+
+ const float ZoomInTool::ZOOM_BOX_WIDTH = 0.35;
+
diff --git a/graphics/gfract/patches/patch-color_cpp b/graphics/gfract/patches/patch-color_cpp
new file mode 100644
index 0000000..86abc4a
--- /dev/null
+++ b/graphics/gfract/patches/patch-color_cpp
@@ -0,0 +1,13 @@
+$OpenBSD: patch-color_cpp,v 1.1 2017/05/24 19:33:53 espie Exp $
+
+Index: color.cpp
+--- color.cpp.orig
++++ color.cpp
+@@ -1,6 +1,7 @@
+ #include <algorithm>
+ #include <math.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include "misc.h"
+ #include "color.h"