Remove trailing empty lines.

93 files changed, 93 insertions, 186 deletions

diff --git a/databases/go-etcd/Makefile b/databases/go-etcd/Makefile
index f98bc99e287..ec3078f6d6c 100644
--- a/databases/go-etcd/Makefile
+++ b/databases/go-etcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 02:02:27 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:11 jperkin Exp $
 
 DISTNAME=	go-etcd-2.0.0
 PKGNAME=	${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/coreos/go-etcd
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/databases/go-etcd/buildlink3.mk b/databases/go-etcd/buildlink3.mk
index 962a0e3c206..0f001bf3717 100644
--- a/databases/go-etcd/buildlink3.mk
+++ b/databases/go-etcd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 02:02:27 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:11 jperkin Exp $
 
 BUILDLINK_TREE+=	go-etcd
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-etcd?=		../../databases/go-etcd
 .endif  # GO_ETCD_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-etcd
-
diff --git a/devel/go-afero/Makefile b/devel/go-afero/Makefile
index 11ad1d73f43..0795250c8ff 100644
--- a/devel/go-afero/Makefile
+++ b/devel/go-afero/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:13:32 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:11 jperkin Exp $
 
 DISTNAME=	afero-0.0.20160605
 PKGNAME=	go-${DISTNAME}
@@ -22,4 +22,3 @@ GO_SRCPATH=	github.com/spf13/afero
 .include "../../security/go-crypto/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-afero/buildlink3.mk b/devel/go-afero/buildlink3.mk
index 03aeaddc1b4..173947ce076 100644
--- a/devel/go-afero/buildlink3.mk
+++ b/devel/go-afero/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:13:32 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:11 jperkin Exp $
 
 BUILDLINK_TREE+=	go-afero
 
@@ -19,4 +19,3 @@ BUILDLINK_PKGSRCDIR.go-afero?=		../../devel/go-afero
 .endif  # GO_AFERO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-afero
-
diff --git a/devel/go-amber/Makefile b/devel/go-amber/Makefile
index 70f3c5ef4cc..47cee38a78f 100644
--- a/devel/go-amber/Makefile
+++ b/devel/go-amber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:15:39 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 DISTNAME=	amber-0.0.20160421
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/eknkc/amber
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-amber/buildlink3.mk b/devel/go-amber/buildlink3.mk
index d8cf12ea1f2..b14439290ef 100644
--- a/devel/go-amber/buildlink3.mk
+++ b/devel/go-amber/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:15:39 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 BUILDLINK_TREE+=	go-amber
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-amber?=		../../devel/go-amber
 .endif  # GO_AMBER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-amber
-
diff --git a/devel/go-blackfriday/Makefile b/devel/go-blackfriday/Makefile
index 026621efd35..7161a15a3a3 100644
--- a/devel/go-blackfriday/Makefile
+++ b/devel/go-blackfriday/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:17:16 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 DISTNAME=	blackfriday-1.4
 PKGNAME=	go-${DISTNAME}
@@ -18,4 +18,3 @@ GO_SRCPATH=	github.com/russross/blackfriday
 .include "../../devel/go-sanitized_anchor_name/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-blackfriday/buildlink3.mk b/devel/go-blackfriday/buildlink3.mk
index e659c2cd9a1..c7637b253c6 100644
--- a/devel/go-blackfriday/buildlink3.mk
+++ b/devel/go-blackfriday/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:17:16 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 BUILDLINK_TREE+=	go-blackfriday
 
@@ -15,4 +15,3 @@ BUILDLINK_PKGSRCDIR.go-blackfriday?=		../../devel/go-blackfriday
 .endif  # GO_BLACKFRIDAY_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-blackfriday
-
diff --git a/devel/go-buffruneio/Makefile b/devel/go-buffruneio/Makefile
index 1b8193c1857..29e81a8b4c3 100644
--- a/devel/go-buffruneio/Makefile
+++ b/devel/go-buffruneio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:18:25 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 DISTNAME=	go-buffruneio-0.2.0
 MASTER_SITES=	${MASTER_SITE_GITHUB:=pelletier/}
@@ -15,4 +15,3 @@ GO_SRCPATH=	github.com/pelletier/go-buffruneio
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-buffruneio/buildlink3.mk b/devel/go-buffruneio/buildlink3.mk
index c4344890d42..5ecef943992 100644
--- a/devel/go-buffruneio/buildlink3.mk
+++ b/devel/go-buffruneio/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:18:25 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 BUILDLINK_TREE+=	go-buffruneio
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-buffruneio?=		../../devel/go-buffruneio
 .endif  # GO_BUFFRUNEIO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-buffruneio
-
diff --git a/devel/go-cast/Makefile b/devel/go-cast/Makefile
index 47a4599db26..cb7881fada3 100644
--- a/devel/go-cast/Makefile
+++ b/devel/go-cast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:19:10 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 DISTNAME=	cast-1.1.0
 PKGNAME=	go-${DISTNAME}
@@ -18,4 +18,3 @@ GO_SRCPATH=	github.com/spf13/cast
 .include "../../devel/go-jwalterweatherman/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-cast/buildlink3.mk b/devel/go-cast/buildlink3.mk
index f3ac324f2ea..667ca0a7745 100644
--- a/devel/go-cast/buildlink3.mk
+++ b/devel/go-cast/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:19:10 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 BUILDLINK_TREE+=	go-cast
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-cast?=		../../devel/go-cast
 .endif  # GO_CAST_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-cast
-
diff --git a/devel/go-cli/Makefile b/devel/go-cli/Makefile
index 6ffe0f453d8..2b641fbfeaa 100644
--- a/devel/go-cli/Makefile
+++ b/devel/go-cli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:19:56 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 DISTNAME=	cli-1.20.0
 PKGNAME=	go-${DISTNAME}
@@ -26,4 +26,3 @@ pre-install:
 .include "../../devel/go-yaml/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-cli/buildlink3.mk b/devel/go-cli/buildlink3.mk
index 39d165e8b33..2ac9bc6eadf 100644
--- a/devel/go-cli/buildlink3.mk
+++ b/devel/go-cli/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:19:56 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 BUILDLINK_TREE+=	go-cli
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-cli?=		../../devel/go-cli
 .endif  # GO_CLI_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-cli
-
diff --git a/devel/go-cobra/Makefile b/devel/go-cobra/Makefile
index 1c7937d46bc..aec937c4c06 100644
--- a/devel/go-cobra/Makefile
+++ b/devel/go-cobra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:20:57 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 DISTNAME=	cobra-0.0.20170815
 PKGNAME=	go-${DISTNAME}
@@ -21,4 +21,3 @@ GO_SRCPATH=	github.com/spf13/cobra
 .include "../../devel/go-homedir/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-cobra/buildlink3.mk b/devel/go-cobra/buildlink3.mk
index 0f294118a49..d1d580e4ae7 100644
--- a/devel/go-cobra/buildlink3.mk
+++ b/devel/go-cobra/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:20:57 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 BUILDLINK_TREE+=	go-cobra
 
@@ -17,4 +17,3 @@ BUILDLINK_PKGSRCDIR.go-cobra?=		../../devel/go-cobra
 .endif  # GO_COBRA_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-cobra
-
diff --git a/devel/go-consul-api/Makefile b/devel/go-consul-api/Makefile
index 9af08a4f2ba..2843eaf3f4e 100644
--- a/devel/go-consul-api/Makefile
+++ b/devel/go-consul-api/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:21:41 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 DISTNAME=	consul-api-0.0.20150107
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/armon/consul-api
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-consul-api/buildlink3.mk b/devel/go-consul-api/buildlink3.mk
index 449a8e2de05..a1fb9135a0b 100644
--- a/devel/go-consul-api/buildlink3.mk
+++ b/devel/go-consul-api/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:21:41 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 BUILDLINK_TREE+=	go-consul-api
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-consul-api?=		../../devel/go-consul-api
 .endif  # GO_CONSUL_API_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-consul-api
-
diff --git a/devel/go-emoji/Makefile b/devel/go-emoji/Makefile
index a2eb84b5782..02b9e9b16dd 100644
--- a/devel/go-emoji/Makefile
+++ b/devel/go-emoji/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:22:30 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 DISTNAME=	emoji-1.4
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/kyokomi/emoji
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-emoji/buildlink3.mk b/devel/go-emoji/buildlink3.mk
index e815de76eef..33e8a113a5f 100644
--- a/devel/go-emoji/buildlink3.mk
+++ b/devel/go-emoji/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:22:30 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 BUILDLINK_TREE+=	go-emoji
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-emoji?=		../../devel/go-emoji
 .endif  # GO_EMOJI_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-emoji
-
diff --git a/devel/go-errors/Makefile b/devel/go-errors/Makefile
index e5977d2c89e..fb7851e9b4c 100644
--- a/devel/go-errors/Makefile
+++ b/devel/go-errors/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:23:10 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 DISTNAME=	errors-0.6.0
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/pkg/errors
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-errors/buildlink3.mk b/devel/go-errors/buildlink3.mk
index a0782f4aa15..d83f576849f 100644
--- a/devel/go-errors/buildlink3.mk
+++ b/devel/go-errors/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:23:10 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 BUILDLINK_TREE+=	go-errors
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-errors?=		../../devel/go-errors
 .endif  # GO_ERRORS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-errors
-
diff --git a/devel/go-fs/Makefile b/devel/go-fs/Makefile
index 85a228b55b5..cdd9196878d 100644
--- a/devel/go-fs/Makefile
+++ b/devel/go-fs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:23:52 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 DISTNAME=	fs-0.0.20131111
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/kr/fs
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-fs/buildlink3.mk b/devel/go-fs/buildlink3.mk
index 1bf91b592fb..6e48dd16bae 100644
--- a/devel/go-fs/buildlink3.mk
+++ b/devel/go-fs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:23:52 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 BUILDLINK_TREE+=	go-fs
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-fs?=		../../devel/go-fs
 .endif  # GO_FS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-fs
-
diff --git a/devel/go-fsnotify/Makefile b/devel/go-fsnotify/Makefile
index d540515a223..e7f17344805 100644
--- a/devel/go-fsnotify/Makefile
+++ b/devel/go-fsnotify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:24:45 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 DISTNAME=	fsnotify-1.3.0
 PKGNAME=	go-${DISTNAME}
@@ -18,4 +18,3 @@ GO_SRCPATH=	github.com/fsnotify/fsnotify
 .include "../../devel/go-sys/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-fsnotify/buildlink3.mk b/devel/go-fsnotify/buildlink3.mk
index ccd4ea5ee16..e2737ad374d 100644
--- a/devel/go-fsnotify/buildlink3.mk
+++ b/devel/go-fsnotify/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:24:45 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 BUILDLINK_TREE+=	go-fsnotify
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-fsnotify?=	../../devel/go-fsnotify
 .endif  # GO_FSNOTIFY_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-fsnotify
-
diff --git a/devel/go-fsync/Makefile b/devel/go-fsync/Makefile
index 8f873aa34c7..d373c451974 100644
--- a/devel/go-fsync/Makefile
+++ b/devel/go-fsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:25:46 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 DISTNAME=	fsync-0.0.20170320
 PKGNAME=	go-${DISTNAME}
@@ -18,4 +18,3 @@ GO_SRCPATH=	github.com/spf13/fsync
 .include "../../devel/go-afero/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-fsync/buildlink3.mk b/devel/go-fsync/buildlink3.mk
index c3cb3a4baa0..461f760782c 100644
--- a/devel/go-fsync/buildlink3.mk
+++ b/devel/go-fsync/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:25:46 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:12 jperkin Exp $
 
 BUILDLINK_TREE+=	go-fsync
 
@@ -15,4 +15,3 @@ BUILDLINK_PKGSRCDIR.go-fsync?=		../../devel/go-fsync
 .endif  # GO_FSYNC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-fsync
-
diff --git a/devel/go-gitmap/Makefile b/devel/go-gitmap/Makefile
index 5237f030d13..2f34cc000d9 100644
--- a/devel/go-gitmap/Makefile
+++ b/devel/go-gitmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:26:34 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 DISTNAME=	gitmap-0.0.20170613
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/bep/gitmap
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-gitmap/buildlink3.mk b/devel/go-gitmap/buildlink3.mk
index 99146d98913..d748ad7b935 100644
--- a/devel/go-gitmap/buildlink3.mk
+++ b/devel/go-gitmap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:26:34 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 BUILDLINK_TREE+=	go-gitmap
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-gitmap?=		../../devel/go-gitmap
 .endif  # GO_GITMAP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-gitmap
-
diff --git a/devel/go-golang-lru/Makefile b/devel/go-golang-lru/Makefile
index 218e173b40b..f1110d32a97 100644
--- a/devel/go-golang-lru/Makefile
+++ b/devel/go-golang-lru/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:27:21 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 DISTNAME=	golang-lru-0.0.20160813
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/hashicorp/golang-lru
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-golang-lru/buildlink3.mk b/devel/go-golang-lru/buildlink3.mk
index 83f2ebd6d63..6c3930dcbd2 100644
--- a/devel/go-golang-lru/buildlink3.mk
+++ b/devel/go-golang-lru/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:27:21 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 BUILDLINK_TREE+=	go-golang-lru
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-golang-lru?=		../../devel/go-golang-lru
 .endif  # GO_GOLANG_LRU_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-golang-lru
-
diff --git a/devel/go-goorgeous/Makefile b/devel/go-goorgeous/Makefile
index 0022b78752a..b3ae13bb4ba 100644
--- a/devel/go-goorgeous/Makefile
+++ b/devel/go-goorgeous/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:28:07 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 DISTNAME=	goorgeous-0.0.20170816
 PKGNAME=	go-${DISTNAME}
@@ -18,4 +18,3 @@ GO_SRCPATH=	github.com/chaseadamsio/goorgeous
 .include "../../devel/go-blackfriday/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-goorgeous/buildlink3.mk b/devel/go-goorgeous/buildlink3.mk
index 9c1268ad622..0691b122c41 100644
--- a/devel/go-goorgeous/buildlink3.mk
+++ b/devel/go-goorgeous/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:28:07 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 BUILDLINK_TREE+=	go-goorgeous
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-goorgeous?=		../../devel/go-goorgeous
 .endif  # GO_GOORGEOUS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-goorgeous
-
diff --git a/devel/go-homedir/Makefile b/devel/go-homedir/Makefile
index a675f3eb140..d66d16b5041 100644
--- a/devel/go-homedir/Makefile
+++ b/devel/go-homedir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:28:52 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 DISTNAME=	go-homedir-0.0.20161203
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mitchellh/}
@@ -16,4 +16,3 @@ GO_SRCPATH=	github.com/mitchellh/go-homedir
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-homedir/buildlink3.mk b/devel/go-homedir/buildlink3.mk
index e7b8a03e53e..ac7a6e54cdb 100644
--- a/devel/go-homedir/buildlink3.mk
+++ b/devel/go-homedir/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:28:52 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 BUILDLINK_TREE+=	go-homedir
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-homedir?=		../../devel/go-homedir
 .endif  # GO_HOMEDIR_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-homedir
