summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--print/cups/Makefile8
-rw-r--r--print/cups/distinfo6
-rw-r--r--print/cups/pkg-plist15
3 files changed, 11 insertions, 18 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile
index ac955812df77..df2fef5c7be1 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= cups
-PORTVERSION= 2.1.4
-DISTVERSIONPREFIX=release-
+PORTVERSION= 2.2.1
+DISTVERSIONPREFIX=v
CATEGORIES= print
MAINTAINER= tijl@FreeBSD.org
@@ -37,9 +37,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
+USES= cpe gmake iconv localbase pkgconfig tar:bzip2
CPE_VENDOR= apple
USE_LDCONFIG= yes
USE_RC_SUBR= cupsd
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 5d23480f4765..f6cb8a1a1d31 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466787089
-SHA256 (apple-cups-release-2.1.4_GH0.tar.gz) = 1f182f145489e2454969b221056b6b9bac2beb4e38cd75fa12a9ec15d24d5301
-SIZE (apple-cups-release-2.1.4_GH0.tar.gz) = 9572653
+TIMESTAMP = 1476721887
+SHA256 (apple-cups-v2.2.1_GH0.tar.gz) = e5864ac2f984a0f8dcb8c1e3a71740f8e4727da73944f93c7ef84adeccc1d971
+SIZE (apple-cups-v2.2.1_GH0.tar.gz) = 9485107
diff --git a/print/cups/pkg-plist b/print/cups/pkg-plist
index d9583dd06643..aec5ebb9b406 100644
--- a/print/cups/pkg-plist
+++ b/print/cups/pkg-plist
@@ -35,17 +35,13 @@ etc/pam.d/cups
include/cups/adminutil.h
include/cups/array.h
include/cups/backend.h
-include/cups/cgi.h
include/cups/cups.h
include/cups/dir.h
include/cups/file.h
-include/cups/help-index.h
include/cups/http.h
include/cups/ipp.h
include/cups/language.h
-include/cups/mime.h
include/cups/ppd.h
-include/cups/ppdc.h
include/cups/pwg.h
include/cups/raster.h
include/cups/sidechannel.h
@@ -503,6 +499,8 @@ sbin/reject
%%NLS%%%%DATADIR%%/templates/pt_BR/error.tmpl
%%NLS%%%%DATADIR%%/templates/pt_BR/header.tmpl
%%NLS%%%%DATADIR%%/templates/pt_BR/help-header.tmpl
+%%NLS%%%%DATADIR%%/templates/pt_BR/help-printable.tmpl
+%%NLS%%%%DATADIR%%/templates/pt_BR/help-trailer.tmpl
%%NLS%%%%DATADIR%%/templates/pt_BR/job-cancel.tmpl
%%NLS%%%%DATADIR%%/templates/pt_BR/job-hold.tmpl
%%NLS%%%%DATADIR%%/templates/pt_BR/job-move.tmpl
@@ -524,6 +522,7 @@ sbin/reject
%%NLS%%%%DATADIR%%/templates/pt_BR/pager.tmpl
%%NLS%%%%DATADIR%%/templates/pt_BR/printer-accept.tmpl
%%NLS%%%%DATADIR%%/templates/pt_BR/printer-added.tmpl
+%%NLS%%%%DATADIR%%/templates/pt_BR/printer-cancel-jobs.tmpl
%%NLS%%%%DATADIR%%/templates/pt_BR/printer-configured.tmpl
%%NLS%%%%DATADIR%%/templates/pt_BR/printer-confirm.tmpl
%%NLS%%%%DATADIR%%/templates/pt_BR/printer-default.tmpl
@@ -635,19 +634,17 @@ sbin/reject
%%NLS%%%%DOCSDIR%%/de/index.html
%%NLS%%%%DOCSDIR%%/es/index.html
%%PORTDOCS%%%%DOCSDIR%%/help/accounting.html
+%%PORTDOCS%%%%DOCSDIR%%/help/api-admin.html
%%PORTDOCS%%%%DOCSDIR%%/help/api-array.html
-%%PORTDOCS%%%%DOCSDIR%%/help/api-cgi.html
%%PORTDOCS%%%%DOCSDIR%%/help/api-cups.html
-%%PORTDOCS%%%%DOCSDIR%%/help/api-driver.html
%%PORTDOCS%%%%DOCSDIR%%/help/api-filedir.html
%%PORTDOCS%%%%DOCSDIR%%/help/api-filter.html
%%PORTDOCS%%%%DOCSDIR%%/help/api-httpipp.html
-%%PORTDOCS%%%%DOCSDIR%%/help/api-mime.html
%%PORTDOCS%%%%DOCSDIR%%/help/api-overview.html
%%PORTDOCS%%%%DOCSDIR%%/help/api-ppd.html
-%%PORTDOCS%%%%DOCSDIR%%/help/api-ppdc.html
%%PORTDOCS%%%%DOCSDIR%%/help/api-raster.html
%%PORTDOCS%%%%DOCSDIR%%/help/cgi.html
+%%PORTDOCS%%%%DOCSDIR%%/help/encryption.html
%%PORTDOCS%%%%DOCSDIR%%/help/glossary.html
%%PORTDOCS%%%%DOCSDIR%%/help/kerberos.html
%%PORTDOCS%%%%DOCSDIR%%/help/license.html
@@ -703,7 +700,6 @@ sbin/reject
%%PORTDOCS%%%%DOCSDIR%%/help/security.html
%%PORTDOCS%%%%DOCSDIR%%/help/sharing.html
%%PORTDOCS%%%%DOCSDIR%%/help/spec-banner.html
-%%PORTDOCS%%%%DOCSDIR%%/help/spec-cmp.html
%%PORTDOCS%%%%DOCSDIR%%/help/spec-command.html
%%PORTDOCS%%%%DOCSDIR%%/help/spec-design.html
%%PORTDOCS%%%%DOCSDIR%%/help/spec-ipp.html
@@ -748,7 +744,6 @@ sbin/reject
%%NLS%%share/locale/ja/cups_ja.po
%%NLS%%share/locale/pt_BR/cups_pt_BR.po
%%NLS%%share/locale/ru/cups_ru.po
-@dir(,cups,) %%ETCDIR%%/interfaces
@dir(,cups,) %%ETCDIR%%/ppd
@dir(,cups,700) %%ETCDIR%%/ssl
@dir(,cups,) %%ETCDIR%%