aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrej Zverev <az@FreeBSD.org>2009-02-23 17:49:12 +0000
committerAndrej Zverev <az@FreeBSD.org>2009-02-23 17:49:12 +0000
commitab6a0fd8c30137f23ae743a6385cbe11a67c4141 (patch)
tree91070a9fe3b5a59bad9675d87a2fd1090cb95565
parent2da66426bd47b4e767b85106704fa9a3df883a7b (diff)
downloadports-ab6a0fd8c30137f23ae743a6385cbe11a67c4141.tar.gz
ports-ab6a0fd8c30137f23ae743a6385cbe11a67c4141.zip
Use CXXFLAGS instead CFLAGS for c++ app.
This will fix build with -std=gnu99 in future. Submitted by: rdivacky [patch]
Notes
Notes: svn path=/head/; revision=228929
-rw-r--r--games/qnetchess/files/patch-Makefile.FreeBSD14
-rw-r--r--games/qnetchess/files/patch-qt.FreeBSD.mk22
2 files changed, 32 insertions, 4 deletions
diff --git a/games/qnetchess/files/patch-Makefile.FreeBSD b/games/qnetchess/files/patch-Makefile.FreeBSD
new file mode 100644
index 000000000000..18d287af47f1
--- /dev/null
+++ b/games/qnetchess/files/patch-Makefile.FreeBSD
@@ -0,0 +1,14 @@
+--- Makefile.FreeBSD.orig 2005-03-30 10:56:39.000000000 +0400
++++ Makefile.FreeBSD 2009-02-23 00:58:34.000000000 +0300
+@@ -7,10 +7,8 @@
+ MOCS= mainwindow.h gamesocket.h gameboard.h
+ LOCALE_FILE= ${PROG}_ru
+ DFLAGS= -DLOCALE_FILE=\"${LOCALE_FILE}\"
+-CFLAGS+= -O2 -W -Wall -Werror ${DFLAGS} -I${X11BASE}/include
++CXXFLAGS+= -O2 -W -Wall -Werror ${DFLAGS} -I${X11BASE}/include
+ LDADD+= -L${X11BASE}/lib
+-CXXFLAGS+= ${CFLAGS}
+-
+
+ .include "qt.FreeBSD.mk"
+ .include <bsd.prog.mk>
diff --git a/games/qnetchess/files/patch-qt.FreeBSD.mk b/games/qnetchess/files/patch-qt.FreeBSD.mk
index e02f6a456f05..ef8d8671976a 100644
--- a/games/qnetchess/files/patch-qt.FreeBSD.mk
+++ b/games/qnetchess/files/patch-qt.FreeBSD.mk
@@ -1,10 +1,24 @@
---- qt.FreeBSD.mk.orig Sat Mar 26 11:48:31 2005
-+++ qt.FreeBSD.mk Sun Nov 26 20:29:14 2006
-@@ -1,6 +1,6 @@
+--- qt.FreeBSD.mk.orig 2005-03-26 11:48:31.000000000 +0300
++++ qt.FreeBSD.mk 2009-02-23 19:49:47.000000000 +0300
+@@ -1,13 +1,13 @@
# $Id: qt.FreeBSD.mk,v 1.0 2004/11/05 10:22:11 denis Exp $
-QTDIR= /usr/X11R6
-+QTDIR?= /usr/X11R6
++QTDIR?=/usr/X11R6
MOC= ${QTDIR}/bin/moc
LUPDATE= ${QTDIR}/bin/lupdate
LRELEASE= ${QTDIR}/bin/lrelease
+ QTCFLAGS= ${QTDIR}/include/qt -DQT_NO_COMPAT -pthread
+ QTLFLAGS= -L${QTDIR}/lib -lqt-mt -pthread
+
+-CFLAGS+= -I${QTCFLAGS}
++CXXFLAGS+= -I${QTCFLAGS}
+ LDADD+= ${QTLFLAGS}
+
+ SRCMOC= ${MOCS:M*.h:R:S/$/.cxx/g}
+@@ -21,4 +21,4 @@
+ ${MOC} ${.IMPSRC} -o ${.TARGET}
+
+ .cxx.mo:
+- ${CXX} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
++ ${CXX} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}