Update netatalk22 to patch release 2.2.6.

For changes see
<https://github.com/Netatalk/Netatalk/commits/branch-netatalk-2-2>
- the upstream release branch does not have a changelog.

Upstream took a lot of our patches - thanks, guys!

Package changes include untangling ldap support, so that the package
builds with it. There has been confusion between acl and ldap support
upstream as well as in the package - see
patch-include_atalk_ldapconfig.h and
<https://github.com/Netatalk/Netatalk/commits/branch-netatalk-2-2/include/atalk/ldapconfig.h>.

25 files changed, 61 insertions, 617 deletions

diff --git a/net/netatalk22/Makefile b/net/netatalk22/Makefile
index ef452287f71..c32c8348c02 100644
--- a/net/netatalk22/Makefile
+++ b/net/netatalk22/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2017/04/14 09:15:57 hauke Exp $
+# $NetBSD: Makefile,v 1.9 2017/07/12 13:56:00 hauke Exp $
 
-DISTNAME=	netatalk-2.2.5
+DISTNAME=	netatalk-2.2.6
 PKGNAME=        ${DISTNAME:C/-/22-/}
-PKGREVISION=	5
+#PKGREVISION=	1
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,7 +18,7 @@ LICENSE=	gnu-gpl-v2
 BDB_ACCEPTED=		db4 db5
 USE_LIBTOOL=		yes
 USE_OLD_DES_API=	yes
-USE_TOOLS+=		gmake perl:run
+USE_TOOLS+=		gmake pkg-config perl:run
 GNU_CONFIGURE=		yes
 
 BUILDLINK_TRANSFORM+=	l:db48:${BDB_TYPE}
@@ -74,19 +74,15 @@ PLIST_VARS+=		ea
 PLIST.ea=		yes
 .endif
 
-PLIST_VARS+=		acl
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "HPUX" || ${OPSYS} == "IRIX" || \
-	${OPSYS} == "AIX" || ${OPSYS} == "OSF1" || ${OPSYS} == "FreeBSD"
-PLIST.acl=		yes
-CONF_FILES+=	${EGDIR}/afp_ldap.conf ${PKG_SYSCONFDIR}/afp_ldap.conf
-.endif
-
 .include "options.mk"
 
 INSTALLATION_DIRS=	libexec/psffilters
 
-.if !empty(PKG_OPTIONS:Mpam)
 post-install:
+.if !empty(PKG_OPTIONS:Mldap)
+	${INSTALL_DATA} ${WRKSRC}/config/afp_ldap.conf ${DESTDIR}${EGDIR}
+.endif
+.if !empty(PKG_OPTIONS:Mpam)
 	${INSTALL_DATA} ${WRKSRC}/config/pam/netatalk.pam ${DESTDIR}${EGDIR}
 .endif
 
diff --git a/net/netatalk22/PLIST b/net/netatalk22/PLIST
index ddfd1c3fc37..2bac3906609 100644
--- a/net/netatalk22/PLIST
+++ b/net/netatalk22/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/06/11 11:03:56 hauke Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/07/12 13:56:00 hauke Exp $
 ${PLIST.ea}bin/ad
 bin/add_netatalk_printer
 bin/adv1tov2
@@ -162,7 +162,7 @@ man/man8/timelord.8
 share/aclocal/netatalk.m4
 share/examples/netatalk/AppleVolumes.default
 share/examples/netatalk/AppleVolumes.system
-${PLIST.acl}share/examples/netatalk/afp_ldap.conf
+${PLIST.ldap}share/examples/netatalk/afp_ldap.conf
 share/examples/netatalk/afpd.conf
 share/examples/netatalk/atalkd.conf
 share/examples/netatalk/netatalk.conf
diff --git a/net/netatalk22/distinfo b/net/netatalk22/distinfo
index a50fcd0963c..101b7abf642 100644
--- a/net/netatalk22/distinfo
+++ b/net/netatalk22/distinfo
@@ -1,28 +1,11 @@
-$NetBSD: distinfo,v 1.5 2017/07/11 15:51:13 hauke Exp $
+$NetBSD: distinfo,v 1.6 2017/07/12 13:56:00 hauke Exp $
 
