[pkgsrc/trunk]: pkgsrc/print/cups Handle non-kerberos automatically. Based on...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d6bd11152711
branches:  trunk
changeset: 358672:d6bd11152711
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Feb 17 23:45:48 2017 +0000

description:
Handle non-kerberos automatically. Based on suggestions by pgoyette
and tested by him.

Add upstream bug report URL.

diffstat:

 print/cups/MESSAGE.nokerberos |  7 -------
 print/cups/options.mk         |  9 +++++++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diffs (34 lines):

diff -r 325507088efe -r d6bd11152711 print/cups/MESSAGE.nokerberos
--- a/print/cups/MESSAGE.nokerberos     Fri Feb 17 21:29:13 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.nokerberos,v 1.1 2017/02/16 13:09:19 wiz Exp $
-
-When running a non-kerberized cupsd, you need to remove the kerberos
-section from the config file. Otherwise cupsd will not start.
-
-===========================================================================
diff -r 325507088efe -r d6bd11152711 print/cups/options.mk
--- a/print/cups/options.mk     Fri Feb 17 21:29:13 2017 +0000
+++ b/print/cups/options.mk     Fri Feb 17 23:45:48 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2017/02/16 13:09:19 wiz Exp $
+# $NetBSD: options.mk,v 1.21 2017/02/17 23:45:48 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.cups
 PKG_SUPPORTED_OPTIONS= acl dnssd kerberos pam tcpwrappers
@@ -59,7 +59,12 @@
 CONFIGURE_ARGS+=       --enable-gssapi
 .else
 CONFIGURE_ARGS+=       --disable-gssapi
-MESSAGE_SRC+=          ${PKGDIR}/MESSAGE.nokerberos
+# https://github.com/apple/cups/issues/4947
+SUBST_CLASSES+=                nokerb
+SUBST_STAGE.nokerb=    post-build
+SUBST_SED.nokerb+=     -e '\%<Policy kerberos>%,\%</Policy>%s/^/\#/'
+SUBST_FILES.nokerb+=   conf/cupsd.conf
+SUBST_MESSAGE.nokerb=  Commenting out kerberos section in config.
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibusb)