From owner-svn-ports-all@FreeBSD.ORG  Fri Jun  6 18:11:52 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 6EB67848;
 Fri,  6 Jun 2014 18:11:52 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5BA422F19;
 Fri,  6 Jun 2014 18:11:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s56IBq29070469;
 Fri, 6 Jun 2014 18:11:52 GMT (envelope-from mandree@svn.freebsd.org)
Received: (from mandree@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s56IBq4h070468;
 Fri, 6 Jun 2014 18:11:52 GMT (envelope-from mandree@svn.freebsd.org)
Message-Id: <201406061811.s56IBq4h070468@svn.freebsd.org>
From: Matthias Andree <mandree@FreeBSD.org>
Date: Fri, 6 Jun 2014 18:11:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r356828 - head/dns/powerdns-recursor
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.18
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, 06 Jun 2014 18:11:52 -0000

Author: mandree
Date: Fri Jun  6 18:11:51 2014
New Revision: 356828
URL: http://svnweb.freebsd.org/changeset/ports/356828
QAT: https://qat.redports.org/buildarchive/r356828/

Log:
  Fix build with LUA option enabled [1]; modernize USE_BZIP2.
  
  [1] Recent changes to the Lua ports cause a build failure and have broken
  powerdns-recursor when LUA is enabled.
  USES+= lua:51 also no longer worked so had to pet the Makefile a little.
  
  [mandree] modernize USE_BZIP2 -> USES=tar:bzip2
  
  PR:		190698
  Submitted by:	tremere@cainites.net
  Approved by:	portmgr (blanket)

Modified:
  head/dns/powerdns-recursor/Makefile

Modified: head/dns/powerdns-recursor/Makefile
==============================================================================
--- head/dns/powerdns-recursor/Makefile	Fri Jun  6 18:01:10 2014	(r356827)
+++ head/dns/powerdns-recursor/Makefile	Fri Jun  6 18:11:51 2014	(r356828)
@@ -14,8 +14,7 @@ COMMENT=	Advanced DNS recursor
 BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost-jam \
 		${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
 
-USE_BZIP2=	yes
-USES=		gmake
+USES=		gmake tar:bzip2
 
 OPTIONS_DEFINE=	SETUID LUA STATIC
 OPTIONS_DEFAULT=	SETUID
@@ -27,7 +26,7 @@ LDFLAGS+=	-L${PREFIX}/lib
 
 SUB_FILES=	pkg-message
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
@@ -42,11 +41,10 @@ GROUPS=		pdns
 .endif
 
 .if ${PORT_OPTIONS:MLUA}
-USES+=	lua:51
-LUA_COMPS=lua
+USES+=		lua:51
 MAKE_ENV+=LUA=1
-MAKE_ENV+=LUA_CPPFLAGS_CONFIG=-I${PREFIX}/include/lua51
-MAKE_ENV+="LUA_LIBS_CONFIG=-L${PREFIX}/lib/lua51/ -llua-${LUA_VER}"
+MAKE_ENV+="LUA_CPPFLAGS_CONFIG=-I${LUA_INCDIR}"
+MAKE_ENV+="LUA_LIBS_CONFIG=-L${LUA_LIBDIR} -llua-${LUA_VER}"
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC}
@@ -72,4 +70,4 @@ post-patch:
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/*.8 ${STAGEDIR}${PREFIX}/man/man8/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>