-
diff --git a/devel/go-i18n/Makefile b/devel/go-i18n/Makefile
index 32e568cbbd5..212ac0342b7 100644
--- a/devel/go-i18n/Makefile
+++ b/devel/go-i18n/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:29:44 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 DISTNAME=	go-i18n-1.8.1
 MASTER_SITES=	${MASTER_SITE_GITHUB:=nicksnyder/}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/nicksnyder/go-i18n
 .include "../../devel/go-yaml/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-i18n/buildlink3.mk b/devel/go-i18n/buildlink3.mk
index 9b69a6859fb..6b8ac6fb728 100644
--- a/devel/go-i18n/buildlink3.mk
+++ b/devel/go-i18n/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:29:44 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 BUILDLINK_TREE+=	go-i18n
 
@@ -15,4 +15,3 @@ BUILDLINK_PKGSRCDIR.go-i18n?=		../../devel/go-i18n
 .endif  # GO_I18N_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-i18n
-
diff --git a/devel/go-immutable-radix/Makefile b/devel/go-immutable-radix/Makefile
index 3f423376d01..3f821ce1aff 100644
--- a/devel/go-immutable-radix/Makefile
+++ b/devel/go-immutable-radix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:30:27 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 DISTNAME=	go-immutable-radix-0.0.20170725
 MASTER_SITES=	${MASTER_SITE_GITHUB:=hashicorp/}
