CVS commit: pkgsrc/devel/re2

["Min Sik Kim" <minskim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   minskim
Date:           Mon Dec 11 18:01:52 UTC 2017

Modified Files:
        pkgsrc/devel/re2: Makefile distinfo
        pkgsrc/devel/re2/patches: patch-Makefile

Log Message:
devel/re2: Fix library install_name on Darwin

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/re2/Makefile pkgsrc/devel/re2/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/re2/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/devel/re2/Makefile
diff -u pkgsrc/devel/re2/Makefile:1.4 pkgsrc/devel/re2/Makefile:1.5
--- pkgsrc/devel/re2/Makefile:1.4       Fri Mar 31 17:19:23 2017
+++ pkgsrc/devel/re2/Makefile   Mon Dec 11 18:01:51 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2017/03/31 17:19:23 fhajny Exp $
+# $NetBSD: Makefile,v 1.5 2017/12/11 18:01:51 minskim Exp $
 
 DISTNAME=      re2-20170301
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=google/}
 GITHUB_TAG=    2017-01-01
Index: pkgsrc/devel/re2/distinfo
diff -u pkgsrc/devel/re2/distinfo:1.4 pkgsrc/devel/re2/distinfo:1.5
--- pkgsrc/devel/re2/distinfo:1.4       Fri Mar 31 17:19:23 2017
+++ pkgsrc/devel/re2/distinfo   Mon Dec 11 18:01:51 2017
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2017/03/31 17:19:23 fhajny Exp $
+$NetBSD: distinfo,v 1.5 2017/12/11 18:01:51 minskim Exp $
 
 SHA1 (re2-20170301.tar.gz) = b2b8c60bfd2d413081771c5ee0efec6ff063f381
 RMD160 (re2-20170301.tar.gz) = 3a9903ca2b10e5b2020808954d026240d2f0f2cc
 SHA512 (re2-20170301.tar.gz) = 52ec99fe1bfb2754e11e3767a561208f14c3e5c03142c37b43df7cf5a406896396854a3776ae536ddf293a770d8ca80f9c761c2c476394693a5954c15550a731
 Size (re2-20170301.tar.gz) = 379866 bytes
-SHA1 (patch-Makefile) = 874a72ed6365e4724eb28c9f677d8441cec3d831
+SHA1 (patch-Makefile) = cd7754d4591bbf45358396ccc83d107a2249e82c

Index: pkgsrc/devel/re2/patches/patch-Makefile
diff -u pkgsrc/devel/re2/patches/patch-Makefile:1.1 pkgsrc/devel/re2/patches/patch-Makefile:1.2
--- pkgsrc/devel/re2/patches/patch-Makefile:1.1 Fri Mar 31 17:19:23 2017
+++ pkgsrc/devel/re2/patches/patch-Makefile     Mon Dec 11 18:01:52 2017
@@ -1,10 +1,20 @@
-$NetBSD: patch-Makefile,v 1.1 2017/03/31 17:19:23 fhajny Exp $
+$NetBSD: patch-Makefile,v 1.2 2017/12/11 18:01:52 minskim Exp $
 
-Avoid in-place sed for better portability.
+- Use the full path as the shared library's install_name on Darwin.
+- Avoid in-place sed for better portability.
 
---- Makefile.orig      2017-03-31 17:05:44.915188459 +0000
+--- Makefile.orig      2016-12-13 11:22:01.000000000 +0000
 +++ Makefile
-@@ -290,11 +290,12 @@ install: obj/libre2.a obj/so/libre2.$(SO
+@@ -55,7 +55,7 @@ ifeq ($(shell uname),Darwin)
+ SOEXT=dylib
+ SOEXTVER=$(SONAME).$(SOEXT)
+ SOEXTVER00=$(SONAME).0.0.$(SOEXT)
+-MAKE_SHARED_LIBRARY=$(CXX) -dynamiclib -Wl,-install_name,@rpath/libre2.$(SOEXTVER),-exported_symbols_list,libre2.symbols.darwin $(RE2_LDFLAGS) $(LDFLAGS)
++MAKE_SHARED_LIBRARY=$(CXX) -dynamiclib -Wl,-install_name,$(libdir)/libre2.$(SOEXTVER),-exported_symbols_list,libre2.symbols.darwin $(RE2_LDFLAGS) $(LDFLAGS)
+ else ifeq ($(shell uname),SunOS)
+ SOEXT=so
+ SOEXTVER=$(SOEXT).$(SONAME)
+@@ -283,11 +283,12 @@ install: obj/libre2.a obj/so/libre2.$(SO
        $(INSTALL) obj/so/libre2.$(SOEXT) $(DESTDIR)$(libdir)/libre2.$(SOEXTVER00)
        ln -sf libre2.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2.$(SOEXTVER)
        ln -sf libre2.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2.$(SOEXT)