CUPS 2.x does not support OpenSSL any more. Switch to GNU TLS by default.

MFH:		2015Q2

5 files changed, 9 insertions, 24 deletions

diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index f9aa222..8d11990 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -15,6 +15,9 @@ COMMENT=	Common UNIX Printing System: ${COMMENT2}
 
 LICENSE=	GPLv2
 
+LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+
 CONFLICTS=	LPRng-[0-9]*
 
 UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
@@ -37,7 +40,7 @@ CONFIGURE_ARGS+=	--localstatedir=/var			\
 			--with-domainsocket=${CUPS_SOCKET}	\
 			--with-cachedir=${CUPS_CACHEDIR}	\
 			--with-pam-module="unix"		\
-			--enable-ssl
+			--enable-gnutls
 
 CUPS_CACHEDIR?=	/var/db/cups
 CUPS_SPOOLDIR=	/var/spool/cups
@@ -51,23 +54,20 @@ GROUPS=	cups
 USERS=		cups
 
 # UNIQUENAME must be set before bsd.port.pre.mk so OPTIONSFILE can be included
-OPTIONS_SINGLE=		SSL
-OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
-OPTIONS_DEFAULT=	OPENSSL
 OPTIONS_SUB=		yes
 .if defined(CUPS_CLIENT)
-PORTREVISION=	0
+PORTREVISION=	1
 LICENSE=	LGPL21
 CUPS_SUFFIX=	-client
 OPTIONS_RADIO=		ZEROCONF
 OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
 OPTIONS_DEFAULT+=	MDNSRESPONDER
 .elif defined(CUPS_IMAGE)
-PORTREVISION=	0
+PORTREVISION=	1
 CUPS_SUFFIX=	-image
 LICENSE=	LGPL21
 .else
-PORTREVISION=	0
+PORTREVISION=	1
 CUPS_SUFFIX=	-base
 # No DOCS option.  Files are needed by web interface.
 OPTIONS_DEFINE=		DBUS ICONS LIBPAPER LIBUSB PAM XDG_OPEN
@@ -128,17 +128,6 @@ PLIST_SUB+=		OVERWRITE="@comment "
 CONFIGURE_ARGS+=	--with-printcap=${PREFIX}/etc/printcap
 .endif
 
-.if ${PORT_OPTIONS:MGNUTLS}
-CONFIGURE_ARGS+=	--disable-openssl --enable-gnutls
-LIB_DEPENDS+=		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-			libgnutls.so:${PORTSDIR}/security/gnutls
-.endif
-
-.if ${PORT_OPTIONS:MOPENSSL}
-USE_OPENSSL=		yes
-CONFIGURE_ARGS+=	--disable-gnutls --enable-openssl
-.endif
-
 # Don't use CONFIGURE_ARGS+=--without-* to disable web interpreters because it
 # will set the path of the interpreter to "no" and set it's existence to TRUE.
 .if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE)
diff --git a/print/cups-base/pkg-descr b/print/cups-base/pkg-descr
index cb23c61..0d4fa73 100644
--- a/print/cups-base/pkg-descr
+++ b/print/cups-base/pkg-descr
@@ -17,7 +17,5 @@ non-PostScript printers. Sample drivers for HP and EPSON printers are included
 that use these filters. This software is available in the cups-pstoraster
 port.
 
-LICENSE: GPL2 or later with exception to link with OpenSSL
-
 WWW: http://www.cups.org/
 [original text by greid@ukug.uk.freebsd.org]
diff --git a/print/cups-base/pkg-descr.client b/print/cups-base/pkg-descr.client
index c4d4ed5..897a8d1 100644
--- a/print/cups-base/pkg-descr.client
+++ b/print/cups-base/pkg-descr.client
@@ -1,5 +1,3 @@
 This provides libcups for applications to access CUPS.
 
-LICENSE: LGPL2 or later with exception to link with OpenSSL
-
 WWW: http://www.cups.org/
diff --git a/print/cups-base/pkg-descr.image b/print/cups-base/pkg-descr.image
index 77526b2..cf6c8e0 100644
--- a/print/cups-base/pkg-descr.image
+++ b/print/cups-base/pkg-descr.image
@@ -1,5 +1,3 @@
 This provides libcupsimage for applications to process CUPS raster files.
 
-LICENSE: LGPL2 or later with exception to link with OpenSSL
-
 WWW: http://www.cups.org/
diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist
index ceea41b..d3213d6 100644
--- a/print/cups-base/pkg-plist
+++ b/print/cups-base/pkg-plist
@@ -42,7 +42,9 @@ lib/libcupsmime.so.1
 lib/libcupsppdc.so
 lib/libcupsppdc.so.1
 libexec/cups/backend/http
+libexec/cups/backend/https
 libexec/cups/backend/ipp
+libexec/cups/backend/ipps
 libexec/cups/backend/lpd
 libexec/cups/backend/snmp
 libexec/cups/backend/socket