@@ -18,4 +18,3 @@ GO_SRCPATH=	github.com/hashicorp/go-immutable-radix
 .include "../../devel/go-golang-lru/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-immutable-radix/buildlink3.mk b/devel/go-immutable-radix/buildlink3.mk
index 4d4748fe3af..d72aa239df3 100644
--- a/devel/go-immutable-radix/buildlink3.mk
+++ b/devel/go-immutable-radix/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:30:27 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 BUILDLINK_TREE+=	go-immutable-radix
 
@@ -15,4 +15,3 @@ BUILDLINK_PKGSRCDIR.go-immutable-radix?=		../../devel/go-immutable-radix
 .endif  # GO_IMMUTABLE_RADIX_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-immutable-radix
-
diff --git a/devel/go-jwalterweatherman/Makefile b/devel/go-jwalterweatherman/Makefile
index c31f8bb7bed..123347d7486 100644
--- a/devel/go-jwalterweatherman/Makefile
+++ b/devel/go-jwalterweatherman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:31:19 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 DISTNAME=	jWalterWeatherman-20170523
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/spf13/jwalterweatherman
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-jwalterweatherman/buildlink3.mk b/devel/go-jwalterweatherman/buildlink3.mk
index 6d37f20f219..b9e23c98879 100644
--- a/devel/go-jwalterweatherman/buildlink3.mk
+++ b/devel/go-jwalterweatherman/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:31:19 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 BUILDLINK_TREE+=	go-jwalterweatherman
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-jwalterweatherman?=		../../devel/go-jwalterweatherman
 .endif  # GO_JWALTERWEATHERMAN_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-jwalterweatherman
