Thu Apr 13 14:35:53 2017 UTC ()
#define CUPS API compatibility options so we can build against newer
CUPS versions, and switch dependency away from cups15.

Update conflicts list.


(hauke)
diff -r1.6 -r1.7 pkgsrc/net/netatalk22/Makefile
diff -r1.2 -r1.3 pkgsrc/net/netatalk22/distinfo
diff -r1.2 -r1.3 pkgsrc/net/netatalk22/options.mk
diff -r0 -r1.1 pkgsrc/net/netatalk22/patches/patch-etc_papd_print_cups.c
cvs diff -r1.6 -r1.7 pkgsrc/net/netatalk22/Makefile (expand / switch to unified diff)

--- pkgsrc/net/netatalk22/Makefile 2016/07/09 06:38:44 1.6
+++ pkgsrc/net/netatalk22/Makefile 2017/04/13 14:35:53 1.7
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.6 2016/07/09 06:38:44 wiz Exp $ 1# $NetBSD: Makefile,v 1.7 2017/04/13 14:35:53 hauke Exp $
2 2
3DISTNAME= netatalk-2.2.5 3DISTNAME= netatalk-2.2.5
4PKGNAME= ${DISTNAME:C/-/22-/} 4PKGNAME= ${DISTNAME:C/-/22-/}
5PKGREVISION= 4 5PKGREVISION= 5
6CATEGORIES= net print 6CATEGORIES= net print
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9#PATCHFILES= patch-adv1tov2.c 9#PATCHFILES= patch-adv1tov2.c
10PATCH_SITES= http://svn.macosforge.org/repository/macports/trunk/dports/net/netatalk/files/ \ 10PATCH_SITES= http://svn.macosforge.org/repository/macports/trunk/dports/net/netatalk/files/ \
11 http://mirror.lug.udel.edu/pub/macports/trunk/dports/net/netatalk/files/ 11 http://mirror.lug.udel.edu/pub/macports/trunk/dports/net/netatalk/files/
12 12
13MAINTAINER= markd@NetBSD.org 13MAINTAINER= markd@NetBSD.org
14HOMEPAGE= http://netatalk.sourceforge.net/ 14HOMEPAGE= http://netatalk.sourceforge.net/
15COMMENT= Netatalk appletalk file and print services 15COMMENT= Netatalk appletalk file and print services
16LICENSE= gnu-gpl-v2 16LICENSE= gnu-gpl-v2
17 17
18BDB_ACCEPTED= db4 db5 18BDB_ACCEPTED= db4 db5
@@ -22,27 +22,27 @@ USE_TOOLS+= gmake perl:run @@ -22,27 +22,27 @@ USE_TOOLS+= gmake perl:run
22GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
23 23
24BUILDLINK_TRANSFORM+= l:db48:${BDB_TYPE} 24BUILDLINK_TRANSFORM+= l:db48:${BDB_TYPE}
25 25
26PKG_SYSCONFSUBDIR= netatalk 26PKG_SYSCONFSUBDIR= netatalk
27EGDIR= ${PREFIX}/share/examples/netatalk 27EGDIR= ${PREFIX}/share/examples/netatalk
28CONF_FILES= ${EGDIR}/AppleVolumes.default ${PKG_SYSCONFDIR}/AppleVolumes.default 28CONF_FILES= ${EGDIR}/AppleVolumes.default ${PKG_SYSCONFDIR}/AppleVolumes.default
29CONF_FILES+= ${EGDIR}/AppleVolumes.system ${PKG_SYSCONFDIR}/AppleVolumes.system 29CONF_FILES+= ${EGDIR}/AppleVolumes.system ${PKG_SYSCONFDIR}/AppleVolumes.system
30CONF_FILES+= ${EGDIR}/afpd.conf ${PKG_SYSCONFDIR}/afpd.conf 30CONF_FILES+= ${EGDIR}/afpd.conf ${PKG_SYSCONFDIR}/afpd.conf
31CONF_FILES+= ${EGDIR}/atalkd.conf ${PKG_SYSCONFDIR}/atalkd.conf 31CONF_FILES+= ${EGDIR}/atalkd.conf ${PKG_SYSCONFDIR}/atalkd.conf
32CONF_FILES+= ${EGDIR}/netatalk.conf ${PKG_SYSCONFDIR}/netatalk.conf 32CONF_FILES+= ${EGDIR}/netatalk.conf ${PKG_SYSCONFDIR}/netatalk.conf
33CONF_FILES+= ${EGDIR}/papd.conf ${PKG_SYSCONFDIR}/papd.conf 33CONF_FILES+= ${EGDIR}/papd.conf ${PKG_SYSCONFDIR}/papd.conf
34 34
35CONFLICTS= netatalk30-[0-9]* netatalk-[0-9]* 35CONFLICTS= netatalk3-[0-9]* netatalk30-[0-9]* netatalk-[0-9]*
36CONFLICTS+= netatalk-asun-[0-9]* netatalk-umich-[0-9]* 36CONFLICTS+= netatalk-asun-[0-9]* netatalk-umich-[0-9]*
37 37
38.include "../../mk/bsd.prefs.mk" 38.include "../../mk/bsd.prefs.mk"
39 39
40BUILD_DEFS+= VARBASE 40BUILD_DEFS+= VARBASE
41CONFIGURE_ARGS+= --enable-overwrite 41CONFIGURE_ARGS+= --enable-overwrite
42CONFIGURE_ARGS+= --enable-timelord 42CONFIGURE_ARGS+= --enable-timelord
43CONFIGURE_ARGS+= --enable-ddp 43CONFIGURE_ARGS+= --enable-ddp
44CONFIGURE_ARGS+= --enable-quota 44CONFIGURE_ARGS+= --enable-quota
45CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/netatalk 45CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/netatalk
46CONFIGURE_ARGS+= --sbindir=${PREFIX}/libexec/netatalk 46CONFIGURE_ARGS+= --sbindir=${PREFIX}/libexec/netatalk
47CONFIGURE_ARGS+= --with-pkgconfdir=${PKG_SYSCONFDIR} 47CONFIGURE_ARGS+= --with-pkgconfdir=${PKG_SYSCONFDIR}
48CONFIGURE_ARGS+= --with-message-dir=${PKG_SYSCONFDIR}/msg 48CONFIGURE_ARGS+= --with-message-dir=${PKG_SYSCONFDIR}/msg
cvs diff -r1.2 -r1.3 pkgsrc/net/netatalk22/distinfo (expand / switch to unified diff)

