Attachment 222006 Details for Bug 253077 – dns/powerdns: unbreak build with lua54

[patch] dns/powerdns: unbreak build with lua54

dns_powerdns.diff (text/plain), 4.60 KB, created by Dima Panov on 2021-01-29 13:27:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dima Panov

Created: 2021-01-29 13:27:36 UTC

Size: 4.60 KB

patch

obsolete

>Index: ../powerdns/Makefile
>===================================================================
>--- dns/powerdns/Makefile	(revision 563205)
>+++ dns/powerdns/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	powerdns
> DISTVERSION=	4.4.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	dns
> MASTER_SITES=	https://downloads.powerdns.com/releases/
> DISTNAME=	pdns-${DISTVERSION}
>@@ -18,8 +18,8 @@
> 		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
>Index: dns/powerdns/files/patch-configure
>===================================================================
>--- dns/powerdns/files/patch-configure	(revision 563205)
>+++ dns/powerdns/files/patch-configure	(nonexistent)
>@@ -1,15 +0,0 @@
>---- configure.orig	2020-04-06 12:51:03 UTC
>-+++ configure
>-@@ -19774,8 +19774,10 @@ fi
>-             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl/crypto.h in $ssldir" >&5
>- $as_echo_n "checking for openssl/crypto.h in $ssldir... " >&6; }
>-             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
>-                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
>
>Property changes on: dns/powerdns/files/patch-configure
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: dns/powerdns/files/patch-m4_pdns__check__libcrypto.m4
>===================================================================
>--- dns/powerdns/files/patch-m4_pdns__check__libcrypto.m4	(nonexistent)
>+++ dns/powerdns/files/patch-m4_pdns__check__libcrypto.m4	(working copy)
>@@ -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])
>
>Property changes on: dns/powerdns/files/patch-m4_pdns__check__libcrypto.m4
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: dns/powerdns/files/patch-m4_pdns__with__lua.m4
>===================================================================
>--- dns/powerdns/files/patch-m4_pdns__with__lua.m4	(nonexistent)
>+++ dns/powerdns/files/patch-m4_pdns__with__lua.m4	(working copy)
>@@ -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])
>
>Property changes on: dns/powerdns/files/patch-m4_pdns__with__lua.m4
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 253077: 222006