-
diff --git a/devel/go-mapstructure/Makefile b/devel/go-mapstructure/Makefile
index a2488a60699..d4fa5b369c1 100644
--- a/devel/go-mapstructure/Makefile
+++ b/devel/go-mapstructure/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:32:00 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 DISTNAME=	mapstructure-0.0.20160212
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/mitchellh/mapstructure
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-mapstructure/buildlink3.mk b/devel/go-mapstructure/buildlink3.mk
index 0b9c9057c7f..1dfbf708f2d 100644
--- a/devel/go-mapstructure/buildlink3.mk
+++ b/devel/go-mapstructure/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:32:00 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 BUILDLINK_TREE+=	go-mapstructure
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-mapstructure?=	../../devel/go-mapstructure
 .endif  # GO_MAPSTRUCTURE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-mapstructure
-
diff --git a/devel/go-nitro/Makefile b/devel/go-nitro/Makefile
index 7a9aed12c9a..2eaf39407ee 100644
--- a/devel/go-nitro/Makefile
+++ b/devel/go-nitro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:34:01 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 DISTNAME=	nitro-0.0.20131003
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/spf13/nitro
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-nitro/buildlink3.mk b/devel/go-nitro/buildlink3.mk
index b965adc9abb..23a0113267e 100644
--- a/devel/go-nitro/buildlink3.mk
+++ b/devel/go-nitro/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:34:01 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 BUILDLINK_TREE+=	go-nitro
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-nitro?=		../../devel/go-nitro
 .endif  # GO_NITRO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-nitro
-
diff --git a/devel/go-osext/Makefile b/devel/go-osext/Makefile
index cf113f2a550..5a35522290c 100644
--- a/devel/go-osext/Makefile
+++ b/devel/go-osext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:34:50 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 DISTNAME=	osext-0.0.20151222
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/kardianos/osext
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-osext/buildlink3.mk b/devel/go-osext/buildlink3.mk
index fa1e779c5e1..6beab980fcd 100644
--- a/devel/go-osext/buildlink3.mk
+++ b/devel/go-osext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:34:50 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 BUILDLINK_TREE+=	go-osext
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-osext?=		../../devel/go-osext
 .endif  # GO_OSEXT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-osext
