pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

go-kr-text: fix build



Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By:	bsiegert
Date:		Sat May 8 17:22:09 2021 +0200
Changeset:	95226095d543083f7164daf4d968c5bce0088d1a

Modified Files:
	go-kr-text/Makefile
	go-kr-text/PLIST
	go-kr-text/distinfo
Added Files:
	go-kr-text/patches/patch-mc_mc.go

Log Message:
go-kr-text: fix build

Link against the correct version of go-pty, bump revision.

Really, this is a Go module and it should be using a module-based build.
Note that module builds do not have packages for intermediate modules,
only the executables. So perhaps this package can actually go?

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=95226095d543083f7164daf4d968c5bce0088d1a

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

diffstat:
 go-kr-text/Makefile               |  4 ++--
 go-kr-text/PLIST                  |  1 +
 go-kr-text/distinfo               |  1 +
 go-kr-text/patches/patch-mc_mc.go | 13 +++++++++++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diffs:
diff --git a/go-kr-text/Makefile b/go-kr-text/Makefile
index a8844a99f4..0150aa418b 100644
--- a/go-kr-text/Makefile
+++ b/go-kr-text/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	go-kr-text-0.1.0
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	textproc devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=kr/}
 GITHUB_PROJECT=	text
@@ -16,6 +16,6 @@ EXTRACT_USING=	bsdtar
 GO_SRCPATH=	github.com/kr/text/
 GO_DIST_BASE=	text-${PKGVERSION_NOREV}
 
-.include "../../wip/go-pty/buildlink3.mk" # XXX
+.include "../../devel/go-pty/buildlink3.mk"
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/go-kr-text/PLIST b/go-kr-text/PLIST
index fd480c3f17..a3be062b41 100644
--- a/go-kr-text/PLIST
+++ b/go-kr-text/PLIST
@@ -18,5 +18,6 @@ gopkg/src/github.com/kr/text/indent.go
 gopkg/src/github.com/kr/text/indent_test.go
 gopkg/src/github.com/kr/text/mc/Readme
 gopkg/src/github.com/kr/text/mc/mc.go
+gopkg/src/github.com/kr/text/mc/mc.go.orig
 gopkg/src/github.com/kr/text/wrap.go
 gopkg/src/github.com/kr/text/wrap_test.go
diff --git a/go-kr-text/distinfo b/go-kr-text/distinfo
index 20e78d90bc..89ae07370e 100644
--- a/go-kr-text/distinfo
+++ b/go-kr-text/distinfo
@@ -4,3 +4,4 @@ SHA1 (go-kr-text-0.1.0.tar.gz) = 08c092df897835fb58ab0356d47ed93582aa3f8c
 RMD160 (go-kr-text-0.1.0.tar.gz) = b4c17a2072f4153de6e6c98f715a8d737073fe19
 SHA512 (go-kr-text-0.1.0.tar.gz) = bac4ad4e21c16838f79aeacf7c71d706794ae2921dfd4817f10583ae4ba650279be69996524a77b555ad3858170118682bbe1fd643a60201e59805afd1ee551e
 Size (go-kr-text-0.1.0.tar.gz) = 8686 bytes
+SHA1 (patch-mc_mc.go) = f45108233e044de68f75c6bc5d0e72b01897d5e0
diff --git a/go-kr-text/patches/patch-mc_mc.go b/go-kr-text/patches/patch-mc_mc.go
new file mode 100644
index 0000000000..93aa869d35
--- /dev/null
+++ b/go-kr-text/patches/patch-mc_mc.go
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- mc/mc.go.orig	2018-05-06 08:24:08.000000000 +0000
++++ mc/mc.go
+@@ -10,7 +10,7 @@
+ package main
+ 
+ import (
+-	"github.com/kr/pty"
++	"github.com/creack/pty"
+ 	"github.com/kr/text/colwriter"
+ 	"io"
+ 	"log"


Home | Main Index | Thread Index | Old Index