CVS commit: pkgsrc/databases/mongodb

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Jun 27 01:02:22 UTC 2019

Modified Files:
        pkgsrc/databases/mongodb: Makefile

Log Message:
databases/mongodb: Use system icu

This package had been configured to use mongodb's bundled icu, but
something in the dependencies brought in icu anyway, and there were
type conflicts between pkgsrc and bundled.  Apparently whatever was
trouble in earlier mongodb has been fixed, as the build gets much
further with "system" (pkgsrc) icu.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/databases/mongodb/Makefile

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

Modified files:

Index: pkgsrc/databases/mongodb/Makefile
diff -u pkgsrc/databases/mongodb/Makefile:1.38 pkgsrc/databases/mongodb/Makefile:1.39
--- pkgsrc/databases/mongodb/Makefile:1.38      Thu Jun 27 00:58:54 2019
+++ pkgsrc/databases/mongodb/Makefile   Thu Jun 27 01:02:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2019/06/27 00:58:54 gdt Exp $
+# $NetBSD: Makefile,v 1.39 2019/06/27 01:02:22 gdt Exp $
 
 DISTNAME=      mongodb-src-r4.0.6
 PKGNAME=       ${DISTNAME:S/src-r//}
@@ -34,7 +34,7 @@ SCONS_ARGS+=  --release
 SCONS_ARGS+=   --runtime-hardening=off # does not produce executables
 #SCONS_ARGS+=  --use-system-asio
 SCONS_ARGS+=   --use-system-boost
-#SCONS_ARGS+=  --use-system-icu # fails with >57.1
+SCONS_ARGS+=   --use-system-icu
 SCONS_ARGS+=   --use-system-mongo-c
 SCONS_ARGS+=   --use-system-pcre
 SCONS_ARGS+=   --use-system-snappy
@@ -173,7 +173,7 @@ post-install:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../net/libpcap/buildlink3.mk"
-#.include "../../textproc/icu/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/yaml-cpp/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"