-
diff --git a/devel/go-pflag/Makefile b/devel/go-pflag/Makefile
index 1d72cc9a257..cfa5c0159c3 100644
--- a/devel/go-pflag/Makefile
+++ b/devel/go-pflag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:36:26 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 DISTNAME=	pflag-1.0.0
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/spf13/pflag
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-pflag/buildlink3.mk b/devel/go-pflag/buildlink3.mk
index ff7c7c0596f..09557e02f1b 100644
--- a/devel/go-pflag/buildlink3.mk
+++ b/devel/go-pflag/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:36:26 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 BUILDLINK_TREE+=	go-pflag
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-pflag?=		../../devel/go-pflag
 .endif  # GO_PFLAG_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-pflag
-
diff --git a/devel/go-properties/Makefile b/devel/go-properties/Makefile
index 4db2193fcc2..a17ae2c739d 100644
--- a/devel/go-properties/Makefile
+++ b/devel/go-properties/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:36:54 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 DISTNAME=	properties-1.7.0
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/magiconair/properties
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-properties/buildlink3.mk b/devel/go-properties/buildlink3.mk
index 4659e0466a3..b4154d9f6a6 100644
--- a/devel/go-properties/buildlink3.mk
+++ b/devel/go-properties/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:36:54 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $
 
 BUILDLINK_TREE+=	go-properties
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-properties?=		../../devel/go-properties
 .endif  # GO_PROPERTIES_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-properties
-
diff --git a/devel/go-purell/Makefile b/devel/go-purell/Makefile
index 5f3994d22c0..9c121a2de79 100644
--- a/devel/go-purell/Makefile
+++ b/devel/go-purell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:37:13 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 DISTNAME=	purell-0.1.0
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/PuerkitoBio/purell
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-purell/buildlink3.mk b/devel/go-purell/buildlink3.mk
index 20d259de282..11f4a1cd444 100644
--- a/devel/go-purell/buildlink3.mk
+++ b/devel/go-purell/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:37:13 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 BUILDLINK_TREE+=	go-purell
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-purell?=		../../devel/go-purell
 .endif  # GO_PURELL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-purell
-
diff --git a/devel/go-sanitized_anchor_name/Makefile b/devel/go-sanitized_anchor_name/Makefile
index 683cbe032fa..4dc0eae2ee7 100644
--- a/devel/go-sanitized_anchor_name/Makefile
+++ b/devel/go-sanitized_anchor_name/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:37:39 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 DISTNAME=	sanitized_anchor_name-0.0.20151028
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/shurcooL/sanitized_anchor_name
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-sanitized_anchor_name/buildlink3.mk b/devel/go-sanitized_anchor_name/buildlink3.mk
index 740c0dae703..9dc44ee019b 100644
--- a/devel/go-sanitized_anchor_name/buildlink3.mk
+++ b/devel/go-sanitized_anchor_name/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:37:39 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 BUILDLINK_TREE+=	go-sanitized_anchor_name
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-sanitized_anchor_name?=		../../devel/go-sanitized_anchor_
 .endif  # GO_SANITIZED_ANCHOR_NAME_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-sanitized_anchor_name
-
diff --git a/devel/go-shuffle/Makefile b/devel/go-shuffle/Makefile
index b5e4708d6ec..d92d44e806a 100644
--- a/devel/go-shuffle/Makefile
+++ b/devel/go-shuffle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:37:59 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 DISTNAME=	go-shuffle-0.0.20170808
 MASTER_SITES=	${MASTER_SITE_GITHUB:=shogo82148/}
@@ -15,4 +15,3 @@ GO_SRCPATH=	github.com/shogo82148/go-shuffle
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-shuffle/buildlink3.mk b/devel/go-shuffle/buildlink3.mk
index 4ca0650f9e6..5df25685fa6 100644
--- a/devel/go-shuffle/buildlink3.mk
+++ b/devel/go-shuffle/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:37:59 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 BUILDLINK_TREE+=	go-shuffle
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-shuffle?=		../../devel/go-shuffle
 .endif  # GO_SHUFFLE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-shuffle
-
diff --git a/devel/go-viper/Makefile b/devel/go-viper/Makefile
index 943889eff93..6dc967726c4 100644
--- a/devel/go-viper/Makefile
+++ b/devel/go-viper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:38:21 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 DISTNAME=	viper-0.0.20170723
 PKGNAME=	go-${DISTNAME}
@@ -32,4 +32,3 @@ GO_SRCPATH=	github.com/spf13/viper
 .include "../../devel/go-afero/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-viper/buildlink3.mk b/devel/go-viper/buildlink3.mk
index 4692db38174..d2d18f9b70e 100644
--- a/devel/go-viper/buildlink3.mk
+++ b/devel/go-viper/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:38:21 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 BUILDLINK_TREE+=	go-viper
 
@@ -29,4 +29,3 @@ BUILDLINK_PKGSRCDIR.go-viper?=		../../devel/go-viper
 .endif  # GO_VIPER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-viper
