svn commit: r347359 - head/databases/memcached

[Baptiste Daroussin]

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 at tardisi.com>, Volodymyr Kostyrko <arcade at b1t.name>, Ross <basarevych at 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