Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_16332824512860"
MIME-Version: 1.0
Date: Sun, 3 Oct 2021 17:34:11 +0000
From: "Niclas Rosenvik" <nros@netbsd.org>
Subject: CVS commit: pkgsrc/misc/rhash
To: pkgsrc-changes@NetBSD.org
Reply-To: nros@netbsd.org
Message-Id: <20211003173411.DBBA7FA97@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	nros
Date:		Sun Oct  3 17:34:11 UTC 2021

Modified Files:
	pkgsrc/misc/rhash: Makefile PLIST buildlink3.mk

Log Message:
Fix dynamic linking with rhash

Make the rhash package install a .so file
not just .so.0 so that -lrhash use
dynamic linking not static linking.
Remove depmethod build since the package now
works with dynamic linking.
While here add pkgconfig override to pkgconfig
file.
Bump PKGREVISION due to PLIST change.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/misc/rhash/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/rhash/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/rhash/buildlink3.mk

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


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

Modified files:

Index: pkgsrc/misc/rhash/Makefile
diff -u pkgsrc/misc/rhash/Makefile:1.17 pkgsrc/misc/rhash/Makefile:1.18
--- pkgsrc/misc/rhash/Makefile:1.17	Sat Oct  2 20:54:57 2021
+++ pkgsrc/misc/rhash/Makefile	Sun Oct  3 17:34:11 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2021/10/02 20:54:57 jklos Exp $
+# $NetBSD: Makefile,v 1.18 2021/10/03 17:34:11 nros Exp $
 
 DISTNAME=	rhash-1.4.2
-PKGREVISION=    1
+PKGREVISION=    2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=rhash/}
 GITHUB_PROJECT=	RHash
@@ -24,10 +24,13 @@ CONFIGURE_ARGS+=	--extra-ldflags=-L${PRE
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-INSTALL_TARGET=		install install-pkg-config
+INSTALL_TARGET=		install install-pkg-config install-lib-so-link
 INSTALLATION_DIRS=	share/examples/rhash
 TEST_TARGET=		test
 
+PKGCONFIG_OVERRIDE=		dist/librhash.pc
+PKGCONFIG_OVERRIDE_STAGE=	post-configure
+
 CONF_FILES+=	${PREFIX}/share/examples/rhash/rhashrc ${PKG_SYSCONFDIR}/rhashrc
 
 post-install:

Index: pkgsrc/misc/rhash/PLIST
diff -u pkgsrc/misc/rhash/PLIST:1.2 pkgsrc/misc/rhash/PLIST:1.3
--- pkgsrc/misc/rhash/PLIST:1.2	Sat Mar 17 08:02:14 2018
+++ pkgsrc/misc/rhash/PLIST	Sun Oct  3 17:34:11 2021
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2018/03/17 08:02:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/10/03 17:34:11 nros Exp $
 bin/rhash
 include/rhash.h
 include/rhash_torrent.h
 lib/librhash.a
+lib/librhash.so
 lib/librhash.so.0
 lib/pkgconfig/librhash.pc
 man/man1/rhash.1

Index: pkgsrc/misc/rhash/buildlink3.mk
diff -u pkgsrc/misc/rhash/buildlink3.mk:1.3 pkgsrc/misc/rhash/buildlink3.mk:1.4
--- pkgsrc/misc/rhash/buildlink3.mk:1.3	Sat Jan 18 21:48:18 2020
+++ pkgsrc/misc/rhash/buildlink3.mk	Sun Oct  3 17:34:11 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2020/01/18 21:48:18 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2021/10/03 17:34:11 nros Exp $
 
 BUILDLINK_TREE+=	rhash
 
@@ -9,8 +9,6 @@ BUILDLINK_API_DEPENDS.rhash+=	rhash>=1.3
 BUILDLINK_ABI_DEPENDS.rhash?=	rhash>=1.3.9nb1
 BUILDLINK_PKGSRCDIR.rhash?=	../../misc/rhash
 
-BUILDLINK_DEPMETHOD.rhash?=	build
-
 .include "../../security/openssl/buildlink3.mk"
 .endif	# RHASH_BUILDLINK3_MK
 

--_----------=_16332824512860--