Attachment 177192 Details for Bug 214678 – Update patch

[patch] Update patch

fzf_new.diff (text/plain), 3.99 KB, created by Sascha Holzleiter on 2016-11-19 23:24:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sascha Holzleiter

Created: 2016-11-19 23:24:20 UTC

Size: 3.99 KB

patch

obsolete

>diff -Nur freebsd/textproc/fzf/Makefile myports/textproc/fzf/Makefile
>--- freebsd/textproc/fzf/Makefile	2016-11-06 03:24:44.046236000 +0100
>+++ myports/textproc/fzf/Makefile	2016-11-20 00:06:38.348383000 +0100
>@@ -1,8 +1,8 @@
> # Created by: Sascha Holzleiter <sascha@root-login.org>
>-# $FreeBSD$
>+# $FreeBSD: head/textproc/fzf/Makefile 420334 2016-08-17 11:45:22Z amdmi3 $
> 
> PORTNAME=	fzf
>-PORTVERSION=	0.13.4
>+PORTVERSION=	0.15.8
> CATEGORIES=	textproc
> 
> MAINTAINER=	sascha@root-login.org
>@@ -11,21 +11,20 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BUILD_DEPENDS=	go-runewidth>0:devel/go-runewidth \
>-		go-shellwords>0:devel/go-shellwords
>-
> USES=		compiler go ncurses
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	junegunn
>+GH_SUBDIR:=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
>-
>-GO_TARGET=	${GO_PKGNAME}/src/fzf
>+GH_TUPLE=	junegunn:go-runewidth:63c378b:runwidth/src/github.com/junegunn/go-runewidth \
>+    		junegunn:go-shellwords:35d512a:shellwords/src/github.com/junegunn/go-shellwords \
>+		junegunn:go-isatty:66b8e73:isatty/src/github.com/junegunn/go-isatty
> 
> PLIST_FILES=	bin/fzf man/man1/fzf.1.gz
> 
>+STRIP=		# do not strip go binaries
>+
> OPTIONS_DEFINE=	TMUX
> TMUX_DESC=	Install fzf-tmux (depends on BASH)
> 
>@@ -34,6 +33,14 @@
> TMUX_RUN_DEPENDS=	bash:shells/bash
> TMUX_PLIST_FILES=	bin/fzf-tmux man/man1/fzf-tmux.1.gz
> 
>+do-build:
>+	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/src/fzf; \
>+		${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} \
>+		go build -o bin/${PORTNAME}
>+
>+do-install:
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/src/${PORTNAME}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
>+
> post-install:
> 	${INSTALL_MAN} ${WRKSRC}/man/man1/fzf.1 ${STAGEDIR}${MANPREFIX}/man/man1
> 
>diff -Nur freebsd/textproc/fzf/distinfo myports/textproc/fzf/distinfo
>--- freebsd/textproc/fzf/distinfo	2016-08-18 03:23:52.769992450 +0200
>+++ myports/textproc/fzf/distinfo	2016-11-19 23:50:37.498724000 +0100
>@@ -1,3 +1,9 @@
>-TIMESTAMP = 1471256085
>-SHA256 (junegunn-fzf-0.13.4_GH0.tar.gz) = ba561de9393c7f5604f3463c0d48960b86690afe8396f2c9672d3c4777960c7c
>-SIZE (junegunn-fzf-0.13.4_GH0.tar.gz) = 107907
>+TIMESTAMP = 1479595305
>+SHA256 (junegunn-fzf-0.15.8_GH0.tar.gz) = f02ba45837e8583a3aa4e54a7d0b7d493f5314be6923ca80a639b43d6c0f4a4f
>+SIZE (junegunn-fzf-0.15.8_GH0.tar.gz) = 120461
>+SHA256 (junegunn-go-runewidth-63c378b_GH0.tar.gz) = e7cba5116e6f7051984005f5ab6c23d448307a6fced09eb9bd1bf49f3317b36d
>+SIZE (junegunn-go-runewidth-63c378b_GH0.tar.gz) = 4503
>+SHA256 (junegunn-go-shellwords-35d512a_GH0.tar.gz) = ea496265b81c60c0d590e369ca7cbcf3e87ec39d6f49c7462a7ab0483582b6fa
>+SIZE (junegunn-go-shellwords-35d512a_GH0.tar.gz) = 2340
>+SHA256 (junegunn-go-isatty-66b8e73_GH0.tar.gz) = 261ec4d11cc7615205c67a1dd9ffe1f88166fc50db0022700a82f39ab7e47b0d
>+SIZE (junegunn-go-isatty-66b8e73_GH0.tar.gz) = 1956
>diff -Nur freebsd/textproc/fzf/files/patch-src_options.go myports/textproc/fzf/files/patch-src_options.go
>--- freebsd/textproc/fzf/files/patch-src_options.go	2016-08-13 03:24:01.910764846 +0200
>+++ myports/textproc/fzf/files/patch-src_options.go	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- src/options.go.orig	2016-08-08 11:09:38 UTC
>-+++ src/options.go
>-@@ -10,7 +10,7 @@ import (
>- 
>- 	"github.com/junegunn/fzf/src/curses"
>- 
>--	"github.com/junegunn/go-shellwords"
>-+	"github.com/mattn/go-shellwords"
>- )
>- 
>- const usage = `usage: fzf [options]
>diff -Nur freebsd/textproc/fzf/files/patch-src_terminal.go myports/textproc/fzf/files/patch-src_terminal.go
>--- freebsd/textproc/fzf/files/patch-src_terminal.go	2016-08-13 03:24:01.910764846 +0200
>+++ myports/textproc/fzf/files/patch-src_terminal.go	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- src/terminal.go.orig	2016-07-15 16:06:53 UTC
>-+++ src/terminal.go
>-@@ -15,7 +15,7 @@ import (
>- 	C "github.com/junegunn/fzf/src/curses"
>- 	"github.com/junegunn/fzf/src/util"
>- 
>--	"github.com/junegunn/go-runewidth"
>-+	"github.com/mattn/go-runewidth"
>- )
>- 
>- type jumpMode int

Flags:

sascha: maintainer-approval+

Actions: View | Diff

Attachments on bug 214678: 177192