8 files changed, 32 insertions, 66 deletions

diff --git a/print/Makefile b/print/Makefile
index 5a71d8e1cd0d..9dd396a73d7f 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -20,11 +20,11 @@
     SUBDIR += c2ps
     SUBDIR += catdvi
     SUBDIR += cdlabelgen
+    SUBDIR += cloud-print-connector
     SUBDIR += cloudprint
     SUBDIR += cups
     SUBDIR += cups-bjnp
     SUBDIR += cups-cloud-print
-    SUBDIR += cups-connector
     SUBDIR += cups-filters
     SUBDIR += cups-fxlinuxprint
     SUBDIR += cups-pdf
diff --git a/print/cups-connector/Makefile b/print/cloud-print-connector/Makefile
index 62d81a1c0424..f049edfe1a0c 100644
--- a/print/cups-connector/Makefile
+++ b/print/cloud-print-connector/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-PORTNAME=	cups-connector
-PORTVERSION=	0.0.0.2016.03.09
+PORTNAME=	cloud-print-connector
+PORTVERSION=	1.16
 CATEGORIES=	print
 
 MAINTAINER=	swills@FreeBSD.org
@@ -10,18 +10,21 @@ COMMENT=	Share CUPS printers via Google Cloud Print
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go \
-		cups>=0:print/cups \
-		avahi-app>=0:net/avahi-app
+BUILD_DEPENDS=	go:lang/go
+
+LIB_DEPENDS=	libcups.so:print/cups \
+		libavahi-client.so:net/avahi-app \
+		libavahi-common.so:net/avahi-app
 
 USES=		compiler pkgconfig
 USE_GITHUB=	yes
