Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1551382063254180"
MIME-Version: 1.0
Date: Thu, 28 Feb 2019 19:27:43 +0000
From: "Leonardo Taccari" <leot@netbsd.org>
Subject: CVS commit: pkgsrc/misc/pick
To: pkgsrc-changes@NetBSD.org
Reply-To: leot@netbsd.org
Message-Id: <20190228192743.622E4FB16@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1551382063254180
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	leot
Date:		Thu Feb 28 19:27:43 UTC 2019

Modified Files:
	pkgsrc/misc/pick: Makefile distinfo
Added Files:
	pkgsrc/misc/pick/patches: patch-Makefile patch-configure

Log Message:
pick: Update to 3.0.0

Patch provided by Jenz Guenther with some adjustments by myself.

pkgsrc changes:
 - Adjust to configure and inject INSTALL*, PREFIX and MANDIR variables
 - Patch configure and Makefile to honor INSTALL_MAN and MANDIR
 - Add support for test

Changes:
# v3.0.0 - 2019-02-27
 - pick is now available as a package on NetBSD.
   (ec5b83b)
   (Jenz Guenther)
 - Usage of autoconf and automake has been replaced in favor of a shell-script
   and plain Makefile(s). The process of building pick remains the same.
   (970c5f4)
   (Anton Lindqvist)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/pick/Makefile pkgsrc/misc/pick/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/pick/patches/patch-Makefile \
    pkgsrc/misc/pick/patches/patch-configure

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


--_----------=_1551382063254180
Content-Disposition: inline
Content-Length: 4387
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/misc/pick/Makefile
diff -u pkgsrc/misc/pick/Makefile:1.1 pkgsrc/misc/pick/Makefile:1.2
--- pkgsrc/misc/pick/Makefile:1.1	Wed May  9 15:26:05 2018
+++ pkgsrc/misc/pick/Makefile	Thu Feb 28 19:27:43 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2018/05/09 15:26:05 leot Exp $
+# $NetBSD: Makefile,v 1.2 2019/02/28 19:27:43 leot Exp $
 
-DISTNAME=	pick-2.0.2
+DISTNAME=	pick-3.0.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mptre/}
 GITHUB_RELEASE=	v${PKGVERSION_NOREV}
@@ -10,9 +10,17 @@ HOMEPAGE=	https://github.com/mptre/pick/
 COMMENT=	Fuzzy search tool for the command-line
 LICENSE=	mit
 
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
+
+CONFIGURE_ENV+=	INSTALL=${INSTALL_PROGRAM:Q}
+CONFIGURE_ENV+=	INSTALL_MAN=${INSTALL_MAN:Q}
+
+MAKE_FLAGS+=	PREFIX=${PREFIX:Q}
+MAKE_FLAGS+=	MANDIR=${PKGMANDIR:Q}
 
 CFLAGS.NetBSD+=	-D_OPENBSD_SOURCE	# reallocarray(3), strtonum(3)
 
+TEST_TARGET=	test
+
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/misc/pick/distinfo
diff -u pkgsrc/misc/pick/distinfo:1.1 pkgsrc/misc/pick/distinfo:1.2
--- pkgsrc/misc/pick/distinfo:1.1	Wed May  9 15:26:05 2018
+++ pkgsrc/misc/pick/distinfo	Thu Feb 28 19:27:43 2019
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.1 2018/05/09 15:26:05 leot Exp $
+$NetBSD: distinfo,v 1.2 2019/02/28 19:27:43 leot Exp $
 
-SHA1 (pick-2.0.2.tar.gz) = 6cc08e999f044defff085efa9182678cf25ff132
-RMD160 (pick-2.0.2.tar.gz) = 0d5b69ca295511ac7e32b3a8fea24c590ed089e3
-SHA512 (pick-2.0.2.tar.gz) = 92d74fa62f6c829117c6c3faf6ec39fc5dd66465516be396d21d7b0a92ee10761a1d3f43aa4a454f8d19790ac02a4a1af145139d488344c97a511805c5d6965b
-Size (pick-2.0.2.tar.gz) = 132174 bytes
+SHA1 (pick-3.0.0.tar.gz) = ecbf2a41c95dbc6112b111237fa832cc8abeb4c5
+RMD160 (pick-3.0.0.tar.gz) = 3c2d0fd0e0143e2956ffc62a9cdb7941bcc3be9c
+SHA512 (pick-3.0.0.tar.gz) = fa6bdc491e6a04f330d8e9258562d030dc40245d8ae2b7d552eb2ede0d08548cd0de061dc66a24d7a05ba9f6ca984e59807248bfc848048e36bf86cf7c56fea4
+Size (pick-3.0.0.tar.gz) = 29736 bytes
+SHA1 (patch-Makefile) = f4a878ddc62a41bcc8037045103bbd51cf5dd654
+SHA1 (patch-configure) = 939d1c5b7aa22127b0adbcbd2f7838d46a8ea599
 SHA1 (patch-pick.c) = cdce675828e0187cc9567aeec93893c9dbd14087