--- pkgsrc/net/netatalk22/distinfo 2015/11/04 00:35:15 1.2
+++ pkgsrc/net/netatalk22/distinfo 2017/04/13 14:35:53 1.3
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1$NetBSD: distinfo,v 1.2 2015/11/04 00:35:15 agc Exp $ 1$NetBSD: distinfo,v 1.3 2017/04/13 14:35:53 hauke Exp $
2 2
3SHA1 (netatalk-2.2.5.tar.bz2) = 4367421213d68b8396cf35743e347e9c01bdf3b0 3SHA1 (netatalk-2.2.5.tar.bz2) = 4367421213d68b8396cf35743e347e9c01bdf3b0
4RMD160 (netatalk-2.2.5.tar.bz2) = ff0165806973b19db906406fd4b37dd49d505a27 4RMD160 (netatalk-2.2.5.tar.bz2) = ff0165806973b19db906406fd4b37dd49d505a27
5SHA512 (netatalk-2.2.5.tar.bz2) = 77a9b0a49825a0803dfbf16ebf8df0efd7b9244f6cdaed6755936c0af8a62ccb834cac30d47d205ce378bbfb91cf11590eef88896f1d48e6ddbaa8b45e71c612 5SHA512 (netatalk-2.2.5.tar.bz2) = 77a9b0a49825a0803dfbf16ebf8df0efd7b9244f6cdaed6755936c0af8a62ccb834cac30d47d205ce378bbfb91cf11590eef88896f1d48e6ddbaa8b45e71c612
6Size (netatalk-2.2.5.tar.bz2) = 1290761 bytes 6Size (netatalk-2.2.5.tar.bz2) = 1290761 bytes
7SHA1 (patch-ac) = 605e87479202cbf093dfbadb25f2972595246d97 7SHA1 (patch-ac) = 605e87479202cbf093dfbadb25f2972595246d97
8SHA1 (patch-ae) = e114085fbe2abf2fb821f2d2737e877c53e7c151 8SHA1 (patch-ae) = e114085fbe2abf2fb821f2d2737e877c53e7c151
9SHA1 (patch-af) = 649be7e50210e6e4156aeff74d3fc0effb90f9f2 9SHA1 (patch-af) = 649be7e50210e6e4156aeff74d3fc0effb90f9f2
10SHA1 (patch-ah) = 505680d4085f5e40afb0554b5c748c1f6c68c367 10SHA1 (patch-ah) = 505680d4085f5e40afb0554b5c748c1f6c68c367
11SHA1 (patch-am) = a4e7fe53eb55ae17eb1888cfb278bc86d383f4fb 11SHA1 (patch-am) = a4e7fe53eb55ae17eb1888cfb278bc86d383f4fb
12SHA1 (patch-an) = 5472758813b927708ca178809fb89733719e67b4 12SHA1 (patch-an) = 5472758813b927708ca178809fb89733719e67b4
13SHA1 (patch-ao) = 1b140d7b8fc1df6b44b15a181ddc625744610bb9 13SHA1 (patch-ao) = 1b140d7b8fc1df6b44b15a181ddc625744610bb9
14SHA1 (patch-ap) = c5e7cc0e1773d7e60106df7e1f3ded234308bb8c 14SHA1 (patch-ap) = c5e7cc0e1773d7e60106df7e1f3ded234308bb8c
15SHA1 (patch-aq) = 0793cf5ec158aa27c42b5d8a96651307d7c7c8b6 15SHA1 (patch-aq) = 0793cf5ec158aa27c42b5d8a96651307d7c7c8b6
16SHA1 (patch-au) = 8505351fee21ac1effa4dc620b8006c572b913c1 16SHA1 (patch-au) = 8505351fee21ac1effa4dc620b8006c572b913c1
17SHA1 (patch-bin_ad_ad__cp.c) = 0a9e93f6149ff53f0f0d8c36ea4c5e635b5b624c 17SHA1 (patch-bin_ad_ad__cp.c) = 0a9e93f6149ff53f0f0d8c36ea4c5e635b5b624c
18SHA1 (patch-configure) = 5beb3677965c0a98297f6c7ce5ad6b598bfd9e8b 18SHA1 (patch-configure) = 5beb3677965c0a98297f6c7ce5ad6b598bfd9e8b
19SHA1 (patch-distrib_initscripts_Makefile.in) = 3dc520f998b2b35ea60cd8f1a2a96d465a9e474a 19SHA1 (patch-distrib_initscripts_Makefile.in) = 3dc520f998b2b35ea60cd8f1a2a96d465a9e474a
20SHA1 (patch-etc_afpd_afp_mdns.c) = ab87bf511466ef183de1ee8f8a9ad1fbb8776066 20SHA1 (patch-etc_afpd_afp_mdns.c) = ab87bf511466ef183de1ee8f8a9ad1fbb8776066
21SHA1 (patch-etc_afpd_filedir.c) = ae139f008ca322932dc495f18dfa277085a4c2ed 21SHA1 (patch-etc_afpd_filedir.c) = ae139f008ca322932dc495f18dfa277085a4c2ed
22SHA1 (patch-etc_afpd_quota_c) = 5005abb6528c0b3160a587fbe9fb285f485e6759 22SHA1 (patch-etc_afpd_quota_c) = 5005abb6528c0b3160a587fbe9fb285f485e6759
 23SHA1 (patch-etc_papd_print_cups.c) = 0bfa8d75691e11e3bbbc0bb59cd342fb5500b6ac