-SHA1 (netatalk-2.2.5.tar.bz2) = 4367421213d68b8396cf35743e347e9c01bdf3b0
-RMD160 (netatalk-2.2.5.tar.bz2) = ff0165806973b19db906406fd4b37dd49d505a27
-SHA512 (netatalk-2.2.5.tar.bz2) = 77a9b0a49825a0803dfbf16ebf8df0efd7b9244f6cdaed6755936c0af8a62ccb834cac30d47d205ce378bbfb91cf11590eef88896f1d48e6ddbaa8b45e71c612
-Size (netatalk-2.2.5.tar.bz2) = 1290761 bytes
-SHA1 (patch-ac) = 605e87479202cbf093dfbadb25f2972595246d97
-SHA1 (patch-ae) = e114085fbe2abf2fb821f2d2737e877c53e7c151
-SHA1 (patch-af) = 649be7e50210e6e4156aeff74d3fc0effb90f9f2
-SHA1 (patch-ah) = 505680d4085f5e40afb0554b5c748c1f6c68c367
-SHA1 (patch-am) = a4e7fe53eb55ae17eb1888cfb278bc86d383f4fb
-SHA1 (patch-an) = 5472758813b927708ca178809fb89733719e67b4
-SHA1 (patch-ao) = 1b140d7b8fc1df6b44b15a181ddc625744610bb9
-SHA1 (patch-ap) = c5e7cc0e1773d7e60106df7e1f3ded234308bb8c
-SHA1 (patch-aq) = 0793cf5ec158aa27c42b5d8a96651307d7c7c8b6
-SHA1 (patch-au) = 8505351fee21ac1effa4dc620b8006c572b913c1
-SHA1 (patch-bin_ad_ad__cp.c) = 0a9e93f6149ff53f0f0d8c36ea4c5e635b5b624c
-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
-SHA1 (patch-etc_afpd_quota_c) = 5005abb6528c0b3160a587fbe9fb285f485e6759
-SHA1 (patch-etc_papd_print_cups.c) = 0bfa8d75691e11e3bbbc0bb59cd342fb5500b6ac
-SHA1 (patch-etc_uams_uams_gss.c) = b9ff59c368e01d3f269e95f5eaeb239dc17e701c
-SHA1 (patch-include_atalk_acl.h) = 62d67eaf089126b2c0bff0871b23f7a6707e119c
-SHA1 (patch-include_atalk_ldapconfig.h) = d0bb4a1bf520b18228de6ab87b646f4496852fce
+SHA1 (netatalk-2.2.6.tar.bz2) = 98a2d33f2e240e49caec32b83bca579723ce87f7
+RMD160 (netatalk-2.2.6.tar.bz2) = c7b051cf89d30c9bf1d491d9e04ceee2f39b897d
+SHA512 (netatalk-2.2.6.tar.bz2) = 74aa3415a43293a8804b00b0eda564d6536310e59c3f0d067d634db89f4d612a1dfd932df18607c32b948922ae032bc25471e21635ab149a78629ff95c341f47
+Size (netatalk-2.2.6.tar.bz2) = 1301887 bytes
+SHA1 (patch-config_Makefile.in) = 6b9f545e5ddb178e9a310cec4de300c02557e685
+SHA1 (patch-configure) = 9919625c3cd54e34ab45c6606094e12215630d33
+SHA1 (patch-distrib_initscripts_Makefile.in) = 706890f9e0aacab4d523cc1900048b7fab96f5d4
+SHA1 (patch-include_atalk_ldapconfig.h) = 05aa673fce4c670af252b298b1a9e820b1fc7adb
 SHA1 (patch-libatalk_bstring_bstrlib.c) = f43818328237b908166f956de464f532d578d2c4
-SHA1 (patch-macros_quota-check.m4) = b1484f83a2a6ba5bd50623ab525d5366bb71abaa
diff --git a/net/netatalk22/options.mk b/net/netatalk22/options.mk
index dd15d356fca..58f28fd1bcf 100644
--- a/net/netatalk22/options.mk
+++ b/net/netatalk22/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2017/04/13 14:35:53 hauke Exp $
+# $NetBSD: options.mk,v 1.4 2017/07/12 13:56:00 hauke Exp $
 #
 PKG_OPTIONS_VAR=	PKG_OPTIONS.netatalk
 PKG_SUPPORTED_OPTIONS=	cups debug dnssd kerberos ldap pam slp
@@ -40,9 +40,12 @@ PLIST.gssapi=		yes
 CONFIGURE_ARGS+=	--without-gssapi
 .endif
 
+PLIST_VARS+=		ldap
 .if !empty(PKG_OPTIONS:Mldap)
 .include "../../databases/openldap-client/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-ldap=yes
+PLIST.ldap=		yes
+CONF_FILES+=		${EGDIR}/afp_ldap.conf ${PKG_SYSCONFDIR}/afp_ldap.conf
 .else
 CONFIGURE_ARGS+=       --with-ldap=no
 .endif
@@ -54,7 +57,7 @@ CONFIGURE_ARGS+=	--with-pam
 PLIST.pam=		yes
 MESSAGE_SRC+=		MESSAGE MESSAGE.pam
 .else
-CONFIGURE_ARGS+=	--without-pam
+CONFIGURE_ARGS+=	--with-pam=no
 .endif
 
 .if !empty(PKG_OPTIONS:Mslp)
