pick: Update to 3.0.1

Patch provided by Jenz Guenther with minor adjustments by me.

Changes:
# v3.0.1 - 2019-03-10
## Bug fixes
- Honor `PREFIX` during configure.
  (adcba3c) (Anton Lindqvist)
- Honor `MANDIR` during configure and install.
  (8c56f54) (Aggelos Avgerinos)
- Honor `INSTALL_MAN` during configure and install.
  (869536f) (Leonardo Taccari)
- Honor `BINDIR` during configure and install.
  (434c496) (Anton Lindqvist)

4 files changed, 8 insertions, 67 deletions

diff --git a/misc/pick/Makefile b/misc/pick/Makefile
index ea12643e0a4..4b8873709fd 100644
--- a/misc/pick/Makefile
+++ b/misc/pick/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2019/02/28 19:27:43 leot Exp $
+# $NetBSD: Makefile,v 1.3 2019/03/12 19:02:45 leot Exp $
 
-DISTNAME=	pick-3.0.0
+DISTNAME=	pick-3.0.1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mptre/}
 GITHUB_RELEASE=	v${PKGVERSION_NOREV}
@@ -14,9 +14,7 @@ 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}
+CONFIGURE_ENV+=	MANDIR=${PREFIX}/${PKGMANDIR}
 
 CFLAGS.NetBSD+=	-D_OPENBSD_SOURCE	# reallocarray(3), strtonum(3)
 
diff --git a/misc/pick/distinfo b/misc/pick/distinfo
index 4e49c2e665b..d6e4fa2bcb1 100644
--- a/misc/pick/distinfo
+++ b/misc/pick/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.2 2019/02/28 19:27:43 leot Exp $
+$NetBSD: distinfo,v 1.3 2019/03/12 19:02:45 leot Exp $
 
-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 (pick-3.0.1.tar.gz) = 4b3d5eee3ee8a6cd926d049d0934e91d1b22822c
+RMD160 (pick-3.0.1.tar.gz) = 0a971a50d58776f3e2d3440e48c36b47291f9856
+SHA512 (pick-3.0.1.tar.gz) = 7448e7937640f69d397bd1bd48526865b8866a8f47eb04b7af918df992f36b6e932a1cb68e845f9262faa9c88c1afcb354368b7e1c6b1dd8503aafdb53e4b70f
+Size (pick-3.0.1.tar.gz) = 29878 bytes
 SHA1 (patch-pick.c) = cdce675828e0187cc9567aeec93893c9dbd14087
diff --git a/misc/pick/patches/patch-Makefile b/misc/pick/patches/patch-Makefile
deleted file mode 100644
index c13a6bb9179..00000000000
--- a/misc/pick/patches/patch-Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-$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}
diff --git a/misc/pick/patches/patch-configure b/misc/pick/patches/patch-configure
deleted file mode 100644
index fa877b56213..00000000000
--- a/misc/pick/patches/patch-configure
+++ /dev/null
@@ -1,28 +0,0 @@
-$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