print/cups-cloud-print: Upgrade version 20140814.2 => 20140814.3

PR:		201851
Submitted by:	Ports Fury

4 files changed, 82 insertions, 69 deletions

diff --git a/print/cups-cloud-print/Makefile b/print/cups-cloud-print/Makefile
index 8699d1cf785d..786e823c9615 100644
--- a/print/cups-cloud-print/Makefile
+++ b/print/cups-cloud-print/Makefile
@@ -1,31 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	cups-cloud-print
-PORTVERSION=	20140814.2
+PORTVERSION=	20140814.3
 CATEGORIES=	print
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Print using Google Cloud Print
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3 # (or later)
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	cups-config:${PORTSDIR}/print/cups-client
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cups>=0:${PORTSDIR}/print/py-cups \
-		${PYTHON_PKGNAMEPREFIX}httplib2>=0:${PORTSDIR}/www/py-httplib2 \
+RUN_DEPENDS=	cancel:${PORTSDIR}/print/cups-base \
+		${PYTHON_PKGNAMEPREFIX}cups>0:${PORTSDIR}/print/py-cups \
 		bash:${PORTSDIR}/shells/bash \
-		cancel:${PORTSDIR}/print/cups-base
+		${PYTHON_PKGNAMEPREFIX}httplib2>0:${PORTSDIR}/www/py-httplib2
 
-CONFIGURE_ENV=	cupsgroup=cups
-GNU_CONFIGURE=	yes
-MAKE_ARGS=	NOPERMS=1
 NO_ARCH=	yes
 NO_BUILD=	yes
