head 1.3; access; symbols pkgsrc-2019Q4:1.2.0.20 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.16 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.14 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.12 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.10 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.8 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.6 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.4 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.2 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.1.0.6 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.2 pkgsrc-2017Q2-base:1.1; locks; strict; comment @# @; 1.3 date 2020.02.26.16.20.43; author nia; state dead; branches; next 1.2; commitid wouByTnrGwlsCcYB; 1.2 date 2017.12.11.18.01.52; author minskim; state Exp; branches; next 1.1; commitid sjFh9LBwwu0n7viA; 1.1 date 2017.03.31.17.19.23; author fhajny; state Exp; branches; next ; commitid vJavFwXPquYO4JLz; desc @@ 1.3 log @re2: Update to 2020-01-01 Unknown changes, but we can delete a patch @ text @$NetBSD: patch-Makefile,v 1.2 2017/12/11 18:01:52 minskim Exp $ - Use the full path as the shared library's install_name on Darwin. - Avoid in-place sed for better portability. --- Makefile.orig 2016-12-13 11:22:01.000000000 +0000 +++ Makefile @@@@ -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) - $(INSTALL_DATA) re2.pc $(DESTDIR)$(libdir)/pkgconfig/re2.pc - $(SED_INPLACE) -e "s#@@prefix@@#${prefix}#" $(DESTDIR)$(libdir)/pkgconfig/re2.pc - $(SED_INPLACE) -e "s#@@exec_prefix@@#${exec_prefix}#" $(DESTDIR)$(libdir)/pkgconfig/re2.pc - $(SED_INPLACE) -e "s#@@includedir@@#${includedir}#" $(DESTDIR)$(libdir)/pkgconfig/re2.pc - $(SED_INPLACE) -e "s#@@libdir@@#${libdir}#" $(DESTDIR)$(libdir)/pkgconfig/re2.pc + sed \ + -e "s#@@prefix@@#${prefix}#" \ + -e "s#@@exec_prefix@@#${exec_prefix}#" \ + -e "s#@@includedir@@#${includedir}#" \ + -e "s#@@libdir@@#${libdir}#" \ + re2.pc > $(DESTDIR)$(libdir)/pkgconfig/re2.pc testinstall: static-testinstall shared-testinstall @@echo @ 1.2 log @devel/re2: Fix library install_name on Darwin Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-Makefile,v 1.1 2017/03/31 17:19:23 fhajny Exp $ @ 1.1 log @Update devel/re2 to 2017-03-01. No changelog released. Improve portability by avoiding in-place sed. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 1 Avoid in-place sed for better portability. d6 1 a6 1 --- Makefile.orig 2017-03-31 17:05:44.915188459 +0000 d8 10 a17 1 @@@@ -290,11 +290,12 @@@@ install: obj/libre2.a obj/so/libre2.$(SO @