Added files:

Index: pkgsrc/misc/pick/patches/patch-Makefile
diff -u /dev/null pkgsrc/misc/pick/patches/patch-Makefile:1.1
--- /dev/null	Thu Feb 28 19:27:43 2019
+++ pkgsrc/misc/pick/patches/patch-Makefile	Thu Feb 28 19:27:43 2019
@@ -0,0 +1,27 @@
+$NetBSD: patch-Makefile,v 1.1 2019/02/28 19:27:43 leot Exp $
+
+- Add support for MANDIR instead of forcing install of man pages in ${PREFIX}/man.
+- Use INSTALL_MAN instead of INSTALL to install man pages with the proper
+  permissions (no executable bit set)
+
+--- Makefile.orig	2019-02-27 19:07:35.000000000 +0000
++++ Makefile
+@@ -68,6 +68,7 @@ DISTFILES+=	tests/pick-test.c
+ DISTFILES+=	tests/pick-test.sh
+ 
+ PREFIX=	/usr/local
++MANDIR=	man
+ 
+ all: ${PROG}
+ 
+@@ -100,8 +101,8 @@ distclean: clean
+ install: ${PROG}
+ 	@mkdir -p ${DESTDIR}${PREFIX}/bin
+ 	${INSTALL} ${PROG} ${DESTDIR}${PREFIX}/bin
+-	@mkdir -p ${DESTDIR}${PREFIX}/man/man1
+-	${INSTALL} ${.CURDIR}/pick.1 ${DESTDIR}${PREFIX}/man/man1
++	@mkdir -p ${DESTDIR}${PREFIX}/${MANDIR}/man1
++	${INSTALL_MAN} ${.CURDIR}/pick.1 ${DESTDIR}${PREFIX}/${MANDIR}/man1
+ .PHONY: install
+ 
+ test: ${PROG}
Index: pkgsrc/misc/pick/patches/patch-configure
diff -u /dev/null pkgsrc/misc/pick/patches/patch-configure:1.1
--- /dev/null	Thu Feb 28 19:27:43 2019
+++ pkgsrc/misc/pick/patches/patch-configure	Thu Feb 28 19:27:43 2019
@@ -0,0 +1,28 @@
+$NetBSD: patch-configure,v 1.1 2019/02/28 19:27:43 leot Exp $
+
+Add support for INSTALL_MAN in order to avoid installing man pages with
+executable bit set.
+
+--- configure.orig	2019-02-27 19:07:35.000000000 +0000
++++ configure
+@@ -135,10 +135,12 @@ CC=$(makevar CC)
+ CFLAGS=$(makevar CFLAGS)
+ CFLAGS="${CFLAGS} ${DEBUG} -Wall -Wextra -MD -MP"
+ INSTALL=$(makevar INSTALL)
++INSTALL_MAN=$(makevar INSTALL_MAN)
+ 
+ : "${CPPFLAGS:=}"
+ : "${DEBUG:=}"
+ : "${INSTALL:=install}"
++: "${INSTALL_MAN:=install -m 444}"
+ : "${LDFLAGS:=}"
+ 
+ exec 3>&1 4>&2
+@@ -222,6 +224,7 @@ CFLAGS=		$(echo $CFLAGS)
+ CPPFLAGS=	$(echo $CPPFLAGS)
+ DEBUG=		$(echo $DEBUG)
+ INSTALL=	$(echo $INSTALL)
++INSTALL_MAN=	$(echo $INSTALL_MAN)
+ LDFLAGS=	$(echo $LDFLAGS)
+ MALLOC_OPTIONS=	$(echo $MALLOC_OPTIONS)
+ EOF


--_----------=_1551382063254180--