diff -u go-www.orig/Makefile go-www/Makefile
--- go-www.orig/Makefile	2017-09-11 18:00:05.228492000 +0000
+++ go-www/Makefile	2017-09-26 20:08:27.896476000 +0000
@@ -2,7 +2,7 @@
 # $FreeBSD: head/www/go-www/Makefile 433398 2017-02-05 12:39:12Z woodsb02 $
 
 PORTNAME=	www
-PORTVERSION=	0.3.1
+PORTVERSION=	1.1.1
 CATEGORIES=	www
 PKGNAMEPREFIX=	go-
 
@@ -15,26 +15,24 @@
 USES=		go
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	nbari:DEFAULT,violetear
-GH_PROJECT=	violetear:violetear
-GH_TAGNAME=	2.2.0:violetear
-
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
+GH_ACCOUNT=	nbari:DEFAULT,www
+GH_TUPLE=	golang:crypto:847319b:crypto/src/golang.org/x/crypto
+GH_SUBDIR=	src/github.com/nbari/${PORTNAME}
 
 STRIP=		# stripping can break go binaries
 
 PLIST_FILES=	bin/www
 
 post-patch:
-	@${LN} -sf ${WRKDIR}/${GH_PROJECT_violetear}-${GH_TAGNAME_violetear} \
-		${GO_WRKDIR_SRC}/github.com/${GH_ACCOUNT_violetear}/${GH_PROJECT_violetear}
+	@${MKDIR} ${WRKSRC}/src/golang.org
+	@${LN} -sf ${LOCALBASE}/share/go/src/golang.org/x ${WRKSRC}/src/golang.org/x
 
 do-build:
-	@(cd ${GO_WRKSRC} && \
-		${SETENV} ${BUILD_ENV} GOPATH=${WRKDIR} go build -ldflags \
-			"-X main.version=${PORTVERSION}" -o www cmd/www/main.go)
+	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \
+	${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \
+	"-s -w" -o www;
 
 do-install:
-	${INSTALL_PROGRAM} ${GO_WRKSRC}/www ${STAGEDIR}${PREFIX}/bin/www
+	${INSTALL_PROGRAM} ${WRKSRC}/www ${STAGEDIR}${PREFIX}/bin/www
 
 .include <bsd.port.mk>
diff -u go-www.orig/distinfo go-www/distinfo
--- go-www.orig/distinfo	2017-09-11 18:00:05.227991000 +0000
+++ go-www/distinfo	2017-09-26 20:08:41.635966000 +0000
@@ -1,5 +1,7 @@
-TIMESTAMP = 1486283285
-SHA256 (nbari-www-0.3.1_GH0.tar.gz) = 322612b8ad3167df0a6bf84b283db958f670d6f0e4770376ae24fc4ea39d9f68
-SIZE (nbari-www-0.3.1_GH0.tar.gz) = 3633
-SHA256 (nbari-violetear-2.2.0_GH0.tar.gz) = a71a2355548ae5adef5578552dc522c1a6174f9ac88b36db25c8bba1c39ab01e
-SIZE (nbari-violetear-2.2.0_GH0.tar.gz) = 14408
+TIMESTAMP = 1506456521
+SHA256 (nbari-www-1.1.1_GH0.tar.gz) = eea1a8beb69556d984eed63967c569c7bace2add3752a94241de0def5df012eb
+SIZE (nbari-www-1.1.1_GH0.tar.gz) = 4211
+SHA256 (nbari-www-1.1.1_GH0.tar.gz) = eea1a8beb69556d984eed63967c569c7bace2add3752a94241de0def5df012eb
+SIZE (nbari-www-1.1.1_GH0.tar.gz) = 4211
+SHA256 (golang-crypto-847319b_GH0.tar.gz) = f471dac9d970154c00dba9b9772752f0feb368713ee1b11418d22f11ba6fd5df
+SIZE (golang-crypto-847319b_GH0.tar.gz) = 1432733
diff -u go-www.orig/pkg-descr go-www/pkg-descr
--- go-www.orig/pkg-descr	2017-09-11 18:00:05.228980000 +0000
+++ go-www/pkg-descr	2017-09-26 20:10:53.263231000 +0000
@@ -1,8 +1,8 @@
 www is a static web server, useful for sharing and testing the contents of a
-directory via HTTP.
+directory via HTTP or HTTPS with a valid certificate.
 
 www will start a web server listening on port 8000 and use as document root 
 the directory where the command was called. Different document root may be
-specified as also the port and use of SSL, more info using the -h option.
+specified as also the port and use of TLS, more info using the -h option.
 
-WWW: https://github.com/nbari/www
+WWW: https://go-www.com