Fri Dec 5 16:00:23 2014 UTC ()
detect NetBSD's res_ninit.
(christos)
diff -r1.8 -r1.9 pkgsrc/mail/opendmarc/Makefile
diff -r1.3 -r1.4 pkgsrc/mail/opendmarc/distinfo
diff -r0 -r1.1 pkgsrc/mail/opendmarc/patches/patch-configure
diff -r0 -r1.1 pkgsrc/mail/opendmarc/patches/patch-configure.ac
--- pkgsrc/mail/opendmarc/Makefile 2014/09/27 19:30:12 1.8
+++ pkgsrc/mail/opendmarc/Makefile 2014/12/05 16:00:23 1.9
| @@ -1,16 +1,17 @@ | | | @@ -1,16 +1,17 @@ |
1 | # $NetBSD: Makefile,v 1.8 2014/09/27 19:30:12 pettai Exp $ | | 1 | # $NetBSD: Makefile,v 1.9 2014/12/05 16:00:23 christos Exp $ |
2 | | | 2 | |
3 | DISTNAME= opendmarc-1.3.0 | | 3 | DISTNAME= opendmarc-1.3.0 |
| | | 4 | PKGREVISION= 1 |
4 | CATEGORIES= mail | | 5 | CATEGORIES= mail |
5 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opendmarc/} | | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opendmarc/} |
6 | | | 7 | |
7 | MAINTAINER= pettai@NetBSD.org | | 8 | MAINTAINER= pettai@NetBSD.org |
8 | HOMEPAGE= http://www.trusteddomain.org/opendmarc/ | | 9 | HOMEPAGE= http://www.trusteddomain.org/opendmarc/ |
9 | COMMENT= Open source DMARC library, MTA filter implementation and tools | | 10 | COMMENT= Open source DMARC library, MTA filter implementation and tools |
10 | LICENSE= modified-bsd | | 11 | LICENSE= modified-bsd |
11 | | | 12 | |
12 | DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI | | 13 | DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI |
13 | DEPENDS+= p5-DBD-mysql-[0-9]*:../../databases/p5-DBD-mysql | | 14 | DEPENDS+= p5-DBD-mysql-[0-9]*:../../databases/p5-DBD-mysql |
14 | DEPENDS+= {perl>=5.6.1,p5-File-Temp-[0-9]*}:../../devel/p5-File-Temp | | 15 | DEPENDS+= {perl>=5.6.1,p5-File-Temp-[0-9]*}:../../devel/p5-File-Temp |
15 | DEPENDS+= p5-Switch-[0-9]*:../../lang/p5-Switch | | 16 | DEPENDS+= p5-Switch-[0-9]*:../../lang/p5-Switch |
16 | | | 17 | |
--- pkgsrc/mail/opendmarc/distinfo 2014/09/27 19:30:12 1.3
+++ pkgsrc/mail/opendmarc/distinfo 2014/12/05 16:00:23 1.4
| @@ -1,5 +1,7 @@ | | | @@ -1,5 +1,7 @@ |
1 | $NetBSD: distinfo,v 1.3 2014/09/27 19:30:12 pettai Exp $ | | 1 | $NetBSD: distinfo,v 1.4 2014/12/05 16:00:23 christos Exp $ |
2 | | | 2 | |
3 | SHA1 (opendmarc-1.3.0.tar.gz) = 7d50e8319934b96ba67ae038f6dfc78eacbc0072 | | 3 | SHA1 (opendmarc-1.3.0.tar.gz) = 7d50e8319934b96ba67ae038f6dfc78eacbc0072 |
4 | RMD160 (opendmarc-1.3.0.tar.gz) = f33cd5de045e800fcdb44cd9ab6199bef5d34baf | | 4 | RMD160 (opendmarc-1.3.0.tar.gz) = f33cd5de045e800fcdb44cd9ab6199bef5d34baf |
5 | Size (opendmarc-1.3.0.tar.gz) = 640017 bytes | | 5 | Size (opendmarc-1.3.0.tar.gz) = 640017 bytes |
| | | 6 | SHA1 (patch-configure) = 15abea1f890249c46eb0b969133fc809507feb6a |
| | | 7 | SHA1 (patch-configure.ac) = b7ee9ae49e04fceaf2872dac7e2f60a15d3c9aa0 |
$NetBSD: patch-configure,v 1.1 2014/12/05 16:00:23 christos Exp $
Search also for __res_ninit on NetBSD because of namespace protection
--- configure.orig 2014-12-05 10:53:31.000000000 -0500
+++ configure 2014-12-05 10:54:50.000000000 -0500
@@ -12969,6 +12969,64 @@
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing __res_ninit" >&5
+$as_echo_n "checking for library containing __res_ninit... " >&6; }
+if ${ac_cv_search___res_ninit+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __res_ninit ();
+int
+main ()
+{
+return __res_ninit ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' resolv; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search___res_ninit=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search___res_ninit+:} false; then :
+ break
+fi
+done
+if ${ac_cv_search___res_ninit+:} false; then :
+
+else
+ ac_cv_search___res_ninit=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search___res_ninit" >&5
+$as_echo "$ac_cv_search___res_ninit" >&6; }
+ac_res=$ac_cv_search___res_ninit
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+$as_echo "#define HAVE_RES_NINIT 1" >>confdefs.h
+
+fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for idn_free in -lidn" >&5
$as_echo_n "checking for idn_free in -lidn... " >&6; }
if ${ac_cv_lib_idn_idn_free+:} false; then :
$NetBSD: patch-configure.ac,v 1.1 2014/12/05 16:00:23 christos Exp $
Search also for __res_ninit on NetBSD because of namespace protection
--- configure.ac.orig 2014-12-05 10:53:36.000000000 -0500
+++ configure.ac 2014-12-05 10:53:51.000000000 -0500
@@ -126,6 +126,9 @@
AC_SEARCH_LIBS(res_ninit, resolv,
AC_DEFINE(HAVE_RES_NINIT, 1,
[Define to 1 if you have the `res_ninit()' function.]))
+AC_SEARCH_LIBS(__res_ninit, resolv,
+ AC_DEFINE(HAVE_RES_NINIT, 1,
+ [Define to 1 if you have the `res_ninit()' function.]))
AC_CHECK_LIB(idn, idn_free)
AC_CHECK_LIB(rt, nanosleep)
AC_SEARCH_LIBS(inet_addr, nsl)