Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1559914660185980"
MIME-Version: 1.0
Date: Fri, 7 Jun 2019 13:37:40 +0000
From: "Ryo ONODERA" <ryoon@netbsd.org>
Subject: CVS commit: pkgsrc/textproc/xapian
To: pkgsrc-changes@NetBSD.org
Reply-To: ryoon@netbsd.org
Message-Id: <20190607133740.1125FFBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	ryoon
Date:		Fri Jun  7 13:37:39 UTC 2019

Modified Files:
	pkgsrc/textproc/xapian: Makefile distinfo
Added Files:
	pkgsrc/textproc/xapian/patches: patch-xapian-config.in

Log Message:
Add rpath to an output of xapian-config --libs, bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/textproc/xapian/Makefile \
    pkgsrc/textproc/xapian/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/xapian/patches/patch-xapian-config.in

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


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

Modified files:

Index: pkgsrc/textproc/xapian/Makefile
diff -u pkgsrc/textproc/xapian/Makefile:1.34 pkgsrc/textproc/xapian/Makefile:1.35
--- pkgsrc/textproc/xapian/Makefile:1.34	Sun Aug 26 13:25:33 2018
+++ pkgsrc/textproc/xapian/Makefile	Fri Jun  7 13:37:39 2019
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.34 2018/08/26 13:25:33 schmonz Exp $
+# $NetBSD: Makefile,v 1.35 2019/06/07 13:37:39 ryoon Exp $
 
 .include "../../textproc/xapian/Makefile.common"
 
 DISTNAME=		xapian-core-${VERSION}
 PKGNAME=		${DISTNAME:S/-core-/-/}
+PKGREVISION=		1
 
 HOMEPAGE=		https://xapian.org/
 COMMENT=		Probabilistic Information Retrieval search engine
@@ -12,5 +13,11 @@ TEST_TARGET=		check
 
 LDFLAGS.SunOS+=		-lsocket -lnsl
 
+SUBST_CLASSES+=		rpath
+SUBST_STAGE.rpath=	pre-configure
+SUBST_MESSAGE.rpath=	Include rpath to xapian-config
+SUBST_FILES.rpath=	xapian-config.in
+SUBST_VARS.rpath=	COMPILER_RPATH_FLAG
+
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/xapian/distinfo
diff -u pkgsrc/textproc/xapian/distinfo:1.34 pkgsrc/textproc/xapian/distinfo:1.35
--- pkgsrc/textproc/xapian/distinfo:1.34	Mon Mar  4 01:38:00 2019
+++ pkgsrc/textproc/xapian/distinfo	Fri Jun  7 13:37:39 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.34 2019/03/04 01:38:00 schmonz Exp $
+$NetBSD: distinfo,v 1.35 2019/06/07 13:37:39 ryoon Exp $
 
 SHA1 (xapian-core-1.4.11.tar.xz) = c1e452e4dc59351a72214ae24cf2b7a6c10fc9ef
 RMD160 (xapian-core-1.4.11.tar.xz) = 8e14120ebb8ea4b09e1e71ea784051577bb8daa9
 SHA512 (xapian-core-1.4.11.tar.xz) = 72ab7b0c774390f38319d241689b2dc3c2837fbbf933616574f6ad167f14a25c2eff747910022065508dc7c44f806dc2b71dae80a1b4f1f47e1675fb951bc785
 Size (xapian-core-1.4.11.tar.xz) = 2975524 bytes
 SHA1 (patch-common_safesyssocket.h) = 032d441853914d510bc285bb682a98c4ee264d52
+SHA1 (patch-xapian-config.in) = 470d1de7f04b8b8817abbcf56b5b71a36948de97

Added files:

Index: pkgsrc/textproc/xapian/patches/patch-xapian-config.in
diff -u /dev/null pkgsrc/textproc/xapian/patches/patch-xapian-config.in:1.1
--- /dev/null	Fri Jun  7 13:37:40 2019
+++ pkgsrc/textproc/xapian/patches/patch-xapian-config.in	Fri Jun  7 13:37:39 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-xapian-config.in,v 1.1 2019/06/07 13:37:39 ryoon Exp $
+
+* Include rpath to --libs output
+
+--- xapian-config.in.orig	2019-03-02 01:45:31.000000000 +0000
++++ xapian-config.in
+@@ -105,7 +105,7 @@ set_F_to_extra_ldflags() {
+ # -L option required (if any).
+ set_L_to_library_path() {
+     L=
+-    [ /usr/lib != "@libdir@" ] && L="-L@libdir@ "
++    [ /usr/lib != "@libdir@" ] && L="-L@libdir@ @COMPILER_RPATH_FLAG@@libdir@ "
+ }
+ 
+ set_I() {


--_----------=_1559914660185980--