CVS commit: pkgsrc/textproc/xapian-omega

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Mar 10 13:21:05 UTC 2019

Modified Files:
        pkgsrc/textproc/xapian-omega: Makefile distinfo
Added Files:
        pkgsrc/textproc/xapian-omega/patches: patch-values.h

Log Message:
Avoid conflicting with system bswap32(). Use SUBST_VARS to mollify pkglint.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/textproc/xapian-omega/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/textproc/xapian-omega/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/xapian-omega/patches/patch-values.h

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

Modified files:

Index: pkgsrc/textproc/xapian-omega/Makefile
diff -u pkgsrc/textproc/xapian-omega/Makefile:1.39 pkgsrc/textproc/xapian-omega/Makefile:1.40
--- pkgsrc/textproc/xapian-omega/Makefile:1.39  Sun Aug 26 13:26:12 2018
+++ pkgsrc/textproc/xapian-omega/Makefile       Sun Mar 10 13:21:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2018/08/26 13:26:12 schmonz Exp $
+# $NetBSD: Makefile,v 1.40 2019/03/10 13:21:05 schmonz Exp $
 
 .include "../../textproc/xapian/Makefile.common"
 
@@ -17,7 +17,7 @@ REPLACE_PERL=         dbi2omega htdig2omega mbo
 SUBST_CLASSES+=                files
 SUBST_STAGE.files=     do-configure
 SUBST_FILES.files=     omega.conf
-SUBST_SED.files=       -e "s|@VARBASE@|${VARBASE}|g"
+SUBST_VARS.files=      VARBASE
 SUBST_MESSAGE.files=   Fixing configuration files.
 
 OWN_DIRS+=             ${VARBASE}/log/${PKGBASE}

Index: pkgsrc/textproc/xapian-omega/distinfo
diff -u pkgsrc/textproc/xapian-omega/distinfo:1.28 pkgsrc/textproc/xapian-omega/distinfo:1.29
--- pkgsrc/textproc/xapian-omega/distinfo:1.28  Mon Mar  4 01:38:10 2019
+++ pkgsrc/textproc/xapian-omega/distinfo       Sun Mar 10 13:21:05 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2019/03/04 01:38:10 schmonz Exp $
+$NetBSD: distinfo,v 1.29 2019/03/10 13:21:05 schmonz Exp $
 
 SHA1 (xapian-omega-1.4.11.tar.xz) = c85d6bbd53b92143d24ee80757bd38bda31ee926
 RMD160 (xapian-omega-1.4.11.tar.xz) = 9952b6b5c3825bba6abead3c82c54f436ec292a4
@@ -6,3 +6,4 @@ SHA512 (xapian-omega-1.4.11.tar.xz) = 13
 Size (xapian-omega-1.4.11.tar.xz) = 533596 bytes
 SHA1 (patch-Makefile.in) = eea809d9403820e86478d939a2dad4c67358ebf5
 SHA1 (patch-omega.conf) = f1e941dac326de7005cad0a5a4a2848e401855c4
+SHA1 (patch-values.h) = b3758856f5a34c47e4247d8076fbbdc1e65305e2

Added files:

Index: pkgsrc/textproc/xapian-omega/patches/patch-values.h
diff -u /dev/null pkgsrc/textproc/xapian-omega/patches/patch-values.h:1.1
--- /dev/null   Sun Mar 10 13:21:05 2019
+++ pkgsrc/textproc/xapian-omega/patches/patch-values.h Sun Mar 10 13:21:05 2019
@@ -0,0 +1,33 @@
+$NetBSD: patch-values.h,v 1.1 2019/03/10 13:21:05 schmonz Exp $
+
+Avoid conflicting with system bswap32().
+
+--- values.h.orig      2019-03-02 01:45:31.000000000 +0000
++++ values.h
+@@ -38,7 +38,7 @@ enum value_slot {
+ };
+ 
+ #ifndef WORDS_BIGENDIAN
+-inline std::uint32_t bswap32(std::uint32_t v) {
++inline std::uint32_t xapian_bswap32(std::uint32_t v) {
+ # if HAVE_DECL___BUILTIN_BSWAP32
+     return __builtin_bswap32(v);
+ # elif HAVE_DECL__BYTESWAP_ULONG
+@@ -55,7 +55,7 @@ inline std::uint32_t binary_string_to_in
+     std::uint32_t v;
+     std::memcpy(&v, s.data(), 4);
+ #ifndef WORDS_BIGENDIAN
+-    v = bswap32(v);
++    v = xapian_bswap32(v);
+ #endif
+     return v;
+ }
+@@ -63,7 +63,7 @@ inline std::uint32_t binary_string_to_in
+ inline std::string int_to_binary_string(std::uint32_t v)
+ {
+ #ifndef WORDS_BIGENDIAN
+-    v = bswap32(v);
++    v = xapian_bswap32(v);
+ #endif
+     return std::string(reinterpret_cast<const char*>(&v), 4);
+ }