diff --git a/net/netatalk22/patches/patch-ac b/net/netatalk22/patches/patch-ac
deleted file mode 100644
index f52aad909cb..00000000000
--- a/net/netatalk22/patches/patch-ac
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
-The original commit message for this patch:
-
-    http://mail-index.netbsd.org/source-changes/1999/09/17/0023.html
-
-    Patch from Juergen Hannken-Illjes, which should solve PR#8308 (net 0 is
-    reserved for lo0, it can't be used on other interfaces).
-
-Here is PR #8308:
-
-    http://www.NetBSD.org/cgi-bin/query-pr-single.pl?number=8308
-
-and also the change that exposed the bug:
-
-    http://mail-index.netbsd.org/source-changes/1999/08/24/0035.html
-
-and finally, the discussion referred to in the above change:
-
-    http://mail-index.netbsd.org/tech-net/1999/06/30/0002.html
-    http://mail-index.netbsd.org/tech-net/1999/07/01/0005.html
-    http://mail-index.netbsd.org/tech-net/1999/07/01/0007.html
-    http://mail-index.netbsd.org/tech-net/1999/07/02/0003.html
-    http://mail-index.netbsd.org/tech-net/1999/07/02/0016.html
-    http://mail-index.netbsd.org/tech-net/1999/07/02/0017.html
-    http://mail-index.netbsd.org/tech-net/1999/07/02/0018.html
-    http://mail-index.netbsd.org/tech-net/1999/07/02/0020.html
-    http://mail-index.netbsd.org/tech-net/1999/07/02/0022.html
-    http://mail-index.netbsd.org/tech-net/1999/07/03/0004.html
-
---- etc/atalkd/main.c.orig	2009-12-13 02:21:47.000000000 +0000
-+++ etc/atalkd/main.c
-@@ -296,10 +296,10 @@ static void as_timer(int sig _U_)
- 		    LOG(log_info, logtype_atalkd, "config for no router" );
- 		      
- 		    if ( iface->i_flags & IFACE_PHASE2 ) {
--			iface->i_rt->rt_firstnet = 0;
-+			iface->i_rt->rt_firstnet = htons(1);
- 			iface->i_rt->rt_lastnet = htons( STARTUP_LASTNET );
- 			setaddr( iface, IFACE_PHASE2, iface->i_addr.sat_addr.s_net, iface->i_addr.sat_addr.s_node,
--				0, htons( STARTUP_LASTNET ));
-+				htons(1), htons( STARTUP_LASTNET ));
- 		    }
- 		    if ( looproute( iface, RTMP_ADD ) ) { /* -1 or 1 */
- 			LOG(log_error, logtype_atalkd, "as_timer: can't route %u.%u to loopback: %s",
diff --git a/net/netatalk22/patches/patch-ae b/net/netatalk22/patches/patch-ae
deleted file mode 100644
index 7dfffd08f7e..00000000000
--- a/net/netatalk22/patches/patch-ae
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
---- config.h.in.orig	2010-09-20 10:35:13.000000000 +0200
-+++ config.h.in	2011-03-23 21:46:02.000000000 +0100
-@@ -293,8 +293,8 @@
- /* Define to 1 if you have the `gettimeofday' function. */
- #undef HAVE_GETTIMEOFDAY
- 
--/* Define to 1 if you have the `getusershell' function. */
--#undef HAVE_GETUSERSHELL
-+/* Define to 1 if you have the `getifaddrs' function. */
-+#undef HAVE_GETIFADDRS
- 
- /* Define to 1 if you have the `getxattr' function. */
- #undef HAVE_GETXATTR
-@@ -476,6 +476,9 @@
- /* Define to 1 if you have the `rmdir' function. */
- #undef HAVE_RMDIR
- 
-+/* Define to 1 if you have the NetBSD quota library */
-+#undef HAVE_LIBQUOTA
-+
- /* Define to 1 if you have the <rpcsvc/rquota.h> header file. */
- #undef HAVE_RPCSVC_RQUOTA_H
- 
diff --git a/net/netatalk22/patches/patch-af b/net/netatalk22/patches/patch-af
deleted file mode 100644
index 12405431fb1..00000000000
--- a/net/netatalk22/patches/patch-af
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-af,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
---- etc/psf/etc2ps.sh.orig	2009-03-29 16:23:23.000000000 +0900
-+++ etc/psf/etc2ps.sh
-@@ -9,15 +9,12 @@
- # tag in the case.
- #
- 
--DVIPSPATH=/usr/local/tex/bin
- DVIPS=/usr/local/tex/bin/dvips
- DVIPSARGS="-f -q"
- 
--TROFF2PS=/usr/local/psroff/troff2/troff2ps
-+TROFF2PS="groff -Tps"
- TROFF2PSARGS="-Z -O-.10"
- 
--PATH=/usr/bin:$DVIPSPATH; export PATH
--
- case $1 in
- 
- #
-@@ -40,7 +37,7 @@ df*)
- # troff2ps is from psroff by Chris Lewis.
- #
- tf*)
--    if [ -x "$TROFF2PS" ]; then
-+    if [ -x "/usr/bin/groff" ]; then
- 	exec $TROFF2PS $TROFF2PSARGS
-     else
- 	echo "$0: filter troff2ps uninstalled" 1>&2
diff --git a/net/netatalk22/patches/patch-am b/net/netatalk22/patches/patch-am
deleted file mode 100644
index 7f5624f0fcd..00000000000
--- a/net/netatalk22/patches/patch-am
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-am,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
---- bin/afppasswd/afppasswd.c.orig	2011-09-02 07:54:44.000000000 -0400
-+++ bin/afppasswd/afppasswd.c	2011-09-21 11:21:42.000000000 -0400
-@@ -40,7 +40,7 @@
- 
- #include <netatalk/endian.h>
- 
--#include <des.h>
-+#include <openssl/des.h>
- 
- #ifdef USE_CRACKLIB
- #include <crack.h>
-@@ -70,7 +70,7 @@
- static void convert_passwd(char *buf, char *newpwd, const int keyfd)
- {
-   u_int8_t key[HEXPASSWDLEN];
--  Key_schedule schedule;
-+  DES_key_schedule schedule;
-   unsigned int i, j;
- 
-   if (!newpwd) {
-@@ -89,14 +89,14 @@
-       key[j] = (unhex(key[i]) << 4) | unhex(key[i + 1]);
-     if (j <= DES_KEY_SZ)
-       memset(key + j, 0, sizeof(key) - j);
--    key_sched((C_Block *) key, schedule);
-+    DES_key_sched((DES_cblock *) key, &schedule);
-     memset(key, 0, sizeof(key));   
-     if (newpwd) {
--	ecb_encrypt((C_Block *) newpwd, (C_Block *) newpwd, schedule,
-+	DES_ecb_encrypt((DES_cblock *) newpwd, (DES_cblock *) newpwd, &schedule,
- 		    DES_ENCRYPT);
-     } else {
-       /* decrypt the password */
--      ecb_encrypt((C_Block *) buf, (C_Block *) buf, schedule, DES_DECRYPT);
-+      DES_ecb_encrypt((DES_cblock *) buf, (DES_cblock *) buf, &schedule, DES_DECRYPT);
-     }
-     memset(&schedule, 0, sizeof(schedule));      
-   }
diff --git a/net/netatalk22/patches/patch-an b/net/netatalk22/patches/patch-an
deleted file mode 100644
index 8b0fb4d3193..00000000000
--- a/net/netatalk22/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
---- etc/uams/uams_randnum.c.orig	2005-05-26 17:24:26.000000000 +1200
-+++ etc/uams/uams_randnum.c
-@@ -47,7 +47,7 @@ char *strchr (), *strrchr ();
- #include <atalk/uam.h>
- 
- 
--#include <des.h>
-+#include <openssl/des.h>
- 
- #ifdef USE_CRACKLIB
- #include <crack.h>
diff --git a/net/netatalk22/patches/patch-ao b/net/netatalk22/patches/patch-ao
deleted file mode 100644
index d51e3bfd52c..00000000000
--- a/net/netatalk22/patches/patch-ao
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
---- libatalk/util/getiface.c.orig	2005-01-31 14:50:54.000000000 -0500
-+++ libatalk/util/getiface.c	2008-04-05 21:32:56.000000000 -0400
-@@ -16,6 +16,10 @@
- #include <stdint.h>
- #endif
- 
-+#ifdef HAVE_GETIFADDRS
-+#include <ifaddrs.h>
-+#endif
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
-@@ -74,6 +78,28 @@
- 	  *list = new;
-       return i;
- 
-+#elif defined(HAVE_GETIFADDRS)
-+    struct ifaddrs *ifa, *a;
-+    int i;
-+    char **new;
-+
-+    if (!list)
-+	return 0;
-+    if (getifaddrs(&ifa) == -1)
-+	return 0;
-+    for (i = 0, a = ifa; a != NULL; a = a->ifa_next, i++)
-+	continue;
-+    new = malloc((i + 1) * sizeof(char *));
-+    if (new == NULL) {
-+	freeifaddrs(ifa);
-+	return 0;
-+    }
-+    for (i = 0, a = ifa; a != NULL; a = a->ifa_next)
-+	if (addname(new, &i, a->ifa_name) < 0)
-+	    break;
-+    freeifaddrs(ifa);
-+    *list = new;
-+    return i;
- #else
-     struct ifconf	ifc;
-     struct ifreq	ifrs[ 64 ], *ifr, *nextifr;
diff --git a/net/netatalk22/patches/patch-ap b/net/netatalk22/patches/patch-ap
deleted file mode 100644
index 4b88c767784..00000000000
--- a/net/netatalk22/patches/patch-ap
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
-Fix build on DragonFlyBSD
-
-Fixes loading of pam modules on older versions on NetBSD, where
-the dependency of the module on libpam was not explicit.
-
---- include/atalk/util.h.orig	2010-11-15 09:10:15.000000000 +0000
-+++ include/atalk/util.h
-@@ -17,6 +17,7 @@
- 
- #include <sys/cdefs.h>
- #include <sys/types.h>
-+#include <sys/socket.h>
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif /* HAVE_UNISTD_H */
-@@ -78,7 +79,7 @@ extern void mod_close    (void *);
-  * OpenBSD currently does not use the second arg for dlopen(). For
-  * future compatibility we define DL_LAZY */
- #ifdef __NetBSD__
--#define mod_open(a)      dlopen(a, RTLD_LAZY)
-+#define mod_open(a)      dlopen(a, RTLD_LAZY|RTLD_GLOBAL)
- #elif defined(__OpenBSD__)
- #define mod_open(a)      dlopen(a, DL_LAZY)
- #else /* ! __NetBSD__ && ! __OpenBSD__ */
diff --git a/net/netatalk22/patches/patch-aq b/net/netatalk22/patches/patch-aq
deleted file mode 100644
index 026a446f0ec..00000000000
--- a/net/netatalk22/patches/patch-aq
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
-PR kern/43625
-
---- etc/cnid_dbd/cnid_metad.c.orig	2011-08-31 02:11:34.000000000 -0400
-+++ etc/cnid_dbd/cnid_metad.c	2011-09-21 10:49:57.000000000 -0400
-@@ -548,7 +548,7 @@
-     while (1) {
-         rqstfd = usockfd_check(srvfd, &set);
-         /* Collect zombie processes and log what happened to them */
--        if (sigchild) while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
-+        while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
-             for (i = 0; i < maxvol; i++) {
-                 if (srv[i].pid == pid) {
-                     srv[i].pid = 0;
diff --git a/net/netatalk22/patches/patch-au b/net/netatalk22/patches/patch-au
deleted file mode 100644
index 184a1343314..00000000000
--- a/net/netatalk22/patches/patch-au
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-au,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
---- include/atalk/cnid.h.orig	2011-07-22 00:30:42.000000000 -0400
-+++ include/atalk/cnid.h	2011-09-21 11:11:35.000000000 -0400
-@@ -54,7 +54,7 @@
-     void *_private;              /* back-end speficic data */
- 
-     cnid_t (*cnid_add)         (struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
--                                char *name, const size_t, cnid_t hint);
-+                                const char *name, const size_t, cnid_t hint);
-     int    (*cnid_delete)      (struct _cnid_db *cdb, cnid_t id);
-     cnid_t (*cnid_get)         (struct _cnid_db *cdb, const cnid_t did, char *name, const  size_t);
-     cnid_t (*cnid_lookup)      (struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
-@@ -67,7 +67,7 @@
-     int    (*cnid_getstamp)    (struct _cnid_db *cdb, void *buffer, const size_t len);
-     cnid_t (*cnid_rebuild_add) (struct _cnid_db *, const struct stat *, const cnid_t,
-                                 char *, const size_t, cnid_t);
--    int    (*cnid_find)        (struct _cnid_db *cdb, char *name, size_t namelen,
-+    int    (*cnid_find)        (struct _cnid_db *cdb, const char *name, size_t namelen,
-                                 void *buffer, size_t buflen);
- };
- typedef struct _cnid_db cnid_db;
diff --git a/net/netatalk22/patches/patch-bin_ad_ad__cp.c b/net/netatalk22/patches/patch-bin_ad_ad__cp.c
deleted file mode 100644
index 9b429b746a3..00000000000
--- a/net/netatalk22/patches/patch-bin_ad_ad__cp.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bin_ad_ad__cp.c,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
---- bin/ad/ad_cp.c.orig	2013-03-28 19:06:20.000000000 +0000
-+++ bin/ad/ad_cp.c
-@@ -841,7 +841,7 @@ static int setfile(const struct stat *fs
-     islink = !fdval && S_ISLNK(fs->st_mode);
-     mode = fs->st_mode & (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO);
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-     TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atimespec);
-     TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtimespec);
- #else
diff --git a/net/netatalk22/patches/patch-ah b/net/netatalk22/patches/patch-config_Makefile.in
index 2c3906ca4d0..5e460ab58f6 100644
--- a/net/netatalk22/patches/patch-ah
+++ b/net/netatalk22/patches/patch-config_Makefile.in
@@ -1,4 +1,9 @@
-$NetBSD: patch-ah,v 1.1 2014/06/11 11:03:56 hauke Exp $
+$NetBSD: patch-config_Makefile.in,v 1.1 2017/07/12 13:56:00 hauke Exp $
+
+Install config files to examples/netatalk, and leave installation to
+the pkginstall framerwork.
+
+Renamed from patch-ah
 
 --- config/Makefile.in.orig	2011-09-06 07:41:20.000000000 -0400
 +++ config/Makefile.in	2011-09-21 09:34:21.000000000 -0400
diff --git a/net/netatalk22/patches/patch-configure b/net/netatalk22/patches/patch-configure
index 1855aea4ec7..9edb93b6124 100644
--- a/net/netatalk22/patches/patch-configure
+++ b/net/netatalk22/patches/patch-configure
@@ -1,4 +1,7 @@
-$NetBSD: patch-configure,v 1.2 2017/07/11 15:51:14 hauke Exp $
+$NetBSD: patch-configure,v 1.3 2017/07/12 13:56:00 hauke Exp $
+
+Disable zeroconf explicitely, unless enabled - the distribution
+appears not to allow for this.
 
 We do not at this point support zeroconf via avahi. Since configure
 does not allow for building without avahi, and native avahi is picked
@@ -8,18 +11,26 @@ Fix build on SunOS by disabling the isainfo bitness check
 
 --- configure.orig	2013-07-23 09:11:35.000000000 +0000
 +++ configure
-@@ -16185,7 +16185,9 @@ $as_echo "#define HAVE_MDNS 1" >>confdef
+@@ -16109,7 +16109,7 @@ fi
+ if test "${enable_zeroconf+set}" = set; then :
+   enableval=$enable_zeroconf; zeroconf=$enableval
+ else
+-  zeroconf=try
++  zeroconf=no
+ 
+ fi
+ 
+@@ -16185,7 +16185,8 @@ $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
+@@ -17535,7 +17536,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
diff --git a/net/netatalk22/patches/patch-distrib_initscripts_Makefile.in b/net/netatalk22/patches/patch-distrib_initscripts_Makefile.in
index 1e7b7d79f1b..847e5afe29f 100644
--- a/net/netatalk22/patches/patch-distrib_initscripts_Makefile.in
+++ b/net/netatalk22/patches/patch-distrib_initscripts_Makefile.in
@@ -1,4 +1,7 @@
-$NetBSD: patch-distrib_initscripts_Makefile.in,v 1.1 2014/06/11 11:03:56 hauke Exp $
+$NetBSD: patch-distrib_initscripts_Makefile.in,v 1.2 2017/07/12 13:56:00 hauke Exp $
+
+NetBSD specific adaptation to install process (christos committed
+them, ask him ;)
 
 --- distrib/initscripts/Makefile.in.orig	2012-09-28 07:49:25.000000000 +0000
 +++ distrib/initscripts/Makefile.in
diff --git a/net/netatalk22/patches/patch-etc_afpd_afp_mdns.c b/net/netatalk22/patches/patch-etc_afpd_afp_mdns.c
deleted file mode 100644
index 2677f4a5acb..00000000000
--- a/net/netatalk22/patches/patch-etc_afpd_afp_mdns.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-etc_afpd_afp_mdns.c,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
---- etc/afpd/afp_mdns.c.orig	2012-09-10 09:34:52.000000000 +0000
-+++ etc/afpd/afp_mdns.c
-@@ -167,7 +167,7 @@ static void register_stuff(const AFPConf
- 
-     // Allocate the memory to store our service refs
-     svc_refs = calloc(svc_ref_count, sizeof(DNSServiceRef));
--    assert(svc_ref);
-+    assert(svc_refs);
-     svc_ref_count = 0;
- 
-     /* AFP server */
diff --git a/net/netatalk22/patches/patch-etc_afpd_filedir.c b/net/netatalk22/patches/patch-etc_afpd_filedir.c
deleted file mode 100644
index ac41795b17c..00000000000
--- a/net/netatalk22/patches/patch-etc_afpd_filedir.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-etc_afpd_filedir.c,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
---- etc/afpd/filedir.c.orig	2013-07-23 09:10:55.000000000 +0000
-+++ etc/afpd/filedir.c
-@@ -372,7 +372,7 @@ static int moveandrename(const struct vo
- #ifdef HAVE_ATFUNCS
-         opened = of_findnameat(sdir_fd, &path);
- #else
--        opened = of_findname(&path);
-+        opened = of_findname(vol, &path);
- #endif /* HAVE_ATFUNCS */
- 
-         if (opened) {
diff --git a/net/netatalk22/patches/patch-etc_afpd_quota_c b/net/netatalk22/patches/patch-etc_afpd_quota_c
deleted file mode 100644
index cc8cc7bdd2c..00000000000
--- a/net/netatalk22/patches/patch-etc_afpd_quota_c
+++ /dev/null
@@ -1,173 +0,0 @@
-$NetBSD: patch-etc_afpd_quota_c,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
-Use the netbsd-6 quota API, not the prerelease stuff from 5.99.x.
-
-Fix some glaring bugs in the code for the 5.99.x quotas (seteuid'ing
-to group ids, using uninitialized group quota values, etc.)
-
---- etc/afpd/quota.c.orig	2011-08-18 12:23:44.000000000 +0000
-+++ etc/afpd/quota.c
-@@ -48,14 +48,18 @@ char *strchr (), *strrchr ();
- #include "unix.h"
- 
- #ifdef HAVE_LIBQUOTA
--#include <quota/quota.h>
-+#include <quota.h>
-+
- 
- static int
- getfreespace(struct vol *vol, VolSpace *bfree, VolSpace *btotal,
--    uid_t uid, const char *classq)
-+    id_t id, int idtype)
- {
--	int retq;
--	struct ufs_quota_entry ufsq[QUOTA_NLIMITS];
-+	uid_t prevuid;
-+	const char *msg;
-+	struct quotahandle *qh;
-+	struct quotakey qk;
-+	struct quotaval qv;
- 	time_t now;
- 
- 	if (time(&now) == -1) {
-@@ -64,65 +68,107 @@ getfreespace(struct vol *vol, VolSpace *
- 		return -1;
- 	}
- 
-+	prevuid = geteuid();
-+	if (prevuid == -1) {
-+		LOG(log_info, logtype_afpd, "geteuid(): %s",
-+		    strerror(errno));
-+		return -1;
-+	}
-+
- 	if ( seteuid( getuid() ) != 0 )  {
- 		LOG(log_info, logtype_afpd, "seteuid(): %s",
- 		    strerror(errno));
- 		return -1;
- 	}
--	if ((retq = getfsquota(vol->v_path, ufsq, uid, classq)) < 0) {
--		LOG(log_info, logtype_afpd, "getfsquota(%s, %s): %s",
--		    vol->v_path, classq, strerror(errno));
-+
-+	/*
-+	 * In a tidier world we might keep the quotahandle open for longer...
-+	 */
-+	qh = quota_open(vol->v_path);
-+	if (qh == NULL) {
-+		if (errno == EOPNOTSUPP || errno == ENXIO) {
-+			/* no quotas on this volume */
-+			seteuid( prevuid );
-+			return 0;
-+		}
-+	   
-+		LOG(log_info, logtype_afpd, "quota_open(%s): %s", vol->v_path,
-+		    strerror(errno));
-+		seteuid( prevuid );
-+		return -1;
- 	}
--        seteuid( uid );
--	if (retq < 1)
--		return retq;
- 
--	switch(QL_STATUS(quota_check_limit(ufsq[QUOTA_LIMIT_BLOCK].ufsqe_cur, 1,
--	    ufsq[QUOTA_LIMIT_BLOCK].ufsqe_softlimit,
--	    ufsq[QUOTA_LIMIT_BLOCK].ufsqe_hardlimit,
--	    ufsq[QUOTA_LIMIT_BLOCK].ufsqe_time, now))) {
--	case QL_S_DENY_HARD:
--	case QL_S_DENY_GRACE:
-+	qk.qk_idtype = idtype;
-+	qk.qk_id = id;
-+	qk.qk_objtype = QUOTA_OBJTYPE_BLOCKS;
-+	if (quota_get(qh, &qk, &qv) < 0) {
-+		if (errno == ENOENT) {
-+			/* no quotas for this id */
-+			quota_close(qh);
-+			seteuid( prevuid );
-+			return 0;
-+		}
-+		msg = strerror(errno);
-+		LOG(log_info, logtype_afpd, "quota_get(%s, %s): %s",
-+		    vol->v_path, quota_idtype_getname(qh, idtype), msg);
-+		quota_close(qh);
-+		seteuid( prevuid );
-+		return -1;
-+	}
-+
-+	quota_close(qh);
-+
-+        seteuid( prevuid );
-+
-+	if (qv.qv_usage >= qv.qv_hardlimit ||
-+	    (qv.qv_usage >= qv.qv_softlimit && now > qv.qv_expiretime)) {
- 		*bfree = 0;
--		*btotal = dbtob(ufsq[QUOTA_LIMIT_BLOCK].ufsqe_cur);
--		break;
--	default:
--		*bfree = dbtob(ufsq[QUOTA_LIMIT_BLOCK].ufsqe_hardlimit -
--		    ufsq[QUOTA_LIMIT_BLOCK].ufsqe_cur);
--		*btotal = dbtob(ufsq[QUOTA_LIMIT_BLOCK].ufsqe_hardlimit);
--		break;
-+		*btotal = dbtob(qv.qv_usage);
-+	}
-+	else {
-+		*bfree = dbtob(qv.qv_hardlimit - qv.qv_usage);
-+		*btotal = dbtob(qv.qv_hardlimit);
- 	}
-+
- 	return 1;
- }
- 
- int uquota_getvolspace( struct vol *vol, VolSpace *bfree, VolSpace *btotal, const u_int32_t bsize)
- {
--	int uretq, gretq;
-+	int uret, gret;
- 	VolSpace ubfree, ubtotal;
- 	VolSpace gbfree, gbtotal;
- 
--	uretq = getfreespace(vol, &ubfree, &ubtotal,
--	    uuid, QUOTADICT_CLASS_USER);
--	LOG(log_info, logtype_afpd, "getfsquota(%s): %d %d",
--	    vol->v_path, (int)ubfree, (int)ubtotal);
-+	uret = getfreespace(vol, &ubfree, &ubtotal,
-+	    uuid, QUOTA_IDTYPE_USER);
-+	if (uret == 1) {
-+		LOG(log_info, logtype_afpd, "quota_get(%s, user): %d %d",
-+		    vol->v_path, (int)ubfree, (int)ubtotal);
-+	}
-+
- 	if (ngroups >= 1) {
--		gretq = getfreespace(vol, &ubfree, &ubtotal,
--		    groups[0], QUOTADICT_CLASS_GROUP);
-+		gret = getfreespace(vol, &gbfree, &gbtotal,
-+		    groups[0], QUOTA_IDTYPE_GROUP);
-+		if (gret == 1) {
-+			LOG(log_info, logtype_afpd, "quota_get(%s, group): %d %d",
-+			    vol->v_path, (int)gbfree, (int)gbtotal);
-+		}
- 	} else
--		gretq = -1;
--	if (uretq < 1 && gretq < 1) { /* no quota for this fs */
-+		gret = 0;
-+
-+	if (uret < 1 && gret < 1) { /* no quota for this fs */
- 		return AFPERR_PARAM;
- 	}
--	if (uretq < 1) {
--		/* use group quotas */
-+	if (uret < 1) {
-+		/* no user quotas, but group quotas; use them */
- 		*bfree = gbfree;
- 		*btotal = gbtotal;
--	} else if (gretq < 1) {
--		/* use user quotas */
-+	} else if (gret < 1) {
-+		/* no group quotas, but user quotas; use them */
- 		*bfree = ubfree;
- 		*btotal = ubtotal;
- 	} else {
--		/* return smallest remaining space of user and group */
-+		/* both; return smallest remaining space of user and group */
- 		if (ubfree < gbfree) {
- 			*bfree = ubfree;
- 			*btotal = ubtotal;
diff --git a/net/netatalk22/patches/patch-etc_papd_print_cups.c b/net/netatalk22/patches/patch-etc_papd_print_cups.c
deleted file mode 100644
index 33c924e1139..00000000000
--- a/net/netatalk22/patches/patch-etc_papd_print_cups.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-etc_papd_print_cups.c,v 1.1 2017/04/13 14:35:53 hauke Exp $
-
-Post-1.6 CUPS has deprecated various function calls, and turned
-central data structures opaque, only to be accessed by accessor
-functions.  Since the project offers little help in migrating existing
-source, we follow everybody else in flicking the magic switches to
-re-enable the olde ways.
-    
---- etc/papd/print_cups.c.orig	2013-07-23 09:10:55.000000000 +0000
-+++ etc/papd/print_cups.c
-@@ -39,7 +39,14 @@
- 
- #ifdef HAVE_CUPS
- 
-+/* enable pre-1.6 CUPS API for now */
-+#define _PPD_DEPRECATED
-+/* expose structs that are private post-1.5 CUPS */
-+#define _IPP_PRIVATE_STRUCTURES 1
-+
-+#include <cups/ipp.h>
- #include <cups/cups.h>
-+#include <cups/ppd.h>
- #include <cups/language.h>
- #include <atalk/unicode.h>
- #include <atalk/logger.h>
diff --git a/net/netatalk22/patches/patch-etc_uams_uams_gss.c b/net/netatalk22/patches/patch-etc_uams_uams_gss.c
deleted file mode 100644
index 64998e24bf4..00000000000
--- a/net/netatalk22/patches/patch-etc_uams_uams_gss.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-etc_uams_uams_gss.c,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
-Dont override the value that recent Heimdal's set.
-
---- etc/uams/uams_gss.c.orig	2011-07-22 04:30:42.000000000 +0000
-+++ etc/uams/uams_gss.c
-@@ -64,8 +64,10 @@ char *strchr (), *strrchr ();
- /* We work around something I don't entirely understand... */
- /* BF: This is a Heimdal/MIT compatibility fix */
- #ifndef HAVE_GSS_C_NT_HOSTBASED_SERVICE
-+#ifndef GSS_C_NT_HOSTBASED_SERVICE
- #define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
- #endif
-+#endif
- 
- #ifdef MIN
- #undef MIN
diff --git a/net/netatalk22/patches/patch-include_atalk_acl.h b/net/netatalk22/patches/patch-include_atalk_acl.h
deleted file mode 100644
index f1db7088336..00000000000
--- a/net/netatalk22/patches/patch-include_atalk_acl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-include_atalk_acl.h,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
---- include/atalk/acl.h.orig	2013-07-23 09:10:55.000000000 +0000
-+++ include/atalk/acl.h
-@@ -53,7 +53,7 @@ extern int remove_acl_vfs(const char *na
- 
- #else /* HAVE_ACLS=no */
- 
--#define O_NETATALK_ACL
-+#define O_NETATALK_ACL 0
- #define chmod_acl chmod
- 
- #endif /* HAVE_ACLS */
diff --git a/net/netatalk22/patches/patch-include_atalk_ldapconfig.h b/net/netatalk22/patches/patch-include_atalk_ldapconfig.h
index e05b5b5ada8..0da04f464a6 100644
--- a/net/netatalk22/patches/patch-include_atalk_ldapconfig.h
+++ b/net/netatalk22/patches/patch-include_atalk_ldapconfig.h
@@ -1,17 +1,22 @@
-$NetBSD: patch-include_atalk_ldapconfig.h,v 1.1 2014/06/11 11:03:56 hauke Exp $
+$NetBSD: patch-include_atalk_ldapconfig.h,v 1.2 2017/07/12 13:56:00 hauke Exp $
 
---- include/atalk/ldapconfig.h.orig	2012-09-10 09:34:52.000000000 +0000
+Correct an erroneous patch that was unfortunately submitted upstream.
+
+Providing an empty header because we do not support ACLs only serves
+to break ldap support.
+							     
+--- include/atalk/ldapconfig.h.orig	2017-07-09 11:03:31.000000000 +0000
 +++ include/atalk/ldapconfig.h
-@@ -1,4 +1,5 @@
+@@ -1,5 +1,4 @@
  #ifdef HAVE_LDAP
-+#ifdef HAVE_ACLS
+-#ifdef HAVE_ACLS
  
  #ifndef LDAPCONFIG_H
  #define LDAPCONFIG_H
-@@ -39,5 +40,5 @@ extern struct pref_array prefs_array[];
+@@ -40,5 +39,5 @@ extern struct pref_array prefs_array[];
  extern int ldap_config_valid;
  
  #endif /* LDAPCONFIG_H */
--
-+#endif /* HAVE_ACLS */
+-#endif /* HAVE_ACLS */
++
  #endif /* HAVE_LDAP */
diff --git a/net/netatalk22/patches/patch-macros_quota-check.m4 b/net/netatalk22/patches/patch-macros_quota-check.m4
deleted file mode 100644
index b424bb65e37..00000000000
--- a/net/netatalk22/patches/patch-macros_quota-check.m4
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-macros_quota-check.m4,v 1.1 2014/06/11 11:03:56 hauke Exp $
-
-- do not disable quota support if some of rpc/rpc.h, rpc/pmap_prot.h,
-  rpcsvc/rquota.h are missing.
-
-- fix libquota test to check for the netbsd-6 release quota API, not
-  the prerelease proplib-based API in 5.99 that got removed before
-  netbsd-6.
-
-This logic should probably be simplified, and expanded some to
-simplify the mess of quota-related ifdefs in the source; the rquotad
-support connected to the rpc headers and -lrpcsvc should be
-independent of the local quota support, and can be probed for
-independently. However, this needs to be coordinated with upstream,
-not done in pkgsrc.
-
---- macros/quota-check.m4.orig	2011-08-18 12:23:44.000000000 +0000
-+++ macros/quota-check.m4
-@@ -10,13 +10,9 @@ AC_DEFUN([AC_CHECK_QUOTA], [
- 	QUOTA_LIBS=""
- 	netatalk_cv_quotasupport="yes"
- 	AC_CHECK_LIB(rpcsvc, main, [QUOTA_LIBS="-lrpcsvc"])
--	AC_CHECK_HEADERS([rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h],[],[
--		QUOTA_LIBS=""
--		netatalk_cv_quotasupport="no"
--		AC_DEFINE(NO_QUOTA_SUPPORT, 1, [Define if quota support should not compiled])
--	])
--	AC_CHECK_LIB(quota, getfsquota, [QUOTA_LIBS="-lquota -lprop -lrpcsvc"
--	    AC_DEFINE(HAVE_LIBQUOTA, 1, [define if you have libquota])], [], [-lprop -lrpcsvc])
-+	AC_CHECK_HEADERS([rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h],[],[])
-+	AC_CHECK_LIB(quota, quota_open, [QUOTA_LIBS="-lquota -lrpcsvc"
-+	    AC_DEFINE(HAVE_LIBQUOTA, 1, [define if you have libquota])], [], [-lrpcsvc])
- 	else
- 		netatalk_cv_quotasupport="no"
- 		AC_DEFINE(NO_QUOTA_SUPPORT, 1, [Define if quota support should not compiled])