From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict

---
 package/fakeidentd/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'package/fakeidentd')

diff --git a/package/fakeidentd/Makefile b/package/fakeidentd/Makefile
index cd3b1ebe4..78ba5cd33 100644
--- a/package/fakeidentd/Makefile
+++ b/package/fakeidentd/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		fakeidentd
 PKG_VERSION:=		2.5
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		ebf398bd1843a1fd8c71f5fcf4a6e4f7
-PKG_DESCR:=		secure identd
+PKG_DESCR:=		secure ident daemon
 PKG_SECTION:=		net/misc
 PKG_SITES:=		http://distfiles.gentoo.org/distfiles/
 
@@ -22,8 +22,6 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
-TARGET_CFLAGS+=		-Wall
-
 do-build:
 	${TARGET_CC} ${TARGET_CPPFLAGS} ${TARGET_CFLAGS} ${TARGET_LDFLAGS} \
 		-o ${WRKBUILD}/fakeidentd ${WRKBUILD}/identd.c
-- 
cgit v1.2.3