diff options
author | Gerald Pfeifer <gerald@FreeBSD.org> | 2011-01-26 00:45:03 +0000 |
---|---|---|
committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2011-01-26 00:45:03 +0000 |
commit | e24477b25edb0906483ca974cd49a5d03b4a9890 (patch) | |
tree | bb68aab65c92e30c3c305e0a0dd28240f0082fdc /net-im | |
parent | Update to week 4 snapshot (diff) |
Correct source Makefile to use CXXFLAGS instead of CPPFLAGS when invoking
the C++ compiler. Adjust port Makefile accordingly, removing a hack.
PR: 153625
Approved by: maintainer
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=268239
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/komclean/Makefile | 2 | ||||
-rw-r--r-- | net-im/komclean/distinfo | 1 | ||||
-rw-r--r-- | net-im/komclean/files/patch-src-Makefile | 26 |
3 files changed, 27 insertions, 2 deletions
diff --git a/net-im/komclean/Makefile b/net-im/komclean/Makefile index 9494573e1c3b..5fa6706400f7 100644 --- a/net-im/komclean/Makefile +++ b/net-im/komclean/Makefile @@ -25,7 +25,7 @@ MAN1= komclean WRKSRC= ${WRKDIR}/${PKGNAME} CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ENV= CPPFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" +MAKE_ENV= LDFLAGS="${LDFLAGS}" DESKTOP_ENTRIES="KOMclean" \ "${COMMENT}" \ diff --git a/net-im/komclean/distinfo b/net-im/komclean/distinfo index c6ccae404270..0dbc4b99e701 100644 --- a/net-im/komclean/distinfo +++ b/net-im/komclean/distinfo @@ -1,3 +1,2 @@ -MD5 (komclean-1.1.0-src.tar.gz) = e7df9cc61becaf425eb450456996ceb1 SHA256 (komclean-1.1.0-src.tar.gz) = d5c1dca4c71f933bcddeea151d4da90d6022a4f2ee872f85c10385f968194c0d SIZE (komclean-1.1.0-src.tar.gz) = 169095 diff --git a/net-im/komclean/files/patch-src-Makefile b/net-im/komclean/files/patch-src-Makefile new file mode 100644 index 000000000000..8b41f50012d5 --- /dev/null +++ b/net-im/komclean/files/patch-src-Makefile @@ -0,0 +1,26 @@ +--- src/Makefile.orig 2009-06-25 15:36:16.000000000 +0200 ++++ src/Makefile 2011-01-15 23:17:10.000000000 +0100 +@@ -11,7 +11,7 @@ + + LIBS = -lX11 -lXext -lXpm + +-CPPFLAGS += -Wall -g ++CXXFLAGS += -Wall -g + LDFLAGS += -Wall $(LIBS) + + KOMCLEANBIN = ../komclean +@@ -26,12 +26,12 @@ + + depend: + touch Makefile.dep +- makedepend -Y -fMakefile.dep -- $(CPPFLAGS) -- $(SRC) ++ makedepend -Y -fMakefile.dep -- $(CXXFLAGS) -- $(SRC) + \rm Makefile.dep.bak + + .SUFFIXES:.cpp .o + .cpp.o: +- $(CXX) $(CPPFLAGS) -c $< -o $@ ++ $(CXX) $(CXXFLAGS) -c $< -o $@ + + -include Makefile.dep + |