aboutsummaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authorTobias Kortkamp <tobik@FreeBSD.org>2018-08-25 12:43:25 +0800
committerTobias Kortkamp <tobik@FreeBSD.org>2018-08-25 12:43:25 +0800
commit12dd761ab2525359af93ca2101e33effde609f61 (patch)
tree992449d52a1def0e19565128e768e1a48d0ed96a /editors
parent3887e2088ef66d7b37d68fff1c0bfa490d85312a (diff)
downloadfreebsd-ports-gnome-12dd761ab2525359af93ca2101e33effde609f61.tar.gz
freebsd-ports-gnome-12dd761ab2525359af93ca2101e33effde609f61.tar.zst
freebsd-ports-gnome-12dd761ab2525359af93ca2101e33effde609f61.zip
editors/manedit: Fix build with Clang 6
In file included from <built-in>:375: <command line>:4:9: warning: '__cplusplus' macro redefined [-Wmacro-redefined] #define __cplusplus 1 ^ <built-in>: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
Diffstat (limited to 'editors')
-rw-r--r--editors/manedit/files/patch-Makefile.FreeBSD15
1 files changed, 8 insertions, 7 deletions
diff --git a/editors/manedit/files/patch-Makefile.FreeBSD b/editors/manedit/files/patch-Makefile.FreeBSD
index 01294aba954e..d020abedf3a3 100644
--- a/editors/manedit/files/patch-Makefile.FreeBSD
+++ b/editors/manedit/files/patch-Makefile.FreeBSD
@@ -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: