From owner-svn-ports-all@FreeBSD.ORG  Fri Mar  7 10:56:33 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8BF8F4B0;
 Fri,  7 Mar 2014 10:56:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 78B91E4C;
 Fri,  7 Mar 2014 10:56:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s27AuXJ0088434;
 Fri, 7 Mar 2014 10:56:33 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s27AuXT7088433;
 Fri, 7 Mar 2014 10:56:33 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201403071056.s27AuXT7088433@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 7 Mar 2014 10:56:33 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r347359 - head/databases/memcached
X-SVN-Group: ports-head
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Mar 2014 10:56:33 -0000

Author: bapt
Date: Fri Mar  7 10:56:32 2014
New Revision: 347359
URL: http://svnweb.freebsd.org/changeset/ports/347359
QAT: https://qat.redports.org/buildarchive/r347359/

Log:
  Fix installing manpage
  Fix build with and without docs
  Fix memcached eating 100% of memory when built with both libevent2 and libevent 1.4
  installed at the same time by making sure to always find the event.h from libevent2 first
  
  PR:		ports/187337 ports/187340 ports/187309
  Reported by:	Lawrence "The Dreamer" Chen <beastie@tardisi.com>, Volodymyr Kostyrko <arcade@b1t.name>, Ross <basarevych@gmail.com>

Modified:
  head/databases/memcached/Makefile

Modified: head/databases/memcached/Makefile
==============================================================================
--- head/databases/memcached/Makefile	Fri Mar  7 10:49:36 2014	(r347358)
+++ head/databases/memcached/Makefile	Fri Mar  7 10:56:32 2014	(r347359)
@@ -3,7 +3,7 @@
 
 PORTNAME=	memcached
 PORTVERSION=	1.4.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		${MASTER_SITE_GENTOO}
@@ -41,8 +41,8 @@ PLIST_DIRS=	include/memcached
 PORTDOCS=	protocol.txt readme.txt
 
 CFLAGS+=	-fstack-protector \
-		-I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/event2/compat
+		-I${LOCALBASE}/include/event2/compat \
+		-I${LOCALBASE}/include
 
 DTRACE_COFNIGURE_ENABLE=	dtrace
 
@@ -65,17 +65,14 @@ BROKEN=			DTRACE broken with gcc/clang -
 post-patch:
 	@${REINPLACE_CMD} -e "s,-levent,-levent-2.0,g" ${WRKSRC}/configure
 
-post-configure:
-	@${REINPLACE_CMD} -e 's#doc/memcached.1##' ${WRKSRC}/Makefile
-
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${STAGEDIR}${MAN1PREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
+
 regression-test: test
 test: build
 	${MAKE} -C ${WRKSRC} test