From owner-svn-ports-all@freebsd.org Sat Aug 25 04:43:26 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5E98410A0BD9; Sat, 25 Aug 2018 04:43:26 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 14BEA88B65; Sat, 25 Aug 2018 04:43:26 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E9E631B347; Sat, 25 Aug 2018 04:43:25 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7P4hPDY037155; Sat, 25 Aug 2018 04:43:25 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7P4hPug037154; Sat, 25 Aug 2018 04:43:25 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201808250443.w7P4hPug037154@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 25 Aug 2018 04:43:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478000 - head/editors/manedit/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/editors/manedit/files X-SVN-Commit-Revision: 478000 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Aug 2018 04:43:26 -0000 Author: tobik Date: Sat Aug 25 04:43:25 2018 New Revision: 478000 URL: https://svnweb.freebsd.org/changeset/ports/478000 Log: editors/manedit: Fix build with Clang 6 In file included from :375: :4:9: warning: '__cplusplus' macro redefined [-Wmacro-redefined] #define __cplusplus 1 ^ :371:9: note: previous definition is here #define __cplusplus 201402L ^ http://beefy11.nyi.freebsd.org/data/head-i386-default/p477696_s338122/logs/errors/manedit-1.2.1_3.log Modified: head/editors/manedit/files/patch-Makefile.FreeBSD Modified: head/editors/manedit/files/patch-Makefile.FreeBSD ============================================================================== --- head/editors/manedit/files/patch-Makefile.FreeBSD Sat Aug 25 04:04:01 2018 (r477999) +++ head/editors/manedit/files/patch-Makefile.FreeBSD Sat Aug 25 04:43:25 2018 (r478000) @@ -1,18 +1,19 @@ ---- Makefile.FreeBSD.orig 2013-07-19 16:44:02.000000000 +0200 -+++ Makefile.FreeBSD 2013-07-19 16:44:28.000000000 +0200 -@@ -56,7 +56,10 @@ CFLAGS += $(GTK_CFLAGS) -O2 -Wall \ +--- Makefile.FreeBSD.orig 2008-10-11 23:00:00 UTC ++++ Makefile.FreeBSD +@@ -56,9 +56,10 @@ CFLAGS += $(GTK_CFLAGS) -O2 -Wall \ -DPREFIX=\"$(PREFIX)\" \ -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\" -CPPFLAGS = -D__cplusplus -Dc_plusplus +CPPFLAGS = $(CXXFLAGS) $(GTK_CFLAGS) -O2 -Wall \ + -DPREFIX=\"$(PREFIX)\" \ -+ -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\" \ -+ -D__cplusplus -Dc_plusplus ++ -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\" - +- # ######################################################################## -@@ -109,7 +112,7 @@ OBJ_CPP = $(SRC_CPP:.cpp=.o) + # Dependant Libraries: + # +@@ -109,7 +110,7 @@ OBJ_CPP = $(SRC_CPP:.cpp=.o) .c.o: $(CC) -c $*.c $(INC) $(CFLAGS) .cpp.o: