CVS commit: pkgsrc/print/cups

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Sep 20 11:07:35 UTC 2016

Modified Files:
        pkgsrc/print/cups: Makefile PLIST buildlink3.mk

Log Message:
cups removed openssl support in 2.0b1.

Switch to gnutls.

Reported by Stephan <stephanwib%googlemail.com@localhost> on tech-pkg.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.231 -r1.232 pkgsrc/print/cups/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/print/cups/PLIST
cvs rdiff -u -r1.34 -r1.35 pkgsrc/print/cups/buildlink3.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/Makefile
diff -u pkgsrc/print/cups/Makefile:1.231 pkgsrc/print/cups/Makefile:1.232
--- pkgsrc/print/cups/Makefile:1.231    Sat Jul  9 06:38:50 2016
+++ pkgsrc/print/cups/Makefile  Tue Sep 20 11:07:35 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.231 2016/07/09 06:38:50 wiz Exp $
+# $NetBSD: Makefile,v 1.232 2016/09/20 11:07:35 wiz Exp $
 
 DISTNAME=      cups-2.1.4-source
 PKGNAME=       ${DISTNAME:S/-source//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=apple/}
 GITHUB_RELEASE=        release-${PKGVERSION_NOREV}
@@ -42,7 +42,6 @@ CONFIGURE_ARGS+=      --without-php
 CONFIGURE_ARGS+=       --without-python
 CONFIGURE_ARGS+=       --without-java
 CONFIGURE_ARGS+=       --disable-gssapi
-CONFIGURE_ARGS+=       --disable-gnutls
 
 CONFIGURE_ENV+=                DSOFLAGS=${LDFLAGS:M*:Q}
 
@@ -177,5 +176,5 @@ post-install:
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../print/libpaper/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/cups/PLIST
diff -u pkgsrc/print/cups/PLIST:1.54 pkgsrc/print/cups/PLIST:1.55
--- pkgsrc/print/cups/PLIST:1.54        Sat Jun 18 20:36:38 2016
+++ pkgsrc/print/cups/PLIST     Tue Sep 20 11:07:35 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.54 2016/06/18 20:36:38 leot Exp $
+@comment $NetBSD: PLIST,v 1.55 2016/09/20 11:07:35 wiz Exp $
 bin/cancel
 bin/cups-config
 bin/cupstestdsc
@@ -41,7 +41,9 @@ lib/libcupsmime.la
 lib/libcupsppdc.la
 ${PLIST.dnssd}libexec/cups/backend/dnssd
 libexec/cups/backend/http
+libexec/cups/backend/https
 libexec/cups/backend/ipp
+libexec/cups/backend/ipps
 libexec/cups/backend/lpd
 ${PLIST.dnssd}libexec/cups/backend/mdns
 libexec/cups/backend/snmp

Index: pkgsrc/print/cups/buildlink3.mk
diff -u pkgsrc/print/cups/buildlink3.mk:1.34 pkgsrc/print/cups/buildlink3.mk:1.35
--- pkgsrc/print/cups/buildlink3.mk:1.34        Sat Mar  5 11:27:53 2016
+++ pkgsrc/print/cups/buildlink3.mk     Tue Sep 20 11:07:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.34 2016/03/05 11:27:53 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.35 2016/09/20 11:07:35 wiz Exp $
 
 BUILDLINK_TREE+=       cups
 
@@ -23,7 +23,7 @@ pkgbase := cups
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .endif # CUPS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -cups