23SHA1 (patch-etc_uams_uams_gss.c) = b9ff59c368e01d3f269e95f5eaeb239dc17e701c 24SHA1 (patch-etc_uams_uams_gss.c) = b9ff59c368e01d3f269e95f5eaeb239dc17e701c
24SHA1 (patch-include_atalk_acl.h) = 62d67eaf089126b2c0bff0871b23f7a6707e119c 25SHA1 (patch-include_atalk_acl.h) = 62d67eaf089126b2c0bff0871b23f7a6707e119c
25SHA1 (patch-include_atalk_ldapconfig.h) = d0bb4a1bf520b18228de6ab87b646f4496852fce 26SHA1 (patch-include_atalk_ldapconfig.h) = d0bb4a1bf520b18228de6ab87b646f4496852fce
26SHA1 (patch-macros_quota-check.m4) = b1484f83a2a6ba5bd50623ab525d5366bb71abaa 27SHA1 (patch-macros_quota-check.m4) = b1484f83a2a6ba5bd50623ab525d5366bb71abaa
cvs diff -r1.2 -r1.3 pkgsrc/net/netatalk22/options.mk (expand / switch to unified diff)

--- pkgsrc/net/netatalk22/options.mk 2014/06/18 09:26:10 1.2
+++ pkgsrc/net/netatalk22/options.mk 2017/04/13 14:35:53 1.3
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: options.mk,v 1.2 2014/06/18 09:26:10 wiz Exp $ 1# $NetBSD: options.mk,v 1.3 2017/04/13 14:35:53 hauke Exp $
2# 2#
3PKG_OPTIONS_VAR= PKG_OPTIONS.netatalk 3PKG_OPTIONS_VAR= PKG_OPTIONS.netatalk
4PKG_SUPPORTED_OPTIONS= cups debug dnssd kerberos ldap pam slp 4PKG_SUPPORTED_OPTIONS= cups debug dnssd kerberos ldap pam slp
5 5
6.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
7 7
8.if !empty(PKG_OPTIONS:Mcups) 8.if !empty(PKG_OPTIONS:Mcups)
9.include "../../print/cups15/buildlink3.mk" 9.include "../../print/cups/buildlink3.mk"
10CONFIGURE_ARGS+= --enable-cups 10CONFIGURE_ARGS+= --enable-cups
11.else 11.else
12CONFIGURE_ARGS+= --disable-cups 12CONFIGURE_ARGS+= --disable-cups
13.endif 13.endif
14 14
15PLIST_VARS+= debug 15PLIST_VARS+= debug
16.if !empty(PKG_OPTIONS:Mdebug) 16.if !empty(PKG_OPTIONS:Mdebug)
17# Debugging 17# Debugging
18CONFIGURE_ARGS+= --enable-debug1 18CONFIGURE_ARGS+= --enable-debug1
19CONFIGURE_ARGS+= --enable-debug 19CONFIGURE_ARGS+= --enable-debug
20CONFIGURE_ARGS+= --enable-debugging 20CONFIGURE_ARGS+= --enable-debugging
21CFLAGS+= -g3 21CFLAGS+= -g3
22INSTALL_UNSTRIPPED= yes 22INSTALL_UNSTRIPPED= yes
File Added: pkgsrc/net/netatalk22/patches/Attic/patch-etc_papd_print_cups.c
$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>