-USES=		gmake python shebangfix
-
-SHEBANG_FILES=	testing/*.sh
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	simoncadman
 GH_PROJECT=	CUPS-Cloud-Print
 
+USES=		gmake python shebangfix
+SHEBANG_FILES=	testing/*.sh
+GNU_CONFIGURE=	yes
+MAKE_ARGS=	NOPERMS=1
+
+DATADIR=	${PREFIX}/share/cloudprint-cups
+DOCSDIR=	${PREFIX}/share/doc/cloudprint-cups
+
+OPTIONS_DEFINE=	DOCS
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/README.md/s|^|#| ; \
+		 /COPYING/s|^|#|' ${WRKSRC}/Makefile.in
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} README.md ${STAGEDIR}${DOCSDIR})
+
 .include <bsd.port.mk>
diff --git a/print/cups-cloud-print/distinfo b/print/cups-cloud-print/distinfo
index e17b2b84d1b7..c3752366557c 100644
--- a/print/cups-cloud-print/distinfo
+++ b/print/cups-cloud-print/distinfo
@@ -1,2 +1,2 @@
-SHA256 (simoncadman-CUPS-Cloud-Print-20140814.2_GH0.tar.gz) = bffb32321f178b2ef3c1625f63ae0a1cebef3eed79066b246f87432434e48087
-SIZE (simoncadman-CUPS-Cloud-Print-20140814.2_GH0.tar.gz) = 1286110
+SHA256 (simoncadman-CUPS-Cloud-Print-20140814.3_GH0.tar.gz) = ea5b331010f6b573a651910d633cf6f575f89df7c347698efc0d82b72e4046c7
+SIZE (simoncadman-CUPS-Cloud-Print-20140814.3_GH0.tar.gz) = 1286254
diff --git a/print/cups-cloud-print/pkg-descr b/print/cups-cloud-print/pkg-descr
index bb79b8336bd7..e08c323188ee 100644
--- a/print/cups-cloud-print/pkg-descr
+++ b/print/cups-cloud-print/pkg-descr
@@ -1,5 +1,5 @@
-CUPS Cloud Print is a Google Cloud Print driver for UNIX-like operating systems.
-It allows any application which prints via CUPS to print to Google Cloud Print
-directly.
+CUPS Cloud Print is a Google Cloud Print driver for UNIX-like operating
+systems. It allows any application which prints via CUPS to print to
+Google Cloud Print directly.
 
 WWW: http://www.niftiestsoftware.com/cups-cloud-print/
diff --git a/print/cups-cloud-print/pkg-plist b/print/cups-cloud-print/pkg-plist
index 3ec240511760..3d327eccb7c2 100644
--- a/print/cups-cloud-print/pkg-plist
+++ b/print/cups-cloud-print/pkg-plist
@@ -1,56 +1,55 @@
 libexec/cups/backend/gcp
 libexec/cups/driver/cupscloudprint
-share/cloudprint-cups/.coveragerc
-share/cloudprint-cups/COPYING
-share/cloudprint-cups/README.md
-share/cloudprint-cups/auth.py
-share/cloudprint-cups/backend.py
-share/cloudprint-cups/ccputils.py
-share/cloudprint-cups/cloudprintrequestor.py
-share/cloudprint-cups/deleteaccount.py
-share/cloudprint-cups/dynamicppd.py
-share/cloudprint-cups/listcloudprinters.py
-share/cloudprint-cups/oauth2client/__init__.py
-share/cloudprint-cups/oauth2client/appengine.py
-share/cloudprint-cups/oauth2client/client.py
-share/cloudprint-cups/oauth2client/clientsecrets.py
-share/cloudprint-cups/oauth2client/crypt.py
-share/cloudprint-cups/oauth2client/django_orm.py
-share/cloudprint-cups/oauth2client/file.py
-share/cloudprint-cups/oauth2client/gce.py
-share/cloudprint-cups/oauth2client/keyring_storage.py
-share/cloudprint-cups/oauth2client/locked_file.py
-share/cloudprint-cups/oauth2client/multistore_file.py
-share/cloudprint-cups/oauth2client/service_account.py
-share/cloudprint-cups/oauth2client/tools.py
-share/cloudprint-cups/oauth2client/util.py
-share/cloudprint-cups/oauth2client/xsrfutil.py
-share/cloudprint-cups/printer.py
-share/cloudprint-cups/printermanager.py
-share/cloudprint-cups/refreshtokens.py
-share/cloudprint-cups/reportissues.py
-share/cloudprint-cups/selinux/Makefile
-share/cloudprint-cups/selinux/cupscloudprint.fc
-share/cloudprint-cups/selinux/cupscloudprint.if
-share/cloudprint-cups/selinux/cupscloudprint.pp
-share/cloudprint-cups/selinux/cupscloudprint.te
-share/cloudprint-cups/setupcloudprint.py
-share/cloudprint-cups/testing/full-test.sh
-share/cloudprint-cups/testing/listdrivefiles.py
-share/cloudprint-cups/testing/mockrequestor.py
-share/cloudprint-cups/testing/remove-test.sh
-share/cloudprint-cups/testing/test_auth.py
-share/cloudprint-cups/testing/test_ccputils.py
-share/cloudprint-cups/testing/test_cloudprintrequestor.py
-share/cloudprint-cups/testing/test_printer.py
-share/cloudprint-cups/testing/test_printermanager.py
-share/cloudprint-cups/testing/testfiles/NotPdf.txt
-share/cloudprint-cups/testing/testfiles/Test Page Corrupt.pdf
-share/cloudprint-cups/testing/testfiles/Test Page reader.ps
-share/cloudprint-cups/testing/testfiles/Test Page.pdf
-share/cloudprint-cups/testing/testfiles/Test Page.png
-share/cloudprint-cups/testing/testfiles/Test Page.ps
-share/cloudprint-cups/testing/testfiles/capabilitylist
-share/cloudprint-cups/testing/testfiles/testppd.ppd
-share/cloudprint-cups/upgrade.py
+%%DATADIR%%/.coveragerc
+%%DATADIR%%/auth.py
+%%DATADIR%%/backend.py
+%%DATADIR%%/ccputils.py
+%%DATADIR%%/cloudprintrequestor.py
+%%DATADIR%%/deleteaccount.py
+%%DATADIR%%/dynamicppd.py
+%%DATADIR%%/listcloudprinters.py
+%%DATADIR%%/oauth2client/__init__.py
+%%DATADIR%%/oauth2client/appengine.py
+%%DATADIR%%/oauth2client/client.py
+%%DATADIR%%/oauth2client/clientsecrets.py
+%%DATADIR%%/oauth2client/crypt.py
+%%DATADIR%%/oauth2client/django_orm.py
+%%DATADIR%%/oauth2client/file.py
+%%DATADIR%%/oauth2client/gce.py
+%%DATADIR%%/oauth2client/keyring_storage.py
+%%DATADIR%%/oauth2client/locked_file.py
+%%DATADIR%%/oauth2client/multistore_file.py
+%%DATADIR%%/oauth2client/service_account.py
+%%DATADIR%%/oauth2client/tools.py
+%%DATADIR%%/oauth2client/util.py
+%%DATADIR%%/oauth2client/xsrfutil.py
+%%DATADIR%%/printer.py
+%%DATADIR%%/printermanager.py
+%%DATADIR%%/refreshtokens.py
+%%DATADIR%%/reportissues.py
+%%DATADIR%%/selinux/Makefile
+%%DATADIR%%/selinux/cupscloudprint.fc
+%%DATADIR%%/selinux/cupscloudprint.if
+%%DATADIR%%/selinux/cupscloudprint.pp
+%%DATADIR%%/selinux/cupscloudprint.te
+%%DATADIR%%/setupcloudprint.py
+%%DATADIR%%/testing/full-test.sh
+%%DATADIR%%/testing/listdrivefiles.py
+%%DATADIR%%/testing/mockrequestor.py
+%%DATADIR%%/testing/remove-test.sh
+%%DATADIR%%/testing/test_auth.py
+%%DATADIR%%/testing/test_ccputils.py
+%%DATADIR%%/testing/test_cloudprintrequestor.py
+%%DATADIR%%/testing/test_printer.py
+%%DATADIR%%/testing/test_printermanager.py
+%%DATADIR%%/testing/testfiles/NotPdf.txt
+%%DATADIR%%/testing/testfiles/Test Page Corrupt.pdf
+%%DATADIR%%/testing/testfiles/Test Page reader.ps
+%%DATADIR%%/testing/testfiles/Test Page.pdf
+%%DATADIR%%/testing/testfiles/Test Page.png
+%%DATADIR%%/testing/testfiles/Test Page.ps
+%%DATADIR%%/testing/testfiles/capabilitylist
+%%DATADIR%%/testing/testfiles/testppd.ppd
+%%DATADIR%%/upgrade.py
+%%PORTDOCS%%%%DOCSDIR%%/README.md
 @dir share/cups/model