CVS commit: pkgsrc/www/pup

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat May 15 17:08:06 UTC 2021

Modified Files:
        pkgsrc/www/pup: Makefile
Added Files:
        pkgsrc/www/pup/files: go.mod modules.txt

Log Message:
pup: change to a Go module build, bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/www/pup/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/www/pup/files/go.mod \
    pkgsrc/www/pup/files/modules.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/pup/Makefile
diff -u pkgsrc/www/pup/Makefile:1.35 pkgsrc/www/pup/Makefile:1.36
--- pkgsrc/www/pup/Makefile:1.35        Sat May  8 15:02:31 2021
+++ pkgsrc/www/pup/Makefile     Sat May 15 17:08:06 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2021/05/08 15:02:31 bsiegert Exp $
+# $NetBSD: Makefile,v 1.36 2021/05/15 17:08:06 bsiegert Exp $
 
 DISTNAME=              pup-0.4.0
-PKGREVISION=           30
+PKGREVISION=           31
 CATEGORIES=            www
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=ericchiang/}
 GITHUB_TAG=            v${PKGVERSION_NOREV}
@@ -11,14 +11,17 @@ HOMEPAGE=           https://github.com/ericchiang
 COMMENT=               Parsing HTML at the command line
 LICENSE=               mit
 
-GO_DIST_BASE=          ${DISTNAME}
-GO_SRCPATH=            github.com/ericchiang/pup
+GO_BUILD_PATTERN=      .
 
 INSTALLATION_DIRS+=    bin share/doc/pup
 
+pre-patch:
+       ${CP} ${FILESDIR}/go.mod ${WRKSRC}
+       ${CP} ${FILESDIR}/modules.txt ${WRKSRC}/vendor
+
 do-install:
-       ${INSTALL_PROGRAM} ${WRKDIR}/bin/pup ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKDIR}/.gopath/bin/pup ${DESTDIR}${PREFIX}/bin
        ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/pup
 
-.include "../../lang/go/go-package.mk"
+.include "../../lang/go/go-module.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/www/pup/files/go.mod
diff -u /dev/null pkgsrc/www/pup/files/go.mod:1.1
--- /dev/null   Sat May 15 17:08:06 2021
+++ pkgsrc/www/pup/files/go.mod Sat May 15 17:08:06 2021
@@ -0,0 +1,12 @@
+module github.com/ericchiang/pup
+
+go 1.15
+
+require (
+       github.com/fatih/color v1.0.0
+       github.com/mattn/go-colorable v0.0.5
+       github.com/mattn/go-isatty v0.0.0-20151211000621-56b76bdf51f7
+       golang.org/x/net v0.0.0-20160720084139-4d38db76854b
+       golang.org/x/sys v0.0.0-20160717071931-a646d33e2ee3
+       golang.org/x/text v0.0.0-20160719205907-0a5a09ee4409
+)
Index: pkgsrc/www/pup/files/modules.txt
diff -u /dev/null pkgsrc/www/pup/files/modules.txt:1.1
--- /dev/null   Sat May 15 17:08:06 2021
+++ pkgsrc/www/pup/files/modules.txt    Sat May 15 17:08:06 2021
@@ -0,0 +1,34 @@
+# github.com/fatih/color v1.0.0
+## explicit
+github.com/fatih/color
+# github.com/mattn/go-colorable v0.0.5
+## explicit
+github.com/mattn/go-colorable
+# github.com/mattn/go-isatty v0.0.0-20151211000621-56b76bdf51f7
+## explicit
+github.com/mattn/go-isatty
+# golang.org/x/net v0.0.0-20160720084139-4d38db76854b
+## explicit
+golang.org/x/net/html
+golang.org/x/net/html/atom
+golang.org/x/net/html/charset
+# golang.org/x/sys v0.0.0-20160717071931-a646d33e2ee3
+## explicit
+golang.org/x/sys/unix
+# golang.org/x/text v0.0.0-20160719205907-0a5a09ee4409
+## explicit
+golang.org/x/text/encoding
+golang.org/x/text/encoding/charmap
+golang.org/x/text/encoding/htmlindex
+golang.org/x/text/encoding/internal
+golang.org/x/text/encoding/internal/identifier
+golang.org/x/text/encoding/japanese
+golang.org/x/text/encoding/korean
+golang.org/x/text/encoding/simplifiedchinese
+golang.org/x/text/encoding/traditionalchinese
+golang.org/x/text/encoding/unicode
+golang.org/x/text/internal/tag
+golang.org/x/text/internal/utf8internal
+golang.org/x/text/language
+golang.org/x/text/runes
+golang.org/x/text/transform