Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Dec 2018 23:46:13 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r488492 - in head/devel/aegis: . files
Message-ID:  <201812262346.wBQNkDhu062058@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Wed Dec 26 23:46:13 2018
New Revision: 488492
URL: https://svnweb.freebsd.org/changeset/ports/488492

Log:
  devel/aegis: Fix build with newer gcc
  
  PR:		234363
  Submitted by:	aryeh.friedman@gmail.com (maintainer)

Added:
  head/devel/aegis/files/patch-common_mem.h   (contents, props changed)
Modified:
  head/devel/aegis/Makefile   (contents, props changed)
  head/devel/aegis/files/patch-aegrep_main.cc   (contents, props changed)

Modified: head/devel/aegis/Makefile
==============================================================================
--- head/devel/aegis/Makefile	Wed Dec 26 23:46:01 2018	(r488491)
+++ head/devel/aegis/Makefile	Wed Dec 26 23:46:13 2018	(r488492)
@@ -4,7 +4,7 @@
 PORTNAME=	aegis
 PORTVERSION=	4.25
 DISTVERSIONSUFFIX=	.D510
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
@@ -25,10 +25,6 @@ CONFIGURE_ARGS=	--with-nlsdir="${PREFIX}/share/locale"
 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

Modified: head/devel/aegis/files/patch-aegrep_main.cc
==============================================================================
--- head/devel/aegis/files/patch-aegrep_main.cc	Wed Dec 26 23:46:01 2018	(r488491)
+++ head/devel/aegis/files/patch-aegrep_main.cc	Wed Dec 26 23:46:13 2018	(r488492)
@@ -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>

Added: head/devel/aegis/files/patch-common_mem.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/aegis/files/patch-common_mem.h	Wed Dec 26 23:46:13 2018	(r488492)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812262346.wBQNkDhu062058>