Attachment #222006 for bug #253077

View | Details | Raw Unified | Return to bug 253077
Collapse All | Expand All

Lines 2-8 Link Here

(-)dns/powerdns/Makefile (-3 / +3 lines)
2		2
3	PORTNAME= powerdns	3	PORTNAME= powerdns
4	DISTVERSION= 4.4.0	4	DISTVERSION= 4.4.0
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= dns	6	CATEGORIES= dns
7	MASTER_SITES= https://downloads.powerdns.com/releases/	7	MASTER_SITES= https://downloads.powerdns.com/releases/
8	DISTNAME= pdns-${DISTVERSION}	8	DISTNAME= pdns-${DISTVERSION}
Lines 18-25 Link Here
18	libcurl.so:ftp/curl \	18	libcurl.so:ftp/curl \
19	libprotobuf.so:devel/protobuf	19	libprotobuf.so:devel/protobuf
20		20
21	USES= compiler:c++11-lib cpe gmake libtool localbase:ldflags pathfix \	21	USES= autoreconf compiler:c++11-lib cpe gmake libtool localbase:ldflags \
22	pkgconfig ssl tar:bzip2	22	pathfix pkgconfig ssl tar:bzip2
23		23
24	USE_LDCONFIG= YES	24	USE_LDCONFIG= YES
25	USE_RC_SUBR= pdns	25	USE_RC_SUBR= pdns




--- 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




--- 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])

Line 0 Link Here

(-)dns/powerdns/files/patch-m4_pdns__with__lua.m4 (+11 lines)
	1	--- m4/pdns_with_lua.m4.orig 2020-09-30 10:42:53 UTC
	2	+++ m4/pdns_with_lua.m4
	3	@@ -41,7 +41,7 @@ AC_DEFUN([PDNS_WITH_LUA],[
	4	], [ : ])
	5	AS_IF([test -z "$LUAPC"], [
	6	found_lua=n
	7	- m4_foreach_w([luapc], [lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua], [
	8	+ 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], [
	9	AS_IF([test "$found_lua" != "y"], [
	10	PKG_CHECK_MODULES([LUA], [luapc >= ${lua_min_version}], [
	11	AC_DEFINE([HAVE_LUA], [1], [Define to 1 if you have lua])

Return to bug 253077

Lines 1-15 Link Here

(-)dns/powerdns/files/patch-configure (-15 lines)
1	--- configure.orig 2020-04-06 12:51:03 UTC
2	+++ configure
3	@@ -19774,8 +19774,10 @@ fi
4	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl/crypto.h in $ssldir" >&5
5	$as_echo_n "checking for openssl/crypto.h in $ssldir... " >&6; }
6	if test -f "$ssldir/include/openssl/crypto.h"; then
7	- LIBCRYPTO_INCLUDES="-I$ssldir/include"
8	- LIBCRYPTO_LDFLAGS="-L$ssldir/lib"
9	+ if test $ssldir != /usr; then
10	+ LIBCRYPTO_INCLUDES="-I$ssldir/include"
11	+ LIBCRYPTO_LDFLAGS="-L$ssldir/lib"
12	+ fi
13	LIBCRYPTO_LIBS="-lcrypto"
14	found=true
15	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

Line 0 Link Here

(-)dns/powerdns/files/patch-m4_pdns__check__libcrypto.m4 (+15 lines)
	1	--- m4/pdns_check_libcrypto.m4.orig 2020-11-16 16:30:04 UTC
	2	+++ m4/pdns_check_libcrypto.m4
	3	@@ -75,8 +75,10 @@ AC_DEFUN([PDNS_CHECK_LIBCRYPTO], [
	4	for ssldir in $ssldirs; do
	5	AC_MSG_CHECKING([for openssl/crypto.h in $ssldir])
	6	if test -f "$ssldir/include/openssl/crypto.h"; then
	7	- LIBCRYPTO_INCLUDES="-I$ssldir/include"
	8	- LIBCRYPTO_LDFLAGS="-L$ssldir/lib"
	9	+ if test $ssldir != /usr; then
	10	+ LIBCRYPTO_INCLUDES="-I$ssldir/include"
	11	+ LIBCRYPTO_LDFLAGS="-L$ssldir/lib"
	12	+ fi
	13	LIBCRYPTO_LIBS="-lcrypto"
	14	found=true
	15	AC_MSG_RESULT([yes])