aboutsummaryrefslogtreecommitdiff
path: root/print/cups
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2016-03-23 11:44:29 +0000
committerJan Beich <jbeich@FreeBSD.org>2016-03-23 11:44:29 +0000
commit97638adc987b23eeadf1dc92efd94321bc64ca77 (patch)
tree04d5d89d53f739ccac6db6ec90160aaaec6869cf /print/cups
parent26bd2c187aa7fd6a3db90c9de4db21556766a755 (diff)
downloadports-97638adc987b23eeadf1dc92efd94321bc64ca77.tar.gz
ports-97638adc987b23eeadf1dc92efd94321bc64ca77.zip
Notes
Diffstat (limited to 'print/cups')
-rw-r--r--print/cups/Makefile12
-rw-r--r--print/cups/pkg-plist4
2 files changed, 9 insertions, 7 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile
index e94eba0e59a7..e0e313844f23 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -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}-${PORTVERSION}
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
diff --git a/print/cups/pkg-plist b/print/cups/pkg-plist
index e36080a3e79b..dd91b7796b0a 100644
--- a/print/cups/pkg-plist
+++ b/print/cups/pkg-plist
@@ -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