rhash: updated to 1.3.6

RHash v1.3.6:
* support --file-list option
* librhash: speedup sha3
* Bugfix: fix --follow option
* better MSYS and CygWin support
* configuration script
* Bugfix: broken binary hash output
* Bugfix: fix running on WinXP

5 files changed, 32 insertions, 55 deletions

diff --git a/misc/rhash/Makefile b/misc/rhash/Makefile
index 6e64adbc816..1e835c54150 100644
--- a/misc/rhash/Makefile
+++ b/misc/rhash/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2017/11/16 01:28:12 khorben Exp $
+# $NetBSD: Makefile,v 1.7 2018/03/17 08:02:14 adam Exp $
 
-DISTNAME=	rhash-1.3.5
-PKGREVISION=	1
+DISTNAME=	rhash-1.3.6
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=rhash/}
 GITHUB_PROJECT=	RHash
@@ -13,20 +12,26 @@ COMMENT=	Calculate/check CRC32, MD5, SHA1, GOST, TTH, BTIH or other hash sums
 LICENSE=	mit
 
 WRKSRC=			${WRKDIR}/${DISTNAME:S/rh/RH/}
-INSTALLATION_DIRS=	bin include lib ${PKGMANDIR}/man1 share/examples/rhash
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-symlinks
+CONFIGURE_ARGS+=	--disable-openssl-runtime
+CONFIGURE_ARGS+=	--enable-lib-shared
+CONFIGURE_ARGS+=	--enable-lib-static
+CONFIGURE_ARGS+=	--enable-openssl
+CONFIGURE_ARGS+=	--extra-cflags=-I${PREFIX}/include
+CONFIGURE_ARGS+=	--extra-ldflags=-L${PREFIX}/lib\ -Wl,-R${PREFIX}/lib
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+INSTALL_TARGET=		install install-pkg-config
+INSTALLATION_DIRS=	share/examples/rhash
+TEST_TARGET=		test
 
-MAKE_FLAGS+=	ADDCFLAGS=${CFLAGS:Q}
-MAKE_FLAGS+=	ADDLDFLAGS=${LDFLAGS:Q}
+CONF_FILES+=	${PREFIX}/share/examples/rhash/rhashrc ${PKG_SYSCONFDIR}/rhashrc
 
-CONF_FILES+=		${PREFIX}/share/examples/rhash/rhashrc ${PKG_SYSCONFDIR}/rhashrc
-
-do-install:
-	cd ${WRKSRC} && \
-	${INSTALL_PROGRAM} rhash ${DESTDIR}${PREFIX}/bin && \
-	${INSTALL_LIB} librhash/librhash.a ${DESTDIR}${PREFIX}/lib && \
-	${INSTALL_DATA} librhash/rhash.h librhash/rhash_timing.h ${DESTDIR}${PREFIX}/include && \
-	${INSTALL_DATA} dist/rhash.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 && \
-	${INSTALL_DATA} dist/rhashrc.sample ${DESTDIR}${PREFIX}/share/examples/rhash/rhashrc
+post-install:
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/rhashrc ${DESTDIR}${PREFIX}/share/examples/rhash/rhashrc
 
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/rhash/PLIST b/misc/rhash/PLIST
index a250363970e..d81be6a85b0 100644
--- a/misc/rhash/PLIST
+++ b/misc/rhash/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2014/04/18 21:21:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/03/17 08:02:14 adam Exp $
 bin/rhash
 include/rhash.h
-include/rhash_timing.h
+include/rhash_torrent.h
 lib/librhash.a
+lib/librhash.so.0
+lib/pkgconfig/librhash.pc
 man/man1/rhash.1
 share/examples/rhash/rhashrc
diff --git a/misc/rhash/buildlink3.mk b/misc/rhash/buildlink3.mk
index 05366cc4219..74b07c20b7b 100644
--- a/misc/rhash/buildlink3.mk
+++ b/misc/rhash/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/04/18 21:21:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/03/17 08:02:14 adam Exp $
 
 BUILDLINK_TREE+=	rhash
 
@@ -9,6 +9,8 @@ BUILDLINK_API_DEPENDS.rhash+=	rhash>=1.3.1
 BUILDLINK_PKGSRCDIR.rhash?=	../../misc/rhash
 
 BUILDLINK_DEPMETHOD.rhash?=	build
+
+.include "../../security/openssl/buildlink3.mk"
 .endif	# RHASH_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-rhash
diff --git a/misc/rhash/distinfo b/misc/rhash/distinfo
index 8bc554a010e..48bbe7e6311 100644
--- a/misc/rhash/distinfo
+++ b/misc/rhash/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.9 2017/11/16 15:14:54 khorben Exp $
+$NetBSD: distinfo,v 1.10 2018/03/17 08:02:14 adam Exp $
 
-SHA1 (rhash-1.3.5.tar.gz) = 990c9a0135afe48dee4ce1dbf83578e44735f302
-RMD160 (rhash-1.3.5.tar.gz) = 38f840f8745d3183228d6ca0a9be3036f67f4768
-SHA512 (rhash-1.3.5.tar.gz) = e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c
-Size (rhash-1.3.5.tar.gz) = 316867 bytes
-SHA1 (patch-librhash_byte__order.h) = 92360ac37b4c6e56f6bdbb371ecc0a21a6ea71bd
+SHA1 (rhash-1.3.6.tar.gz) = 62a89fcf39cc8e243d82a860e3ec53dab4e8af69
+RMD160 (rhash-1.3.6.tar.gz) = f0760ffd29ca7af540ea35c89108642cc902f361
+SHA512 (rhash-1.3.6.tar.gz) = 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
+Size (rhash-1.3.6.tar.gz) = 328097 bytes
diff --git a/misc/rhash/patches/patch-librhash_byte__order.h b/misc/rhash/patches/patch-librhash_byte__order.h
deleted file mode 100644
index b8a3a8c23d4..00000000000
--- a/misc/rhash/patches/patch-librhash_byte__order.h
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-librhash_byte__order.h,v 1.5 2017/08/15 08:37:47 adam Exp $
-
-Recognize BSDish endian macros.
-
---- librhash/byte_order.h.orig	2017-08-14 00:56:22.000000000 +0000
-+++ librhash/byte_order.h
-@@ -10,6 +10,8 @@
- 
- #ifdef __GLIBC__
- # include <endian.h>
-+#elif defined(__NetBSD__) || defined(__FreeBSD__)
-+# include <sys/endian.h>
- #endif
- 
- #ifdef __cplusplus
-@@ -38,6 +40,7 @@ extern "C" {
- /* detect CPU endianness */
- #if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \
- 		__BYTE_ORDER == __LITTLE_ENDIAN) || \
-+	(defined(_BYTE_ORDER) && defined(_LITTLE_ENDIAN) && _BYTE_ORDER == _LITTLE_ENDIAN + 0) || \
- 	(defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
- 		__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) || \
- 	defined(CPU_IA32) || defined(CPU_X64) || \
-@@ -48,6 +51,7 @@ extern "C" {
- # define IS_LITTLE_ENDIAN 1
- #elif (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \
- 		__BYTE_ORDER == __BIG_ENDIAN) || \
-+	(defined(_BYTE_ORDER) && defined(_BIG_ENDIAN) && _BYTE_ORDER == _BIG_ENDIAN + 0) || \
- 	(defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && \
- 		__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) || \
- 	defined(__sparc) || defined(__sparc__) || defined(sparc) || \