-GH_TUPLE=	google:cups-connector:1fdc26d:DEFAULT/src/github.com/google/cups-connector \
-		codegangsta:cli:a294348:cli/src/github.com/codegangsta/cli \
-		coreos:go-systemd:7b2428f:gosystemd/src/github.com/coreos/go-systemd \
-		golang:oauth2:2cd4472:oauth2/src/golang.org/x/oauth2 \
-		golang:net:6acef71:net/src/golang.org/x/net \
-		mildred:go-xdg:875014b:xdg/src/launchpad.net/go-xdg/v0
+GH_TUPLE=	google:cloud-print-connector:7d5f127:DEFAULT/src/github.com/google/cloud-print-connector \
+		urfave:cli:8e01ec4:cli/src/github.com/urfave/cli \
+		satori:go.uuid:36e9d2e:gouuid/src/github.com/satori/go.uuid \
+		coreos:go-systemd:88bfeed:gosystemd/src/github.com/coreos/go-systemd \
+		golang:oauth2:ef14785:oauth2/src/golang.org/x/oauth2 \
+		golang:net:039a425:net/src/golang.org/x/net \
+		mildred:go-xdg:96b70c9:xdg/src/launchpad.net/go-xdg/v0
 
 BIN_FILES=	gcp-connector-util gcp-cups-connector
 PLIST_FILES=	${BIN_FILES:S/^/bin\//}
@@ -30,13 +33,9 @@ OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	CONTRIBUTING.md README.md
 
-post-patch:
-	@${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" \
-		${WRKSRC}/cups/core.go ${WRKSRC}/privet/avahi.go
-
 do-build:
 .for bin in ${BIN_FILES}
-	@cd ${WRKSRC}/src/github.com/google/cups-connector; ${SETENV} \
+	@cd ${WRKSRC}/src/github.com/google/cloud-print-connector; ${SETENV} \
 		${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -o \
 		${WRKSRC}/bin/${bin} ./${bin}
 .endfor
diff --git a/print/cloud-print-connector/distinfo b/print/cloud-print-connector/distinfo
new file mode 100644
index 000000000000..c28f3b6de34c
--- /dev/null
+++ b/print/cloud-print-connector/distinfo
@@ -0,0 +1,15 @@
+TIMESTAMP = 1531335199
+SHA256 (google-cloud-print-connector-1.16-7d5f127_GH0.tar.gz) = abd89462880284d8c8d42b6ddd7bf2517881f21ad62619124715c7b4f230ab02
+SIZE (google-cloud-print-connector-1.16-7d5f127_GH0.tar.gz) = 122101
+SHA256 (urfave-cli-8e01ec4_GH0.tar.gz) = d8654573173cef6b639f00884c146bdb7f9130817e0b2d3f44d86d701428a63d
+SIZE (urfave-cli-8e01ec4_GH0.tar.gz) = 64657
+SHA256 (satori-go.uuid-36e9d2e_GH0.tar.gz) = aa54b317ac4122e7a4db33f84bac64fa9079637f4fd0517206c06d1aa1341b2d
+SIZE (satori-go.uuid-36e9d2e_GH0.tar.gz) = 8738
+SHA256 (coreos-go-systemd-88bfeed_GH0.tar.gz) = 536600df0acedbf8aa08e768f6543eec6711edb224dc8c635b74733ea5f08939
+SIZE (coreos-go-systemd-88bfeed_GH0.tar.gz) = 62488
+SHA256 (golang-oauth2-ef14785_GH0.tar.gz) = 8e0babfd4e74a6cd2b0c79eaab68dac2ba6a9ee6b69cebeae76e94729e2f0790
+SIZE (golang-oauth2-ef14785_GH0.tar.gz) = 42847
+SHA256 (golang-net-039a425_GH0.tar.gz) = 0f90cc35f4f7a0f9807edbb9bcd1a6d367a160d0a6ef2dfb5dc1a7eeaa85b6c0
+SIZE (golang-net-039a425_GH0.tar.gz) = 956735
+SHA256 (mildred-go-xdg-96b70c9_GH0.tar.gz) = e81a4f75625dc3101770215e6f6e1bd41bfce28babab38b7f6dd48681de5a42f
+SIZE (mildred-go-xdg-96b70c9_GH0.tar.gz) = 3962
diff --git a/print/cups-connector/pkg-descr b/print/cloud-print-connector/pkg-descr
index 1191716278e9..43dec1f730c6 100644
--- a/print/cups-connector/pkg-descr
+++ b/print/cloud-print-connector/pkg-descr
@@ -3,4 +3,4 @@ Cloud Print Connector. The Connector is a purpose-built system process. It can
 share hundreds of printers on a powerful server, or one printer on a Raspberry
 Pi.
 
-WWW: https://github.com/google/cups-connector
+WWW: https://github.com/google/cloud-print-connector
diff --git a/print/cups-connector/distinfo b/print/cups-connector/distinfo
deleted file mode 100644
index 82f17b21aad5..000000000000
--- a/print/cups-connector/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-SHA256 (google-cups-connector-0.0.0.2016.03.09-1fdc26d_GH0.tar.gz) = bd3e0aad70c4be1ffd6a22aa79d3f1f81697f1bfc61ea7726dc0fb330a5a5720
-SIZE (google-cups-connector-0.0.0.2016.03.09-1fdc26d_GH0.tar.gz) = 110516
-SHA256 (codegangsta-cli-a294348_GH0.tar.gz) = 163aa4f713f8c5bc5095f6c5d42bdd6b5149df97d02f24dc6de3a86dc1c3c79c
-SIZE (codegangsta-cli-a294348_GH0.tar.gz) = 22095
-SHA256 (coreos-go-systemd-7b2428f_GH0.tar.gz) = 25df932ed355c1c113eb8d78b09c3cfa9ff49325e5cf8dceb10178405fddb2eb
-SIZE (coreos-go-systemd-7b2428f_GH0.tar.gz) = 40633
-SHA256 (golang-oauth2-2cd4472_GH0.tar.gz) = 2d75dfd24a870026be49f867be02af4088587773e7265a259bcd1bcad4a09bb7
-SIZE (golang-oauth2-2cd4472_GH0.tar.gz) = 34560
-SHA256 (golang-net-6acef71_GH0.tar.gz) = aeea3d55a6e2f29329dfac8330817ccd449ffcb930b496fec0a47f011fa53f19
-SIZE (golang-net-6acef71_GH0.tar.gz) = 741883
-SHA256 (mildred-go-xdg-875014b_GH0.tar.gz) = 45c4688e8bc8e60202a0b2c11ff266dce1afcbd5438b285e267413ffe37a4b7b
-SIZE (mildred-go-xdg-875014b_GH0.tar.gz) = 3894
diff --git a/print/cups-connector/files/patch-cups_core.go b/print/cups-connector/files/patch-cups_core.go
deleted file mode 100644
index d96409767576..000000000000
--- a/print/cups-connector/files/patch-cups_core.go
+++ /dev/null
@@ -1,13 +0,0 @@
---- cups/core.go.orig	2016-03-12 14:17:25 UTC
-+++ cups/core.go
-@@ -9,8 +9,8 @@
- package cups
- 
- /*
--#cgo freebsd CFLAGS: -I/usr/local/include
--#cgo freebsd LDFLAGS: -L/usr/local/lib
-+#cgo freebsd CFLAGS: -I%%PREFIX%%/include
-+#cgo freebsd LDFLAGS: -L%%PREFIX%%/lib
- #include "cups.h"
- */
- import "C"
diff --git a/print/cups-connector/files/patch-cups_cups.h b/print/cups-connector/files/patch-cups_cups.h
deleted file mode 100644
index cfe60f4cf9e9..000000000000
--- a/print/cups-connector/files/patch-cups_cups.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- cups/cups.h.orig	2016-03-11 18:40:32 UTC
-+++ cups/cups.h
-@@ -12,6 +12,7 @@ https://developers.google.com/open-sourc
- #define _IPP_PRIVATE_STRUCTURES 1
- 
- #include <cups/cups.h>
-+#include <cups/ppd.h>
- #include <stddef.h>      // size_t
- #include <stdlib.h>      // free, calloc, malloc
- #include <sys/socket.h>  // AF_UNSPEC
diff --git a/print/cups-connector/files/patch-privet_avahi.go b/print/cups-connector/files/patch-privet_avahi.go
deleted file mode 100644
index db2cf0a229be..000000000000
--- a/print/cups-connector/files/patch-privet_avahi.go
+++ /dev/null
@@ -1,13 +0,0 @@
---- privet/avahi.go.orig	2016-03-12 14:17:35 UTC
-+++ privet/avahi.go
-@@ -9,8 +9,8 @@
- package privet
- 
- // #cgo linux LDFLAGS: -lavahi-client -lavahi-common
--// #cgo freebsd CFLAGS: -I/usr/local/include
--// #cgo freebsd LDFLAGS: -L/usr/local/lib -lavahi-client -lavahi-common
-+// #cgo freebsd CFLAGS: -I%%PREFIX%%/include
-+// #cgo freebsd LDFLAGS: -L%%PREFIX%%/lib -lavahi-client -lavahi-common
- // #include "avahi.h"
- import "C"
- import (