#define CUPS API compatibility options so we can build against newer

CUPS versions, and switch dependency away from cups15.

Update conflicts list.

4 files changed, 32 insertions, 6 deletions

diff --git a/net/netatalk22/Makefile b/net/netatalk22/Makefile
index c6e474e7f10..af8fe672fac 100644
--- a/net/netatalk22/Makefile
+++ b/net/netatalk22/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2016/07/09 06:38:44 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2017/04/13 14:35:53 hauke Exp $
 
 DISTNAME=	netatalk-2.2.5
 PKGNAME=        ${DISTNAME:C/-/22-/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=	.tar.bz2
@@ -32,7 +32,7 @@ CONF_FILES+=	${EGDIR}/atalkd.conf ${PKG_SYSCONFDIR}/atalkd.conf
 CONF_FILES+=	${EGDIR}/netatalk.conf ${PKG_SYSCONFDIR}/netatalk.conf
 CONF_FILES+=	${EGDIR}/papd.conf ${PKG_SYSCONFDIR}/papd.conf
 
-CONFLICTS=		netatalk30-[0-9]* netatalk-[0-9]*
+CONFLICTS=		netatalk3-[0-9]* netatalk30-[0-9]* netatalk-[0-9]*
 CONFLICTS+=		netatalk-asun-[0-9]* netatalk-umich-[0-9]*
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/netatalk22/distinfo b/net/netatalk22/distinfo
index e21688b52b0..66c117b9103 100644
--- a/net/netatalk22/distinfo
+++ b/net/netatalk22/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 00:35:15 agc Exp $
+$NetBSD: distinfo,v 1.3 2017/04/13 14:35:53 hauke Exp $
 
 SHA1 (netatalk-2.2.5.tar.bz2) = 4367421213d68b8396cf35743e347e9c01bdf3b0
 RMD160 (netatalk-2.2.5.tar.bz2) = ff0165806973b19db906406fd4b37dd49d505a27
@@ -20,6 +20,7 @@ SHA1 (patch-distrib_initscripts_Makefile.in) = 3dc520f998b2b35ea60cd8f1a2a96d465
 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
diff --git a/net/netatalk22/options.mk b/net/netatalk22/options.mk
index f1a82d19f57..dd15d356fca 100644
--- a/net/netatalk22/options.mk
+++ b/net/netatalk22/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2014/06/18 09:26:10 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2017/04/13 14:35:53 hauke Exp $
 #
 PKG_OPTIONS_VAR=	PKG_OPTIONS.netatalk
 PKG_SUPPORTED_OPTIONS=	cups debug dnssd kerberos ldap pam slp
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=	cups debug dnssd kerberos ldap pam slp
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-cups
 .else
 CONFIGURE_ARGS+=	--disable-cups
diff --git a/net/netatalk22/patches/patch-etc_papd_print_cups.c b/net/netatalk22/patches/patch-etc_papd_print_cups.c
new file mode 100644
index 00000000000..33c924e1139
--- /dev/null
+++ b/net/netatalk22/patches/patch-etc_papd_print_cups.c
@@ -0,0 +1,25 @@
+$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>