-
diff --git a/devel/go-yaml/Makefile b/devel/go-yaml/Makefile
index 30caf303448..539a45b5919 100644
--- a/devel/go-yaml/Makefile
+++ b/devel/go-yaml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:38:36 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 DISTNAME=	yaml-0.0.20160301
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	gopkg.in/yaml.v2
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/go-yaml/buildlink3.mk b/devel/go-yaml/buildlink3.mk
index 14122780cdf..62e064a48ad 100644
--- a/devel/go-yaml/buildlink3.mk
+++ b/devel/go-yaml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:38:36 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 BUILDLINK_TREE+=	go-yaml
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-yaml?=		../../devel/go-yaml
 .endif  # GO_YAML_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-yaml
-
diff --git a/lang/go-hcl/Makefile b/lang/go-hcl/Makefile
index 31a6f82d856..eb2b3787062 100644
--- a/lang/go-hcl/Makefile
+++ b/lang/go-hcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 02:02:39 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 DISTNAME=	hcl-0.0.20160616
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/hashicorp/hcl
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/lang/go-hcl/buildlink3.mk b/lang/go-hcl/buildlink3.mk
index cc9a3533666..0bdececb605 100644
--- a/lang/go-hcl/buildlink3.mk
+++ b/lang/go-hcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 02:02:39 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 BUILDLINK_TREE+=	go-hcl
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-hcl?=		../../lang/go-hcl
 .endif  # GO_HCL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-hcl
-
diff --git a/math/go-stats/Makefile b/math/go-stats/Makefile
index 7c04ffbee71..b0821495f2f 100644
--- a/math/go-stats/Makefile
+++ b/math/go-stats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 02:03:11 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 DISTNAME=	stats-0.2.0.20170729
 PKGNAME=	go-${DISTNAME}
@@ -21,4 +21,3 @@ post-patch:
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/math/go-stats/buildlink3.mk b/math/go-stats/buildlink3.mk
index 1355c3479f9..9efe925df6c 100644
--- a/math/go-stats/buildlink3.mk
+++ b/math/go-stats/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 02:03:11 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 BUILDLINK_TREE+=	go-stats
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-stats?=		../../math/go-stats
 .endif  # GO_STATS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-stats
-
diff --git a/net/go-websocket/Makefile b/net/go-websocket/Makefile
index ff1dd0f29fd..520ebedaa19 100644
--- a/net/go-websocket/Makefile
+++ b/net/go-websocket/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 02:03:23 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 DISTNAME=	websocket-1.0.0
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/gorilla/websocket
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/net/go-websocket/buildlink3.mk b/net/go-websocket/buildlink3.mk
index 7cf6b2b4f7e..eeac67d5884 100644
--- a/net/go-websocket/buildlink3.mk
+++ b/net/go-websocket/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 02:03:23 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 BUILDLINK_TREE+=	go-websocket
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-websocket?=	../../net/go-websocket
 .endif  # GO_WEBSOCKET_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-websocket
-
diff --git a/security/go-crypt/Makefile b/security/go-crypt/Makefile
index 632e0cc652b..dab8818c921 100644
--- a/security/go-crypt/Makefile
+++ b/security/go-crypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:59:34 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 # Making up a version number, as this is a snapshot after the latest release
 DISTNAME=	crypt-0.0.2b
@@ -21,4 +21,3 @@ GO_SRCPATH=	github.com/xordataexchange/crypt
 .include "../../security/go-crypto/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/security/go-crypt/buildlink3.mk b/security/go-crypt/buildlink3.mk
index 8be6561b8c8..e66e8440228 100644
--- a/security/go-crypt/buildlink3.mk
+++ b/security/go-crypt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:59:34 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 BUILDLINK_TREE+=	go-crypt
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-crypt?=		../../security/go-crypt
 .endif  # GO_CRYPT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-crypt
-
diff --git a/security/go-crypto-acme/Makefile b/security/go-crypto-acme/Makefile
index 999fabc7ad0..7805d224c24 100644
--- a/security/go-crypto-acme/Makefile
+++ b/security/go-crypto-acme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/05/02 17:06:30 fhajny Exp $
+# $NetBSD: Makefile,v 1.4 2017/08/25 16:49:14 jperkin Exp $
 
 PKGNAME=	${DISTNAME:S/crypto/crypto-acme/}
 COMMENT=	ACME library from go-crypto
@@ -8,4 +8,3 @@ GO_DIST_BASE=	${GITHUB_PROJECT}-${GITHUB_TAG}*/acme
 
 .include "../../net/go-net/buildlink3.mk"
 .include "../../security/go-crypto/Makefile.common"
-
diff --git a/security/go-sftp/Makefile b/security/go-sftp/Makefile
index d9a8ed5275b..645a8d603cb 100644
--- a/security/go-sftp/Makefile
+++ b/security/go-sftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:59:47 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 DISTNAME=	sftp-1.0.0
 PKGNAME=	go-${DISTNAME}
@@ -20,4 +20,3 @@ GO_SRCPATH=	github.com/pkg/sftp
 .include "../../security/go-crypto/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/security/go-sftp/buildlink3.mk b/security/go-sftp/buildlink3.mk
