From owner-svn-ports-all@freebsd.org Sat Feb 6 02:09:28 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 877B6530791; Sat, 6 Feb 2021 02:09:28 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DXbMD3TZmz4stQ; Sat, 6 Feb 2021 02:09:28 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 69E61153E; Sat, 6 Feb 2021 02:09:28 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11629SdI027189; Sat, 6 Feb 2021 02:09:28 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11629R2A027186; Sat, 6 Feb 2021 02:09:27 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202102060209.11629R2A027186@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Sat, 6 Feb 2021 02:09:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564177 - in head/dns/powerdns-recursor: . files X-SVN-Group: ports-head X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: in head/dns/powerdns-recursor: . files X-SVN-Commit-Revision: 564177 X-SVN-Commit-Repository: ports 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.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Feb 2021 02:09:28 -0000 Author: fluffy Date: Sat Feb 6 02:09:27 2021 New Revision: 564177 URL: https://svnweb.freebsd.org/changeset/ports/564177 Log: dns/powerdns-recursor: unbreak build with lua54 Switch to autoreconf to avoid heavy multilina patching of configure script PR: 253078 Submitted by: fluffy Approved by: maintainer MFH: 2021Q1 Added: head/dns/powerdns-recursor/files/patch-m4_pdns__check__libcrypto.m4 (contents, props changed) head/dns/powerdns-recursor/files/patch-m4_pdns__with__lua.m4 (contents, props changed) Deleted: head/dns/powerdns-recursor/files/patch-configure Modified: head/dns/powerdns-recursor/Makefile Modified: head/dns/powerdns-recursor/Makefile ============================================================================== --- head/dns/powerdns-recursor/Makefile Sat Feb 6 02:07:47 2021 (r564176) +++ head/dns/powerdns-recursor/Makefile Sat Feb 6 02:09:27 2021 (r564177) @@ -24,8 +24,8 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.h LIB_DEPENDS= libboost_context.so:devel/boost-libs \ libprotobuf.so:devel/protobuf -USES= compiler:c++11-lib cpe gmake localbase:ldflags pkgconfig ssl \ - tar:bzip2 +USES= autoreconf compiler:c++11-lib cpe gmake libtool localbase:ldflags \ + pkgconfig ssl tar:bzip2 CPE_VENDOR= powerdns USE_RC_SUBR= pdns-recursor Added: head/dns/powerdns-recursor/files/patch-m4_pdns__check__libcrypto.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/powerdns-recursor/files/patch-m4_pdns__check__libcrypto.m4 Sat Feb 6 02:09:27 2021 (r564177) @@ -0,0 +1,15 @@ +--- m4/pdns_check_libcrypto.m4.orig 2020-11-16 16:30:04 UTC ++++ m4/pdns_check_libcrypto.m4 +@@ -75,8 +75,10 @@ AC_DEFUN([PDNS_CHECK_LIBCRYPTO], [ + for ssldir in $ssldirs; do + AC_MSG_CHECKING([for openssl/crypto.h in $ssldir]) + if test -f "$ssldir/include/openssl/crypto.h"; then +- LIBCRYPTO_INCLUDES="-I$ssldir/include" +- LIBCRYPTO_LDFLAGS="-L$ssldir/lib" ++ if test $ssldir != /usr; then ++ LIBCRYPTO_INCLUDES="-I$ssldir/include" ++ LIBCRYPTO_LDFLAGS="-L$ssldir/lib" ++ fi + LIBCRYPTO_LIBS="-lcrypto" + found=true + AC_MSG_RESULT([yes]) Added: head/dns/powerdns-recursor/files/patch-m4_pdns__with__lua.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/powerdns-recursor/files/patch-m4_pdns__with__lua.m4 Sat Feb 6 02:09:27 2021 (r564177) @@ -0,0 +1,11 @@ +--- m4/pdns_with_lua.m4.orig 2020-09-30 10:42:53 UTC ++++ m4/pdns_with_lua.m4 +@@ -41,7 +41,7 @@ AC_DEFUN([PDNS_WITH_LUA],[ + ], [ : ]) + AS_IF([test -z "$LUAPC"], [ + found_lua=n +- m4_foreach_w([luapc], [lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua], [ ++ m4_foreach_w([luapc], [lua5.4 lua-5.4 lua54 lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua], [ + AS_IF([test "$found_lua" != "y"], [ + PKG_CHECK_MODULES([LUA], [luapc >= ${lua_min_version}], [ + AC_DEFINE([HAVE_LUA], [1], [Define to 1 if you have lua])