4 files changed, 45 insertions, 32 deletions

diff --git a/print/cups-cloud-print/Makefile b/print/cups-cloud-print/Makefile
index fcb4c4aec0b7..e89d98187827 100644
--- a/print/cups-cloud-print/Makefile
+++ b/print/cups-cloud-print/Makefile
@@ -1,31 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	cups-cloud-print
-PORTVERSION=	0.0.1
+PORTVERSION=	20140814.1
 CATEGORIES=	print
+MASTER_SITES=	GH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Print using Google Cloud Print
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	cancel:${PORTSDIR}/print/cups-base
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cups>=0:${PORTSDIR}/print/py-cups \
-		${PYTHON_PKGNAMEPREFIX}httplib2>=0:${PORTSDIR}/www/py-httplib2 \
-		cancel:${PORTSDIR}/print/cups-base
+BUILD_DEPENDS=	cups-config:${PORTSDIR}/print/cups-client
+RUN_DEPENDS=	cancel:${PORTSDIR}/print/cups-base \
+		${PYTHON_PKGNAMEPREFIX}cups>0:${PORTSDIR}/print/py-cups \
+		bash:${PORTSDIR}/shells/bash \
+		${PYTHON_PKGNAMEPREFIX}httplib2>0:${PORTSDIR}/www/py-httplib2
+
+NO_ARCH=	yes
+NO_BUILD=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	simoncadman
 GH_PROJECT=	CUPS-Cloud-Print
-GH_COMMIT=	d7ce53b
-GH_TAGNAME=	${GH_COMMIT}
-
-HAS_CONFIGURE=	yes
-
-USES=	gmake python shebangfix
-SHEBANG_FILES=	full-test.sh
+GH_COMMIT=	65d3bff
 
-#CONFIGURE_ARGS=	--cupsgroup=cups
+USES=		gmake python shebangfix
+SHEBANG_FILES=	testing/*.sh
+GNU_CONFIGURE=	yes
 MAKE_ARGS=	NOPERMS=1
 
 .include <bsd.port.mk>
diff --git a/print/cups-cloud-print/distinfo b/print/cups-cloud-print/distinfo
index 07ef48223b81..c17917c887b9 100644
--- a/print/cups-cloud-print/distinfo
+++ b/print/cups-cloud-print/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cups-cloud-print-0.0.1.tar.gz) = 06c5a52daf65db9bfe7a0218cec8a487918797f5a2d2b4ea4187595b55077099
-SIZE (cups-cloud-print-0.0.1.tar.gz) = 298144
+SHA256 (cups-cloud-print-20140814.1.tar.gz) = d31cdcb2bc5baa2b32c80684b631b5882b77e2f0663c6ba0b8d08539c19ed6d2
+SIZE (cups-cloud-print-20140814.1.tar.gz) = 1260629
diff --git a/print/cups-cloud-print/pkg-descr b/print/cups-cloud-print/pkg-descr
index 612b1d7bcb82..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.
+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 502795604df2..3710b7449fa8 100644
--- a/print/cups-cloud-print/pkg-plist
+++ b/print/cups-cloud-print/pkg-plist
@@ -1,15 +1,15 @@
-libexec/cups/backend/cloudprint
+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/full-test.sh
 share/cloudprint-cups/listcloudprinters.py
-share/cloudprint-cups/listdrivefiles.py
 share/cloudprint-cups/oauth2client/__init__.py
 share/cloudprint-cups/oauth2client/anyjson.py
 share/cloudprint-cups/oauth2client/client.py
@@ -18,19 +18,31 @@ share/cloudprint-cups/oauth2client/crypt.py
 share/cloudprint-cups/oauth2client/locked_file.py
 share/cloudprint-cups/oauth2client/multistore_file.py
 share/cloudprint-cups/printer.py
+share/cloudprint-cups/printermanager.py
+share/cloudprint-cups/refreshtokens.py
 share/cloudprint-cups/reportissues.py
-share/cloudprint-cups/setup.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/submitjob.py
-share/cloudprint-cups/test_auth.py
-share/cloudprint-cups/test_backend.py
-share/cloudprint-cups/test_cloudprintrequestor.py
-share/cloudprint-cups/test_mockrequestor.py
-share/cloudprint-cups/test_printer.py
-share/cloudprint-cups/testfiles/NotPdf.txt
-share/cloudprint-cups/testfiles/Test Page.pdf
-share/cloudprint-cups/testfiles/Test Page.png
-share/cloudprint-cups/testfiles/capabilitylist
-share/cloudprint-cups/testfiles/testppd.ppd
+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
 @dir share/cups/model