index c6cf58d90c7..ac491ecd26c 100644
--- a/security/go-sftp/buildlink3.mk
+++ b/security/go-sftp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:59:47 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 BUILDLINK_TREE+=	go-sftp
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-sftp?=		../../security/go-sftp
 .endif  # GO_SFTP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-sftp
-
diff --git a/textproc/go-inflect/Makefile b/textproc/go-inflect/Makefile
index 75a8c2f4301..92fdd18775e 100644
--- a/textproc/go-inflect/Makefile
+++ b/textproc/go-inflect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:55:30 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 DISTNAME=	inflect-0.0.20170411
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/markbates/inflect
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/textproc/go-inflect/buildlink3.mk b/textproc/go-inflect/buildlink3.mk
index 177749d3c42..7bd39c8defa 100644
--- a/textproc/go-inflect/buildlink3.mk
+++ b/textproc/go-inflect/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:55:30 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 BUILDLINK_TREE+=	go-inflect
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-inflect?=	../../textproc/go-inflect
 .endif  # GO_INFLECT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-inflect
-
diff --git a/textproc/go-md2man/Makefile b/textproc/go-md2man/Makefile
index 320608bc152..f8a25016e79 100644
--- a/textproc/go-md2man/Makefile
+++ b/textproc/go-md2man/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:55:42 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 DISTNAME=	go-md2man-1.0.6
 PKGNAME=	${DISTNAME}
@@ -19,4 +19,3 @@ GO_SRCPATH=	github.com/cpuguy83/go-md2man
 .include "../../devel/go-sanitized_anchor_name/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/textproc/go-md2man/buildlink3.mk b/textproc/go-md2man/buildlink3.mk
index bd97e79b5fc..3e4dc3e88b9 100644
--- a/textproc/go-md2man/buildlink3.mk
+++ b/textproc/go-md2man/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:55:42 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $
 
 BUILDLINK_TREE+=	go-md2man
 
@@ -16,4 +16,3 @@ BUILDLINK_PKGSRCDIR.go-md2man?=		../../textproc/go-md2man
 .endif  # GO_MD2MAN_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-md2man
-
diff --git a/textproc/go-mmark/Makefile b/textproc/go-mmark/Makefile
index 0a8d567c15e..ad65a1ccccf 100644
--- a/textproc/go-mmark/Makefile
+++ b/textproc/go-mmark/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:55:54 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:15 jperkin Exp $
 
 DISTNAME=	mmark-1.3.6
 PKGNAME=	go-${DISTNAME}
@@ -18,4 +18,3 @@ GO_SRCPATH=	github.com/miekg/mmark
 .include "../../www/go-toml-burntsushi/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/textproc/go-mmark/buildlink3.mk b/textproc/go-mmark/buildlink3.mk
index 8a28ea89738..e20a8ec1032 100644
--- a/textproc/go-mmark/buildlink3.mk
+++ b/textproc/go-mmark/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:55:54 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:15 jperkin Exp $
 
 BUILDLINK_TREE+=	go-mmark
 
@@ -15,4 +15,3 @@ BUILDLINK_PKGSRCDIR.go-mmark?=		../../textproc/go-mmark
 .endif  # GO_MMARK_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-mmark
-
diff --git a/textproc/go-prose/Makefile b/textproc/go-prose/Makefile
index 19ccb7edaed..fe614dc3546 100644
--- a/textproc/go-prose/Makefile
+++ b/textproc/go-prose/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:56:05 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:15 jperkin Exp $
 
 DISTNAME=	prose-0.0.20170806
 PKGNAME=	go-${DISTNAME}
@@ -21,4 +21,3 @@ GO_SRCPATH=	github.com/jdkato/prose
 .include "../../textproc/go-sentences/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/textproc/go-prose/buildlink3.mk b/textproc/go-prose/buildlink3.mk
index 35a50ae5d98..6cbc1aa1643 100644
--- a/textproc/go-prose/buildlink3.mk
+++ b/textproc/go-prose/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:56:05 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:15 jperkin Exp $
 
 BUILDLINK_TREE+=	go-prose
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-prose?=		../../textproc/go-prose
 .endif  # GO_PROSE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-prose
-
diff --git a/textproc/go-sentences/Makefile b/textproc/go-sentences/Makefile
index 8bfe7be27ed..e080902cf48 100644
--- a/textproc/go-sentences/Makefile
+++ b/textproc/go-sentences/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:56:16 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:15 jperkin Exp $
 
 DISTNAME=	sentences-1.0.6
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	gopkg.in/neurosnap/sentences.v1
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/textproc/go-sentences/buildlink3.mk b/textproc/go-sentences/buildlink3.mk
index 7eef4878ea8..ff97355b8f5 100644
--- a/textproc/go-sentences/buildlink3.mk
+++ b/textproc/go-sentences/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:56:16 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:15 jperkin Exp $
 
 BUILDLINK_TREE+=	go-sentences
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-sentences?=		../../textproc/go-sentences
 .endif  # GO_SENTENCES_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-sentences
-
diff --git a/www/go-ace/Makefile b/www/go-ace/Makefile
index 3be4e7d9120..eb4ad092910 100644
--- a/www/go-ace/Makefile
+++ b/www/go-ace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:08:30 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:15 jperkin Exp $
 
 DISTNAME=	ace-0.0.4b
 PKGNAME=	go-${DISTNAME}
