CVS commit: pkgsrc/print/cups

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Feb 17 23:45:48 UTC 2017

Modified Files:
        pkgsrc/print/cups: options.mk
Removed Files:
        pkgsrc/print/cups: MESSAGE.nokerberos

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

Add upstream bug report URL.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 pkgsrc/print/cups/MESSAGE.nokerberos
cvs rdiff -u -r1.20 -r1.21 pkgsrc/print/cups/options.mk

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

Modified files:

Index: pkgsrc/print/cups/options.mk
diff -u pkgsrc/print/cups/options.mk:1.20 pkgsrc/print/cups/options.mk:1.21
--- pkgsrc/print/cups/options.mk:1.20   Thu Feb 16 13:09:19 2017
+++ pkgsrc/print/cups/options.mk        Fri Feb 17 23:45:48 2017
@@ -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+=     --disable-dnssd
 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)