Date: Sat, 6 Feb 2021 02:07:47 +0000 (UTC) From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r564176 - in branches/2021Q1/dns/powerdns: . files Message-ID: <202102060207.11627lNd026997@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fluffy Date: Sat Feb 6 02:07:47 2021 New Revision: 564176 URL: https://svnweb.freebsd.org/changeset/ports/564176 Log: MFH: r564175 dns/powerdns: unbreak build with lua54 Switch to autoreconf to avoid heavy multiline patching of configure script PR: 253077 Submitted by: fluffy Approved by: maintainer Added: branches/2021Q1/dns/powerdns/files/patch-m4_pdns__check__libcrypto.m4 - copied unchanged from r564175, head/dns/powerdns/files/patch-m4_pdns__check__libcrypto.m4 branches/2021Q1/dns/powerdns/files/patch-m4_pdns__with__lua.m4 - copied unchanged from r564175, head/dns/powerdns/files/patch-m4_pdns__with__lua.m4 Deleted: branches/2021Q1/dns/powerdns/files/patch-configure Modified: branches/2021Q1/dns/powerdns/Makefile Directory Properties: branches/2021Q1/ (props changed) Modified: branches/2021Q1/dns/powerdns/Makefile ============================================================================== --- branches/2021Q1/dns/powerdns/Makefile Sat Feb 6 02:06:28 2021 (r564175) +++ branches/2021Q1/dns/powerdns/Makefile Sat Feb 6 02:07:47 2021 (r564176) @@ -17,8 +17,8 @@ LIB_DEPENDS= libboost_serialization.so:devel/boost-lib libcurl.so:ftp/curl \ libprotobuf.so:devel/protobuf -USES= compiler:c++11-lib cpe gmake libtool localbase:ldflags pathfix \ - pkgconfig ssl tar:bzip2 +USES= autoreconf compiler:c++11-lib cpe gmake libtool localbase:ldflags \ + pathfix pkgconfig ssl tar:bzip2 USE_LDCONFIG= YES USE_RC_SUBR= pdns Copied: branches/2021Q1/dns/powerdns/files/patch-m4_pdns__check__libcrypto.m4 (from r564175, head/dns/powerdns/files/patch-m4_pdns__check__libcrypto.m4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2021Q1/dns/powerdns/files/patch-m4_pdns__check__libcrypto.m4 Sat Feb 6 02:07:47 2021 (r564176, copy of r564175, head/dns/powerdns/files/patch-m4_pdns__check__libcrypto.m4) @@ -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]) Copied: branches/2021Q1/dns/powerdns/files/patch-m4_pdns__with__lua.m4 (from r564175, head/dns/powerdns/files/patch-m4_pdns__with__lua.m4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2021Q1/dns/powerdns/files/patch-m4_pdns__with__lua.m4 Sat Feb 6 02:07:47 2021 (r564176, copy of r564175, head/dns/powerdns/files/patch-m4_pdns__with__lua.m4) @@ -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])
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102060207.11627lNd026997>