@@ -22,4 +22,3 @@ post-patch:
 .include "../../www/go-gohtml/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/www/go-ace/buildlink3.mk b/www/go-ace/buildlink3.mk
index 0d2cb3cddbe..7316fe875c5 100644
--- a/www/go-ace/buildlink3.mk
+++ b/www/go-ace/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:08:30 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:15 jperkin Exp $
 
 BUILDLINK_TREE+=	go-ace
 
@@ -15,4 +15,3 @@ BUILDLINK_PKGSRCDIR.go-ace?=		../../www/go-ace
 .endif  # GO_ACE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-ace
-
diff --git a/www/go-cssmin/Makefile b/www/go-cssmin/Makefile
index d5b2fc4b5b8..c0cf6613e65 100644
--- a/www/go-cssmin/Makefile
+++ b/www/go-cssmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:48:43 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:15 jperkin Exp $
 
 DISTNAME=	cssmin-0.0.20151210
 PKGNAME=	go-${DISTNAME}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/dchest/cssmin
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/www/go-cssmin/buildlink3.mk b/www/go-cssmin/buildlink3.mk
index 6c1f0cb6627..b40622103a1 100644
--- a/www/go-cssmin/buildlink3.mk
+++ b/www/go-cssmin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:48:43 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:15 jperkin Exp $
 
 BUILDLINK_TREE+=	go-cssmin
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-cssmin?=		../../www/go-cssmin
 .endif  # GO_CSSMIN_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-cssmin
-
diff --git a/www/go-gohtml/Makefile b/www/go-gohtml/Makefile
index 90a1439e00d..e36a1edbc82 100644
--- a/www/go-gohtml/Makefile
+++ b/www/go-gohtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/08/17 01:49:08 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/25 16:49:15 jperkin Exp $
 
 DISTNAME=	gohtml-0.0.20150923
 PKGNAME=	go-${DISTNAME}
@@ -18,4 +18,3 @@ GO_SRCPATH=	github.com/yosssi/gohtml
 .include "../../net/go-net/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/www/go-gohtml/buildlink3.mk b/www/go-gohtml/buildlink3.mk
index 3597fe02c8c..7fdbf96329b 100644
--- a/www/go-gohtml/buildlink3.mk
+++ b/www/go-gohtml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:49:08 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:15 jperkin Exp $
 
 BUILDLINK_TREE+=	go-gohtml
 
@@ -15,4 +15,3 @@ BUILDLINK_PKGSRCDIR.go-gohtml?=		../../www/go-gohtml
 .endif  # GO_GOHTML_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-gohtml
-
diff --git a/www/go-toml-burntsushi/Makefile b/www/go-toml-burntsushi/Makefile
index c39224e6ca3..ad95ccd0d99 100644
--- a/www/go-toml-burntsushi/Makefile
+++ b/www/go-toml-burntsushi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/08/25 16:06:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2017/08/25 16:49:15 jperkin Exp $
 
 DISTNAME=	toml-0.2.0
 PKGNAME=	go-${DISTNAME:S/toml/toml-burntsushi/}
@@ -17,4 +17,3 @@ GO_SRCPATH=	github.com/BurntSushi/toml
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/www/go-toml-burntsushi/buildlink3.mk b/www/go-toml-burntsushi/buildlink3.mk
index 684c81381ca..29617ae5f76 100644
--- a/www/go-toml-burntsushi/buildlink3.mk
+++ b/www/go-toml-burntsushi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:49:40 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:15 jperkin Exp $
 
 BUILDLINK_TREE+=	go-toml-burntsushi
 
@@ -14,4 +14,3 @@ BUILDLINK_PKGSRCDIR.go-toml-burntsushi?=		../../www/go-toml-burntsushi
 .endif  # GO_TOML_BURNTSUSHI_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-toml-burntsushi
-
diff --git a/www/go-toml-pelletier/Makefile b/www/go-toml-pelletier/Makefile
index 76c5e05f1ae..2db775911f3 100644
--- a/www/go-toml-pelletier/Makefile
+++ b/www/go-toml-pelletier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/08/25 16:06:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2017/08/25 16:49:15 jperkin Exp $
 
 DISTNAME=	go-toml-1.0.0
 PKGNAME=	${DISTNAME:S/toml/toml-pelletier/}
@@ -18,4 +18,3 @@ GO_SRCPATH=	github.com/pelletier/go-toml
 .include "../../devel/go-buffruneio/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/www/go-toml-pelletier/buildlink3.mk b/www/go-toml-pelletier/buildlink3.mk
index c8534d18c56..cb808859d1b 100644
--- a/www/go-toml-pelletier/buildlink3.mk
+++ b/www/go-toml-pelletier/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 01:49:58 gavan Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:15 jperkin Exp $
 
 BUILDLINK_TREE+=	go-toml-pelletier
 
@@ -15,4 +15,3 @@ BUILDLINK_PKGSRCDIR.go-toml-pelletier?=		../../www/go-toml-pelletier
 .endif  # GO_TOML_PELLETIER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-go-toml-pelletier
-