summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2017-05-24 21:27:45 (GMT)
committerespie <espie@openbsd.org>2017-05-24 21:27:45 (GMT)
commitda11ae39e4f176f7f7ccd5cd92f168467d4313d7 (patch)
tree68e5574bc4beff815f28fbab95df4f4c4555603a
parent165b667c2dc962e0de279970cfe2d910f0f85805 (diff)
downloadopenbsd-ports-da11ae39e4f176f7f7ccd5cd92f168467d4313d7.tar.gz
openbsd-ports-da11ae39e4f176f7f7ccd5cd92f168467d4313d7.tar.xz
WANT_CXX + trivial C++ patches
-rw-r--r--multimedia/synfig/Makefile8
-rw-r--r--multimedia/synfig/patches/patch-src_synfig_main_cpp33
-rw-r--r--multimedia/synfig/patches/patch-src_synfig_transform_cpp13
3 files changed, 42 insertions, 12 deletions
diff --git a/multimedia/synfig/Makefile b/multimedia/synfig/Makefile
index 2cbe4b6..2d07690 100644
--- a/multimedia/synfig/Makefile
+++ b/multimedia/synfig/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2016/05/06 21:39:03 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2017/05/24 21:27:45 espie Exp $
COMMENT = 2D animation software
REVISION = 4
@@ -25,16 +25,14 @@ WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 harfbuzz
WANTLIB += jbig jpeg lcms2 ltdl lzma m mlt mlt++ mng openjp2 pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
WANTLIB += pthread-stubs sigc-2.0 tiff webp xcb xcb-render xcb-shm
-WANTLIB += xml++-2.6 xml2 z
+WANTLIB += xml++-2.6 xml2 z ${LIBECXX}
MASTER_SITES= http://download.tuxfamily.org/synfig/releases/${V}/
MODULES = devel/gettext
# c++11
-MODULES += gcc4
-MODGCC4_ARCHS= *
-MODGCC4_LANGS= c++
+WANT_CXX = base gcc
BUILD_DEPENDS = devel/etl>=0.04.19
LIB_DEPENDS = archivers/xz \
diff --git a/multimedia/synfig/patches/patch-src_synfig_main_cpp b/multimedia/synfig/patches/patch-src_synfig_main_cpp
index 61402b0..52ceeca 100644
--- a/multimedia/synfig/patches/patch-src_synfig_main_cpp
+++ b/multimedia/synfig/patches/patch-src_synfig_main_cpp
@@ -1,14 +1,33 @@
-$OpenBSD: patch-src_synfig_main_cpp,v 1.2 2015/09/21 16:58:56 jasper Exp $
---- src/synfig/main.cpp.orig Thu Jul 9 09:33:03 2015
-+++ src/synfig/main.cpp Mon Sep 21 18:58:47 2015
-@@ -459,6 +459,10 @@ synfig::get_binary_path(const String &fallback_path)
+$OpenBSD: patch-src_synfig_main_cpp,v 1.3 2017/05/24 21:27:45 espie Exp $
+Index: src/synfig/main.cpp
+--- src/synfig/main.cpp.orig
++++ src/synfig/main.cpp
+@@ -289,14 +289,14 @@ synfig::Main::Main(const synfig::String& basepath,Prog
+ locations.push_back(getenv("SYNFIG_MODULE_LIST"));
+ else
+ {
+- locations.push_back("./"MODULE_LIST_FILENAME);
++ locations.push_back("./" MODULE_LIST_FILENAME);
+ if(getenv("HOME"))
+ locations.push_back(strprintf("%s/.local/share/synfig/%s", getenv("HOME"), MODULE_LIST_FILENAME));
+ #ifdef SYSCONFDIR
+- locations.push_back(SYSCONFDIR"/"MODULE_LIST_FILENAME);
++ locations.push_back(SYSCONFDIR "/" MODULE_LIST_FILENAME);
+ #endif
+ locations.push_back(prefix+ETL_DIRECTORY_SEPARATOR+"etc"+ETL_DIRECTORY_SEPARATOR+MODULE_LIST_FILENAME);
+- locations.push_back("/usr/local/etc/"MODULE_LIST_FILENAME);
++ locations.push_back("/usr/local/etc/" MODULE_LIST_FILENAME);
+ #ifdef __APPLE__
+ locations.push_back("/Library/Frameworks/synfig.framework/Resources/"MODULE_LIST_FILENAME);
+ locations.push_back("/Library/Synfig/"MODULE_LIST_FILENAME);
+@@ -458,6 +458,10 @@ synfig::get_binary_path(const String &fallback_path)
+ result = String(path);
free(path);
-
++
+#elif defined(__OpenBSD__)
+
+ result = String("${PREFIX}/bin/synfig");
-+
+
#elif defined(__APPLE__)
- uint32_t buf_size = MAXPATHLEN;
diff --git a/multimedia/synfig/patches/patch-src_synfig_transform_cpp b/multimedia/synfig/patches/patch-src_synfig_transform_cpp
new file mode 100644
index 0000000..4a1ff95
--- /dev/null
+++ b/multimedia/synfig/patches/patch-src_synfig_transform_cpp
@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_synfig_transform_cpp,v 1.1 2017/05/24 21:27:45 espie Exp $
+
+Index: src/synfig/transform.cpp
+--- src/synfig/transform.cpp.orig
++++ src/synfig/transform.cpp
+@@ -29,6 +29,7 @@
+ # include <config.h>
+ #endif
+
++#include <stdlib.h>
+ #include "transform.h"
+ #include <algorithm>
+