aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorswills <swills@FreeBSD.org>2018-12-27 07:46:13 +0800
committerswills <swills@FreeBSD.org>2018-12-27 07:46:13 +0800
commitecd723beaf78f8d4eb5150a5f6e130bec2ae6e74 (patch)
tree43b2e07960fdc1fa3fc050a61c3291037b7933f3 /devel
parenta326d05abd5e6ad970231a9ba4f93dae6bd1995d (diff)
downloadfreebsd-ports-gnome-ecd723beaf78f8d4eb5150a5f6e130bec2ae6e74.tar.gz
freebsd-ports-gnome-ecd723beaf78f8d4eb5150a5f6e130bec2ae6e74.tar.zst
freebsd-ports-gnome-ecd723beaf78f8d4eb5150a5f6e130bec2ae6e74.zip
devel/aegis: Fix build with newer gcc
PR: 234363 Submitted by: aryeh.friedman@gmail.com (maintainer)
Diffstat (limited to 'devel')
-rw-r--r--devel/aegis/Makefile6
-rw-r--r--devel/aegis/files/patch-aegrep_main.cc4
-rw-r--r--devel/aegis/files/patch-common_mem.h11
3 files changed, 14 insertions, 7 deletions
diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile
index 42ba291766b8..514cdd75acf9 100644
--- a/devel/aegis/Makefile
+++ b/devel/aegis/Makefile
@@ -4,7 +4,7 @@
PORTNAME= aegis
PORTVERSION= 4.25
DISTVERSIONSUFFIX= .D510
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel
MASTER_SITES= SF
@@ -26,10 +26,6 @@ CONFIGURE_ENV= WISH="${WISH}"
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE= yes
-# GCC 6 switched to -std=gnu++14 by default, which breaks the port (bug
-# 219284). Explicitly use the previous default to keep things going.
-USE_CXXSTD= gnu++98
-
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
diff --git a/devel/aegis/files/patch-aegrep_main.cc b/devel/aegis/files/patch-aegrep_main.cc
index 1f77796ae667..1fa5219350a8 100644
--- a/devel/aegis/files/patch-aegrep_main.cc
+++ b/devel/aegis/files/patch-aegrep_main.cc
@@ -1,5 +1,5 @@
---- aegrep/main.cc.orig 2014-08-02 11:30:25.351342791 +0000
-+++ aegrep/main.cc 2014-08-02 11:30:52.520341498 +0000
+--- aegrep/main.cc.orig 2012-12-04 02:03:33 UTC
++++ aegrep/main.cc
@@ -32,6 +32,9 @@
#include <aegrep/arglex3.h>
diff --git a/devel/aegis/files/patch-common_mem.h b/devel/aegis/files/patch-common_mem.h
new file mode 100644
index 000000000000..6fa053d3825b
--- /dev/null
+++ b/devel/aegis/files/patch-common_mem.h
@@ -0,0 +1,11 @@
+--- common/mem.h.orig 2012-12-04 02:03:33 UTC
++++ common/mem.h
+@@ -123,7 +123,7 @@ char *dmem_copy_string(const char *file,
+ #endif
+
+ #if HAVE_HEADER_NEW || HAVE_NEW_H
+-#define THROW_BAD_ALLOC throw(std::bad_alloc)
++#define THROW_BAD_ALLOC //throw(std::bad_alloc)
+ #else
+ #define THROW_BAD_ALLOC
+ #endif