Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases/tokyotyrant tokyotyrant: fix unportable test...
details: https://anonhg.NetBSD.org/pkgsrc/rev/03a8d3e3dcfe
branches: trunk
changeset: 437146:03a8d3e3dcfe
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon Aug 17 20:14:55 2020 +0000
description:
tokyotyrant: fix unportable test(1) operator.
diffstat:
databases/tokyotyrant/distinfo | 4 ++--
databases/tokyotyrant/patches/patch-aa | 24 ++++++++++++++++++++++--
2 files changed, 24 insertions(+), 4 deletions(-)
diffs (54 lines):
diff -r 58a83d843b70 -r 03a8d3e3dcfe databases/tokyotyrant/distinfo
--- a/databases/tokyotyrant/distinfo Mon Aug 17 17:44:25 2020 +0000
+++ b/databases/tokyotyrant/distinfo Mon Aug 17 20:14:55 2020 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.28 2015/11/03 01:56:36 agc Exp $
+$NetBSD: distinfo,v 1.29 2020/08/17 20:14:55 wiz Exp $
SHA1 (tokyotyrant-1.1.41.tar.gz) = 060ac946a9ac902c1d244ffafd444f0e5840c0ce
RMD160 (tokyotyrant-1.1.41.tar.gz) = 679122c30104213991c640e4c9d4d0203308190a
SHA512 (tokyotyrant-1.1.41.tar.gz) = fb181ecab19981733b4b478614f9b28d7f1f776bafe6c58c4bc3e26ed294301a6242d7cd1d47b7d6b55a93305474d2e8e0a75f2f01af21a8bc93d158c8f8179e
Size (tokyotyrant-1.1.41.tar.gz) = 196196 bytes
-SHA1 (patch-aa) = d1c6aa7e3197b33a1988320ca5ad865ae3fa23c4
+SHA1 (patch-aa) = 6f4657a2dcb62a789322233a4ae0941d2dfefdba
SHA1 (patch-ab) = c263651729d1b8ce4fccb877869cc577577b260e
SHA1 (patch-ac) = fc87f88b82b8c49f340eb6707f4c2f8382eb2a7b
SHA1 (patch-scrext.c) = 62b71b62d612014316bca22fe97fc16b85f7ca05
diff -r 58a83d843b70 -r 03a8d3e3dcfe databases/tokyotyrant/patches/patch-aa
--- a/databases/tokyotyrant/patches/patch-aa Mon Aug 17 17:44:25 2020 +0000
+++ b/databases/tokyotyrant/patches/patch-aa Mon Aug 17 20:14:55 2020 +0000
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2009/02/19 06:31:55 obache Exp $
+$NetBSD: patch-aa,v 1.4 2020/08/17 20:14:55 wiz Exp $
Honor CFLAGS and LDFLAGS passwed to configure script.
---- Makefile.in.orig 2009-02-16 08:35:25.000000000 +0000
+Avoid unportable test(1) operator.
+
+--- Makefile.in.orig 2010-02-01 16:40:38.000000000 +0000
+++ Makefile.in
@@ -54,8 +54,8 @@ CPPFLAGS = @MYCPPFLAGS@ \
-D_TT_PREFIX="\"$(prefix)\"" -D_TT_INCLUDEDIR="\"$(INCLUDEDIR)\"" \
@@ -15,3 +17,21 @@
CMDLDFLAGS = @MYCMDLDFLAGS@
LIBS = @LIBS@
LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
+@@ -132,7 +132,7 @@ install :
+ cd man && cp -Rf $(MAN8FILES) $(DESTDIR)$(MAN8DIR)
+ mkdir -p $(DESTDIR)$(PCDIR)
+ cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR)
+- [ "$$UID" == 0 ] && ldconfig || true
++ [ "$$UID" = 0 ] && ldconfig || true
+ @printf '\n'
+ @printf '#================================================================\n'
+ @printf '# Thanks for using Tokyo Tyrant.\n'
+@@ -154,7 +154,7 @@ uninstall :
+ cd $(DESTDIR)$(MAN8DIR) && rm -f $(MAN8FILES)
+ rm -rf $(DESTDIR)$(DATADIR)
+ cd $(DESTDIR)$(PCDIR) && rm -f $(PCFILES)
+- [ "$$UID" == 0 ] && ldconfig || true
++ [ "$$UID" = 0 ] && ldconfig || true
+
+
+ dist :
Home |
Main Index |
Thread Index |
Old Index