CVS commit: pkgsrc/misc/rhash

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Mar 17 08:02:14 UTC 2018

Modified Files:
        pkgsrc/misc/rhash: Makefile PLIST buildlink3.mk distinfo
Removed Files:
        pkgsrc/misc/rhash/patches: patch-librhash_byte__order.h

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/rhash/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/rhash/PLIST \
    pkgsrc/misc/rhash/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/misc/rhash/distinfo
cvs rdiff -u -r1.5 -r0 pkgsrc/misc/rhash/patches/patch-librhash_byte__order.h

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

Modified files:

Index: pkgsrc/misc/rhash/Makefile
diff -u pkgsrc/misc/rhash/Makefile:1.6 pkgsrc/misc/rhash/Makefile:1.7
--- pkgsrc/misc/rhash/Makefile:1.6      Thu Nov 16 01:28:12 2017
+++ pkgsrc/misc/rhash/Makefile  Sat Mar 17 08:02:14 2018
@@ -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, SHA
 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"

Index: pkgsrc/misc/rhash/PLIST
diff -u pkgsrc/misc/rhash/PLIST:1.1 pkgsrc/misc/rhash/PLIST:1.2
--- pkgsrc/misc/rhash/PLIST:1.1 Fri Apr 18 21:21:30 2014
+++ pkgsrc/misc/rhash/PLIST     Sat Mar 17 08:02:14 2018
@@ -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
Index: pkgsrc/misc/rhash/buildlink3.mk
diff -u pkgsrc/misc/rhash/buildlink3.mk:1.1 pkgsrc/misc/rhash/buildlink3.mk:1.2
--- pkgsrc/misc/rhash/buildlink3.mk:1.1 Fri Apr 18 21:21:30 2014
+++ pkgsrc/misc/rhash/buildlink3.mk     Sat Mar 17 08:02:14 2018
@@ -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
 BUILDLINK_PKGSRCDIR.rhash?=    ../../misc/rhash
 
 BUILDLINK_DEPMETHOD.rhash?=    build
+
+.include "../../security/openssl/buildlink3.mk"
 .endif # RHASH_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -rhash

Index: pkgsrc/misc/rhash/distinfo
diff -u pkgsrc/misc/rhash/distinfo:1.9 pkgsrc/misc/rhash/distinfo:1.10
--- pkgsrc/misc/rhash/distinfo:1.9      Thu Nov 16 15:14:54 2017
+++ pkgsrc/misc/rhash/distinfo  Sat Mar 17 08:02:14 2018
@@ -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