CVS commit: pkgsrc/net/netatalk22

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Tue Jul 11 15:51:14 UTC 2017

Modified Files:
        pkgsrc/net/netatalk22: distinfo
        pkgsrc/net/netatalk22/patches: patch-configure

Log Message:
We do not at this point support zeroconf via avahi. Since configure
does not allow for building without avahi, and native avahi is picked
up on some Linuxen, we disable all avahi tests unconditionally here.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/netatalk22/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/netatalk22/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/netatalk22/distinfo
diff -u pkgsrc/net/netatalk22/distinfo:1.4 pkgsrc/net/netatalk22/distinfo:1.5
--- pkgsrc/net/netatalk22/distinfo:1.4  Sat Jul  8 19:38:18 2017
+++ pkgsrc/net/netatalk22/distinfo      Tue Jul 11 15:51:13 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2017/07/08 19:38:18 hauke Exp $
+$NetBSD: distinfo,v 1.5 2017/07/11 15:51:13 hauke Exp $
 
 SHA1 (netatalk-2.2.5.tar.bz2) = 4367421213d68b8396cf35743e347e9c01bdf3b0
 RMD160 (netatalk-2.2.5.tar.bz2) = ff0165806973b19db906406fd4b37dd49d505a27
@@ -15,7 +15,7 @@ SHA1 (patch-ap) = c5e7cc0e1773d7e60106df
 SHA1 (patch-aq) = 0793cf5ec158aa27c42b5d8a96651307d7c7c8b6
 SHA1 (patch-au) = 8505351fee21ac1effa4dc620b8006c572b913c1
 SHA1 (patch-bin_ad_ad__cp.c) = 0a9e93f6149ff53f0f0d8c36ea4c5e635b5b624c
-SHA1 (patch-configure) = 5beb3677965c0a98297f6c7ce5ad6b598bfd9e8b
+SHA1 (patch-configure) = 33b99663a6e674d77909564b04244f06b78f6f17
 SHA1 (patch-distrib_initscripts_Makefile.in) = 3dc520f998b2b35ea60cd8f1a2a96d465a9e474a
 SHA1 (patch-etc_afpd_afp_mdns.c) = ab87bf511466ef183de1ee8f8a9ad1fbb8776066
 SHA1 (patch-etc_afpd_filedir.c) = ae139f008ca322932dc495f18dfa277085a4c2ed

Index: pkgsrc/net/netatalk22/patches/patch-configure
diff -u pkgsrc/net/netatalk22/patches/patch-configure:1.1 pkgsrc/net/netatalk22/patches/patch-configure:1.2
--- pkgsrc/net/netatalk22/patches/patch-configure:1.1   Wed Jun 11 11:03:56 2014
+++ pkgsrc/net/netatalk22/patches/patch-configure       Tue Jul 11 15:51:14 2017
@@ -1,9 +1,25 @@
-$NetBSD: patch-configure,v 1.1 2014/06/11 11:03:56 hauke Exp $
+$NetBSD: patch-configure,v 1.2 2017/07/11 15:51:14 hauke Exp $
 
-Even on SunOS, we decide bitness ourselves.
---- configure.orig     2012-09-28 07:49:32.000000000 +0000
+We do not at this point support zeroconf via avahi. Since configure
+does not allow for building without avahi, and native avahi is picked
+up on some Linuxen, we disable all avahi tests unconditionally here.
+
+Fix build on SunOS by disabling the isainfo bitness check 
+
+--- configure.orig     2013-07-23 09:11:35.000000000 +0000
 +++ configure
-@@ -17535,7 +17535,7 @@ $as_echo_n "checking if we have to build
+@@ -16185,7 +16185,9 @@ $as_echo "#define HAVE_MDNS 1" >>confdef
+         fi
+ 
+         # mDNS support using Avahi
+-        if test x"$found_zeroconf" != x"yes" ; then
++        #if test x"$found_zeroconf" != x"yes" ; then
++
++      if 0 ; then
+             ac_fn_c_check_header_mongrel "$LINENO" "avahi-client/client.h" "ac_cv_header_avahi_client_client_h" "$ac_includes_default"
+ if test "x$ac_cv_header_avahi_client_client_h" = xyes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avahi_client_new in -lavahi-client" >&5
+@@ -17535,7 +17537,7 @@ $as_echo_n "checking if we have to build
           # check for isainfo, if not found it has to be a 32 bit kernel (<=2.6)
           if test -x /usr/bin/isainfo; then
                # check for 64 bit platform