CVS commit: pkgsrc/textproc/sift

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

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Mar 13 17:28:59 UTC 2018

Modified Files:
        pkgsrc/textproc/sift: Makefile distinfo
Added Files:
        pkgsrc/textproc/sift/patches: patch-matching__cgo.go

Log Message:
Fix build with Go 1.10, bump revision.

There is a cgo file in here that specifies -funroll-loops (fun!). Since
Go 1.9.4, only C compiler flags on a whitelist are allowed, and of course
that flag is not on it.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/sift/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/sift/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/sift/patches/patch-matching__cgo.go

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

Modified files:

Index: pkgsrc/textproc/sift/Makefile
diff -u pkgsrc/textproc/sift/Makefile:1.9 pkgsrc/textproc/sift/Makefile:1.10
--- pkgsrc/textproc/sift/Makefile:1.9   Sun Mar  4 15:52:20 2018
+++ pkgsrc/textproc/sift/Makefile       Tue Mar 13 17:28:59 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2018/03/04 15:52:20 bsiegert Exp $
+# $NetBSD: Makefile,v 1.10 2018/03/13 17:28:59 bsiegert Exp $
 
 DISTNAME=      sift-0.6.0
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=svent/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -14,6 +14,9 @@ LICENSE=      gnu-gpl-v3
 GO_DIST_BASE=  ${DISTNAME}
 GO_SRCPATH=    github.com/svent/sift
 
+post-install:
+       find ${DESTDIR}${PREFIX}/gopkg/src/${GO_SRCPATH} -name "*.orig" -exec ${RM} \{\} \;
+
 .include "../../security/go-crypto/buildlink3.mk"
 .include "../../devel/go-nbreader/buildlink3.mk"
 .include "../../devel/go-flags-svent/buildlink3.mk"

Index: pkgsrc/textproc/sift/distinfo
diff -u pkgsrc/textproc/sift/distinfo:1.1 pkgsrc/textproc/sift/distinfo:1.2
--- pkgsrc/textproc/sift/distinfo:1.1   Sun Dec 27 20:50:40 2015
+++ pkgsrc/textproc/sift/distinfo       Tue Mar 13 17:28:59 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2015/12/27 20:50:40 wiz Exp $
+$NetBSD: distinfo,v 1.2 2018/03/13 17:28:59 bsiegert Exp $
 
 SHA1 (sift-0.6.0.tar.gz) = eae22261ed09cff6bb1b21bb2fcb0d0c28f6ab81
 RMD160 (sift-0.6.0.tar.gz) = ee9c6119e53503496b3c748fec292130e015cda5
 SHA512 (sift-0.6.0.tar.gz) = 7a42a793cde876834468ef800e109dfb18dde28451cb05e3e3e9ac3cbe07d4f1c9bdc007c7e2ef84ebd3162753c698c177017e19cefa0a6d2cc2822d308204c9
 Size (sift-0.6.0.tar.gz) = 34032 bytes
+SHA1 (patch-matching__cgo.go) = 10b30a335e3e86616fe9dd9f97090adff1fd507a

Added files:

Index: pkgsrc/textproc/sift/patches/patch-matching__cgo.go
diff -u /dev/null pkgsrc/textproc/sift/patches/patch-matching__cgo.go:1.1
--- /dev/null   Tue Mar 13 17:29:00 2018
+++ pkgsrc/textproc/sift/patches/patch-matching__cgo.go Tue Mar 13 17:28:59 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-matching__cgo.go,v 1.1 2018/03/13 17:28:59 bsiegert Exp $
+
+The -funroll-loops flag is not on the compiler flag whitelist.
+
+--- matching_cgo.go.orig       2015-12-23 00:37:41.000000000 +0000
++++ matching_cgo.go
+@@ -16,7 +16,7 @@
+ package main
+ 
+ /*
+-#cgo CFLAGS: -std=gnu99 -O2 -funroll-loops
++#cgo CFLAGS: -std=gnu99 -O2
+ 
+ #include <stddef.h>
+