From owner-svn-ports-head@freebsd.org Wed Mar 23 11:44:30 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AFF70AD805B; Wed, 23 Mar 2016 11:44:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6036F1969; Wed, 23 Mar 2016 11:44:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2NBiTr2031447; Wed, 23 Mar 2016 11:44:29 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2NBiT8r031445; Wed, 23 Mar 2016 11:44:29 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201603231144.u2NBiT8r031445@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 23 Mar 2016 11:44:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411700 - head/print/cups X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Mar 2016 11:44:30 -0000 Author: jbeich Date: Wed Mar 23 11:44:29 2016 New Revision: 411700 URL: https://svnweb.freebsd.org/changeset/ports/411700 Log: print/cups: revive GNUTLS option after r389015 SSL remains enabled by default but now can be optionally disabled reducing reducing the number of dependencies. PR: 208223 Approved by: tijl (maintainer) Modified: head/print/cups/Makefile (contents, props changed) head/print/cups/pkg-plist (contents, props changed) Modified: head/print/cups/Makefile ============================================================================== --- head/print/cups/Makefile Wed Mar 23 11:23:10 2016 (r411699) +++ head/print/cups/Makefile Wed Mar 23 11:44:29 2016 (r411700) @@ -16,8 +16,6 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE.txt LICENSE_FILE_LGPL20= ${WRKSRC}/LICENSE.txt -LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls - CONFLICTS= LPRng-[0-9]* DESTDIRNAME= DSTROOT @@ -26,7 +24,6 @@ CONFIGURE_ARGS= --disable-dnssd \ --disable-gssapi \ --disable-launchd \ --disable-systemd \ - --enable-gnutls \ --with-cups-user=${USERS} \ --with-cups-group=${GROUPS} \ --with-system-groups=wheel \ @@ -39,6 +36,7 @@ CONFIGURE_ARGS= --disable-dnssd \ --with-pam-module="unix" \ ac_cv_path_JAVA= ac_cv_path_PERL= ac_cv_path_PHPCGI= \ ac_cv_path_PHP= ac_cv_path_PYTHON= +CPPFLAGS+= -isystem ${LOCALBASE}/include # libpaper mainly LIBS+= -L${LOCALBASE}/lib USES= cpe gmake iconv pkgconfig tar:bzip2 CPE_VENDOR= apple @@ -49,8 +47,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER GROUPS= cups USERS= cups -OPTIONS_DEFINE= AVAHI DBUS DOCS IPPTOOL LIBPAPER NLS X11 -OPTIONS_DEFAULT= AVAHI DBUS LIBPAPER +OPTIONS_DEFINE= AVAHI DBUS DOCS GNUTLS IPPTOOL LIBPAPER NLS X11 +OPTIONS_DEFAULT= AVAHI DBUS GNUTLS LIBPAPER OPTIONS_SUB= yes AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app @@ -63,6 +61,10 @@ DBUS_CONFIGURE_ENABLE= dbus DBUS_SUB_LIST= DBUS_DAEMON=dbus DBUS_SUB_LIST_OFF= DBUS_DAEMON= +GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls +GNUTLS_CONFIGURE_ON= --enable-gnutls +GNUTLS_CONFIGURE_OFF= --disable-ssl + IPPTOOL_DESC= Internet Printing Protocol testing tool LIBPAPER_LIB_DEPENDS= libpaper.so:${PORTSDIR}/print/libpaper Modified: head/print/cups/pkg-plist ============================================================================== --- head/print/cups/pkg-plist Wed Mar 23 11:23:10 2016 (r411699) +++ head/print/cups/pkg-plist Wed Mar 23 11:44:29 2016 (r411700) @@ -62,9 +62,9 @@ lib/libcupsmime.so.1 lib/libcupsppdc.so lib/libcupsppdc.so.1 libexec/cups/backend/http -libexec/cups/backend/https +%%GNUTLS%%libexec/cups/backend/https libexec/cups/backend/ipp -libexec/cups/backend/ipps +%%GNUTLS%%libexec/cups/backend/ipps libexec/cups/backend/lpd libexec/cups/backend/snmp libexec/cups/backend/socket