Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 19 Apr 2019 07:34:44 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r499327 - in head/databases: . mongodb40-tools mongodb40-tools/files
Message-ID:  <201904190734.x3J7YiFw012916@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Fri Apr 19 07:34:43 2019
New Revision: 499327
URL: https://svnweb.freebsd.org/changeset/ports/499327

Log:
  New port: databases/mongodb40-tools
  
  Useful utilities for managing a MongoDB instance written in Go.
  
  - bsondump - display BSON files in a human-readable format
  - mongoimport - Convert data from JSON, TSV or CSV and insert them
    into a collection
  - mongoexport - Write an existing collection to CSV or JSON format
  - mongodump/mongorestore - Dump MongoDB backups to disk in .BSON
    format, or restore them to a live database
  - mongostat - Monitor live MongoDB servers, replica sets, or sharded
    clusters
  - mongofiles - Read, write, delete, or update files in GridFS
  - mongotop - Monitor read/write activity on a mongo server
  - mongoreplay - Capture, observe, and replay traffic for MongoDB
  
  WWW: https://github.com/mongodb/mongo-tools
  
  PR:		237352
  Submitted by:	Andrew Shevchuk <dev.ashevchuk@gmail.com> (based on)

Added:
  head/databases/mongodb40-tools/
     - copied from r499274, head/databases/mongodb36-tools/
  head/databases/mongodb40-tools/files/patch-common_util_file.go   (contents, props changed)
  head/databases/mongodb40-tools/files/patch-vendor_github.com_10gen_openssl_build.go
     - copied, changed from r499274, head/databases/mongodb36-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go
  head/databases/mongodb40-tools/files/patch-vendor_github.com_10gen_openssl_init__posix.go
     - copied, changed from r499274, head/databases/mongodb36-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_init__posix.go
Deleted:
  head/databases/mongodb40-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go
  head/databases/mongodb40-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_init__posix.go
Modified:
  head/databases/Makefile
  head/databases/mongodb40-tools/Makefile
  head/databases/mongodb40-tools/distinfo
  head/databases/mongodb40-tools/pkg-descr
  head/databases/mongodb40-tools/pkg-plist

Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile	Fri Apr 19 07:33:00 2019	(r499326)
+++ head/databases/Makefile	Fri Apr 19 07:34:43 2019	(r499327)
@@ -201,6 +201,7 @@
     SUBDIR += mongodb36
     SUBDIR += mongodb36-tools
     SUBDIR += mongodb40
+    SUBDIR += mongodb40-tools
     SUBDIR += mroonga
     SUBDIR += mrtg-mysql-load
     SUBDIR += mtools-mongodb

Modified: head/databases/mongodb40-tools/Makefile
==============================================================================
--- head/databases/mongodb36-tools/Makefile	Thu Apr 18 15:23:23 2019	(r499274)
+++ head/databases/mongodb40-tools/Makefile	Fri Apr 19 07:34:43 2019	(r499327)
@@ -1,76 +1,76 @@
 # $FreeBSD$
 
-PORTNAME=	mongodb36-tools
-PORTVERSION=	3.6.3
+PORTNAME=	mongodb40-tools
 DISTVERSIONPREFIX=	r
-CATEGORIES=	databases net
+DISTVERSION=	4.0.8
+CATEGORIES=	databases
 
-MAINTAINER=	numisemis@yahoo.com
+MAINTAINER=	dev.ashevchuk@gmail.com
 COMMENT=	Tools for MongoDB
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 ONLY_FOR_ARCHS=	amd64 i386
-ONLY_FOR_ARCHS_REASON=	"not yet ported to anything other than i386 and amd64"
-BROKEN_SSL=	openssl111 libressl libressl-devel
-BROKEN_SSL_REASON_openssl111=	variable has incomplete type 'BIO_METHOD' (aka 'struct bio_method_st')
-BROKEN_SSL_REASON_libressl=		could not determine kind of name for C.EVP_sha
-BROKEN_SSL_REASON_libressl-devel=	${BROKEN_SSL_REASON_libressl}
+ONLY_FOR_ARCHS_REASON=	not yet ported to other architectures
 
-BUILD_DEPENDS=	go>0:lang/go
-
-CONFLICTS_INSTALL=	mongodb mongodb[32-34]-tools
-
-USES=	localbase
-
+USES=		compiler:c++14-lang go localbase
 USE_GITHUB=	yes
 GH_ACCOUNT=	mongodb
 GH_PROJECT=	mongo-tools
 
-OPTIONS_DEFINE=	DOCS SSL SASL
-OPTIONS_DEFAULT=	SSL SASL
+GO_BUILDFLAGS=	-tags "${USE_MY_TAGS}"
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
+GO_TARGET=	${TOOL_BUILD:C,(.*),github.com/${GH_ACCOUNT}/${GH_PROJECT}/\1/\1,}
 
-SASL_USE=	my_tags=sasl
-SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
+CONFLICTS_INSTALL=	mongodb3[46] mongodb3[46]-tools
 
-SSL_USES=	ssl
-SSL_USE=	my_tags=ssl
+OPTIONS_DEFINE=		DOCS
+OPTIONS_DEFAULT=	MONGODUMP MONGOEXPORT MONGOFILES MONGOIMPORT \
+			MONGORESTORE SASL SSL
+OPTIONS_MULTI=		SECURITY TOOLS
+OPTIONS_MULTI_TOOLS=	BSONDUMP MONGODUMP MONGOEXPORT MONGOFILES MONGOIMPORT \
+			MONGOREPLAY MONGORESTORE MONGOSTAT MONGOTOP
+OPTIONS_MULTI_SECURITY=	SASL SSL
+OPTIONS_SUB=		yes
 
-# Go is not our friend. Without below, ignores user-supplied flags.
-MAKE_CMD=	${LOCALBASE}/bin/go build
-MAKE_ENV=	GOPATH="${WRKSRC}/.gopath:${WRKSRC}/vendor" \
-		CGO_CFLAGS="${CFLAGS}" CGO_CPPFLAGS="${CPPFLAGS}" \
-		CGO_CXXFLAGS="${CXXFLAGS}" CGO_LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+BSONDUMP_DESC=		BSON files into human-readable formats
+MONGOSTAT_DESC=		Status of a running mongod or mongos instance
+MONGOFILES_DESC=	Interface to GridFS in a MongoDB instance
+MONGOEXPORT_DESC=	JSON or CSV export of MongoDB instance data
+MONGOIMPORT_DESC=	Importing JSON, CSV, or TSV into a MongoDB instance
+MONGORESTORE_DESC=	BSON data to a MongoDB instance
+MONGODUMP_DESC=		BSON data from the contents of a MongoDB instance
+MONGOTOP_DESC=		Track the amount of data I/O time
+MONGOREPLAY_DESC=	Traffic capture and replay tool
 
-MY_TAGS=	-tags "${USE_MY_TAGS}"
+BSONDUMP_VARS=		tool_build+=bsondump
+MONGOSTAT_VARS=		tool_build+=mongostat
+MONGOFILES_VARS=	tool_build+=mongofiles
+MONGOEXPORT_VARS=	tool_build+=mongoexport
+MONGOIMPORT_VARS=	tool_build+=mongoimport
+MONGORESTORE_VARS=	tool_build+=mongorestore
+MONGODUMP_VARS=		tool_build+=mongodump
+MONGOTOP_VARS=		tool_build+=mongotop
+MONGOREPLAY_VARS=	tool_build+=mongoreplay
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
+SASL_USE=		my_tags=sasl
+SSL_USES=		ssl
+SSL_USE=		my_tags=ssl
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ${SSL_DEFAULT} == base
-BROKEN_FreeBSD_12=	variable has incomplete type 'BIO_METHOD' (aka 'struct bio_method_st')
-BROKEN_FreeBSD_13=	variable has incomplete type 'BIO_METHOD' (aka 'struct bio_method_st')
-.endif
-
+# Rename 'main' directories to the tool names so that the binaries
+# are not all named 'main' and we do not have to hack around USES=go.
 post-patch:
-	@cd ${WRKSRC} ; ${MKDIR} ${WRKSRC}/.gopath/src/github.com/${GH_ACCOUNT} ; \
-		${LN} -sf ${WRKSRC} ${WRKSRC}/.gopath/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
-
-do-build:
-.for x in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop
-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
-		-o ${WRKSRC}/bin/${x} ${MY_TAGS}\
-		-ldflags "-X github.com/${GH_ACCOUNT}/${GH_PROJECT}/common/options.Gitspec=${GH_TAGNAME}"\
-		${WRKSRC}/${x}/main/${x}.go
+.for tool in ${TOOL_BUILD}
+	@${MV} ${WRKSRC}/${tool}/main ${WRKSRC}/${tool}/${tool}
 .endfor
 
-do-install:
-.for x in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${x} ${STAGEDIR}${PREFIX}/bin/
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for doc in README.md CONTRIBUTING.md THIRD-PARTY-NOTICES
+	${INSTALL_MAN} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for x in LICENSE.md README.md THIRD-PARTY-NOTICES
-	${INSTALL_MAN} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR}
-.endfor
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/databases/mongodb40-tools/distinfo
==============================================================================
--- head/databases/mongodb36-tools/distinfo	Thu Apr 18 15:23:23 2019	(r499274)
+++ head/databases/mongodb40-tools/distinfo	Fri Apr 19 07:34:43 2019	(r499327)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522662593
-SHA256 (mongodb-mongo-tools-r3.6.3_GH0.tar.gz) = d97461a21227a3563e3e362dfda330becff48a901ecb3309241f607c7c8900af
-SIZE (mongodb-mongo-tools-r3.6.3_GH0.tar.gz) = 4693833
+TIMESTAMP = 1555539033
+SHA256 (mongodb-mongo-tools-r4.0.8_GH0.tar.gz) = c224df31f85476c0f651c4b5d70871b581f14bf16a8595a4aa7717e66ad07c5c
+SIZE (mongodb-mongo-tools-r4.0.8_GH0.tar.gz) = 11134459

Added: head/databases/mongodb40-tools/files/patch-common_util_file.go
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mongodb40-tools/files/patch-common_util_file.go	Fri Apr 19 07:34:43 2019	(r499327)
@@ -0,0 +1,325 @@
+--- common/util/file.go.orig  2018-11-21 17:52:58 UTC
++++ common/util/file.go
+@@ -9,11 +9,68 @@
+ import (
+ 	"bufio"
+ 	"io"
+-	"net/url"
+ 	"os"
+ 	"path/filepath"
++	"strconv"
+ )
+ 
++// Error reports an error and the operation and URL that caused it.
++type Error struct {
++	Op  string
++	URL string
++	Err error
++}
++
++func (e *Error) Error() string { return e.Op + " " + e.URL + ": " + e.Err.Error() }
++
++func ishex(c byte) bool {
++	switch {
++	case '0' <= c && c <= '9':
++		return true
++	case 'a' <= c && c <= 'f':
++		return true
++	case 'A' <= c && c <= 'F':
++		return true
++	}
++	return false
++}
++
++func unhex(c byte) byte {
++	switch {
++	case '0' <= c && c <= '9':
++		return c - '0'
++	case 'a' <= c && c <= 'f':
++		return c - 'a' + 10
++	case 'A' <= c && c <= 'F':
++		return c - 'A' + 10
++	}
++	return 0
++}
++
++type encoding int
++
++const (
++	encodePath encoding = 1 + iota
++	encodePathSegment
++	encodeHost
++	encodeZone
++	encodeUserPassword
++	encodeQueryComponent
++	encodeFragment
++)
++
++type EscapeError string
++
++func (e EscapeError) Error() string {
++	return "invalid URL escape " + strconv.Quote(string(e))
++}
++
++type InvalidHostError string
++
++func (e InvalidHostError) Error() string {
++	return "invalid character " + strconv.Quote(string(e)) + " in host name"
++}
++
+ // GetFieldsFromFile fetches the first line from the contents of the file
+ // at "path"
+ func GetFieldsFromFile(path string) ([]string, error) {
+@@ -42,11 +99,11 @@
+ }
+ 
+ func EscapeCollectionName(collName string) string {
+-	return url.PathEscape(collName)
++	return PathEscape(collName)
+ }
+ 
+ func UnescapeCollectionName(escapedCollName string) (string, error) {
+-	return url.PathUnescape(escapedCollName)
++	return PathUnescape(escapedCollName)
+ }
+ 
+ type WrappedReadCloser struct {
+@@ -76,3 +133,238 @@
+ 	}
+ 	return innerErr
+ }
++
++// Return true if the specified character should be escaped when
++// appearing in a URL string, according to RFC 3986.
++//
++// Please be informed that for now shouldEscape does not check all
++// reserved characters correctly. See golang.org/issue/5684.
++func shouldEscape(c byte, mode encoding) bool {
++	// §2.3 Unreserved characters (alphanum)
++	if 'A' <= c && c <= 'Z' || 'a' <= c && c <= 'z' || '0' <= c && c <= '9' {
++		return false
++	}
++
++	if mode == encodeHost || mode == encodeZone {
++		// §3.2.2 Host allows
++		//	sub-delims = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
++		// as part of reg-name.
++		// We add : because we include :port as part of host.
++		// We add [ ] because we include [ipv6]:port as part of host.
++		// We add < > because they're the only characters left that
++		// we could possibly allow, and Parse will reject them if we
++		// escape them (because hosts can't use %-encoding for
++		// ASCII bytes).
++		switch c {
++		case '!', '$', '&', '\'', '(', ')', '*', '+', ',', ';', '=', ':', '[', ']', '<', '>', '"':
++			return false
++		}
++	}
++
++	switch c {
++	case '-', '_', '.', '~': // §2.3 Unreserved characters (mark)
++		return false
++
++	case '$', '&', '+', ',', '/', ':', ';', '=', '?', '@': // §2.2 Reserved characters (reserved)
++		// Different sections of the URL allow a few of
++		// the reserved characters to appear unescaped.
++		switch mode {
++		case encodePath: // §3.3
++			// The RFC allows : @ & = + $ but saves / ; , for assigning
++			// meaning to individual path segments. This package
++			// only manipulates the path as a whole, so we allow those
++			// last three as well. That leaves only ? to escape.
++			return c == '?'
++
++		case encodePathSegment: // §3.3
++			// The RFC allows : @ & = + $ but saves / ; , for assigning
++			// meaning to individual path segments.
++			return c == '/' || c == ';' || c == ',' || c == '?'
++
++		case encodeUserPassword: // §3.2.1
++			// The RFC allows ';', ':', '&', '=', '+', '$', and ',' in
++			// userinfo, so we must escape only '@', '/', and '?'.
++			// The parsing of userinfo treats ':' as special so we must escape
++			// that too.
++			return c == '@' || c == '/' || c == '?' || c == ':'
++
++		case encodeQueryComponent: // §3.4
++			// The RFC reserves (so we must escape) everything.
++			return true
++
++		case encodeFragment: // §4.1
++			// The RFC text is silent but the grammar allows
++			// everything, so escape nothing.
++			return false
++		}
++	}
++
++	if mode == encodeFragment {
++		// RFC 3986 §2.2 allows not escaping sub-delims. A subset of sub-delims are
++		// included in reserved from RFC 2396 §2.2. The remaining sub-delims do not
++		// need to be escaped. To minimize potential breakage, we apply two restrictions:
++		// (1) we always escape sub-delims outside of the fragment, and (2) we always
++		// escape single quote to avoid breaking callers that had previously assumed that
++		// single quotes would be escaped. See issue #19917.
++		switch c {
++		case '!', '(', ')', '*':
++			return false
++		}
++	}
++
++	// Everything else must be escaped.
++	return true
++}
++
++// PathUnescape does the inverse transformation of PathEscape,
++// converting each 3-byte encoded substring of the form "%AB" into the
++// hex-decoded byte 0xAB. It returns an error if any % is not followed
++// by two hexadecimal digits.
++//
++// PathUnescape is identical to QueryUnescape except that it does not
++// unescape '+' to ' ' (space).
++func PathUnescape(s string) (string, error) {
++	return unescape(s, encodePathSegment)
++}
++
++// unescape unescapes a string; the mode specifies
++// which section of the URL string is being unescaped.
++func unescape(s string, mode encoding) (string, error) {
++	// Count %, check that they're well-formed.
++	n := 0
++	hasPlus := false
++	for i := 0; i < len(s); {
++		switch s[i] {
++		case '%':
++			n++
++			if i+2 >= len(s) || !ishex(s[i+1]) || !ishex(s[i+2]) {
++				s = s[i:]
++				if len(s) > 3 {
++					s = s[:3]
++				}
++				return "", EscapeError(s)
++			}
++			// Per https://tools.ietf.org/html/rfc3986#page-21
++			// in the host component %-encoding can only be used
++			// for non-ASCII bytes.
++			// But https://tools.ietf.org/html/rfc6874#section-2
++			// introduces %25 being allowed to escape a percent sign
++			// in IPv6 scoped-address literals. Yay.
++			if mode == encodeHost && unhex(s[i+1]) < 8 && s[i:i+3] != "%25" {
++				return "", EscapeError(s[i : i+3])
++			}
++			if mode == encodeZone {
++				// RFC 6874 says basically "anything goes" for zone identifiers
++				// and that even non-ASCII can be redundantly escaped,
++				// but it seems prudent to restrict %-escaped bytes here to those
++				// that are valid host name bytes in their unescaped form.
++				// That is, you can use escaping in the zone identifier but not
++				// to introduce bytes you couldn't just write directly.
++				// But Windows puts spaces here! Yay.
++				v := unhex(s[i+1])<<4 | unhex(s[i+2])
++				if s[i:i+3] != "%25" && v != ' ' && shouldEscape(v, encodeHost) {
++					return "", EscapeError(s[i : i+3])
++				}
++			}
++			i += 3
++		case '+':
++			hasPlus = mode == encodeQueryComponent
++			i++
++		default:
++			if (mode == encodeHost || mode == encodeZone) && s[i] < 0x80 && shouldEscape(s[i], mode) {
++				return "", InvalidHostError(s[i : i+1])
++			}
++			i++
++		}
++	}
++
++	if n == 0 && !hasPlus {
++		return s, nil
++	}
++
++	t := make([]byte, len(s)-2*n)
++	j := 0
++	for i := 0; i < len(s); {
++		switch s[i] {
++		case '%':
++			t[j] = unhex(s[i+1])<<4 | unhex(s[i+2])
++			j++
++			i += 3
++		case '+':
++			if mode == encodeQueryComponent {
++				t[j] = ' '
++			} else {
++				t[j] = '+'
++			}
++			j++
++			i++
++		default:
++			t[j] = s[i]
++			j++
++			i++
++		}
++	}
++	return string(t), nil
++}
++
++// PathEscape escapes the string so it can be safely placed
++// inside a URL path segment.
++func PathEscape(s string) string {
++	return escape(s, encodePathSegment)
++}
++
++func escape(s string, mode encoding) string {
++	spaceCount, hexCount := 0, 0
++	for i := 0; i < len(s); i++ {
++		c := s[i]
++		if shouldEscape(c, mode) {
++			if c == ' ' && mode == encodeQueryComponent {
++				spaceCount++
++			} else {
++				hexCount++
++			}
++		}
++	}
++
++	if spaceCount == 0 && hexCount == 0 {
++		return s
++	}
++
++	var buf [64]byte
++	var t []byte
++
++	required := len(s) + 2*hexCount
++	if required <= len(buf) {
++		t = buf[:required]
++	} else {
++		t = make([]byte, required)
++	}
++
++	if hexCount == 0 {
++		copy(t, s)
++		for i := 0; i < len(s); i++ {
++			if s[i] == ' ' {
++				t[i] = '+'
++			}
++		}
++		return string(t)
++	}
++
++	j := 0
++	for i := 0; i < len(s); i++ {
++		switch c := s[i]; {
++		case c == ' ' && mode == encodeQueryComponent:
++			t[j] = '+'
++			j++
++		case shouldEscape(c, mode):
++			t[j] = '%'
++			t[j+1] = "0123456789ABCDEF"[c>>4]
++			t[j+2] = "0123456789ABCDEF"[c&15]
++			j += 3
++		default:
++			t[j] = s[i]
++			j++
++		}
++	}
++	return string(t)
++}

Copied and modified: head/databases/mongodb40-tools/files/patch-vendor_github.com_10gen_openssl_build.go (from r499274, head/databases/mongodb36-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go)
==============================================================================
--- head/databases/mongodb36-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go	Thu Apr 18 15:23:23 2019	(r499274, copy source)
+++ head/databases/mongodb40-tools/files/patch-vendor_github.com_10gen_openssl_build.go	Fri Apr 19 07:34:43 2019	(r499327)
@@ -1,10 +1,9 @@
---- vendor/src/github.com/spacemonkeygo/openssl/build.go.orig	2017-07-31 19:00:22 UTC
-+++ vendor/src/github.com/spacemonkeygo/openssl/build.go
-@@ -19,6 +19,7 @@ package openssl
- // #cgo linux pkg-config: openssl
- // #cgo windows CFLAGS: -DWIN32_LEAN_AND_MEAN
- // #cgo windows LDFLAGS: -lcrypt32
+--- vendor/github.com/10gen/openssl/build.go.orig	2018-11-21 19:00:22 UTC
++++ vendor/github.com/10gen/openssl/build.go
+@@ -20,5 +20,6 @@
+ // #cgo CFLAGS: -Wno-deprecated-declarations
+ // #cgo windows CFLAGS: -DWIN32_LEAN_AND_MEAN -I"c:/openssl/include"
+ // #cgo windows LDFLAGS: -lssleay32 -llibeay32 -lcrypt32 -L "c:/openssl/bin"
 +// #cgo freebsd LDFLAGS: -lssl -lcrypto
- // #cgo darwin CFLAGS: -Wno-deprecated-declarations
- // #cgo darwin LDFLAGS: -lssl -lcrypto -framework CoreFoundation -framework Foundation -framework Security
+ // #cgo darwin LDFLAGS: -framework CoreFoundation -framework Foundation -framework Security
  import "C"

Copied and modified: head/databases/mongodb40-tools/files/patch-vendor_github.com_10gen_openssl_init__posix.go (from r499274, head/databases/mongodb36-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_init__posix.go)
==============================================================================
--- head/databases/mongodb36-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_init__posix.go	Thu Apr 18 15:23:23 2019	(r499274, copy source)
+++ head/databases/mongodb40-tools/files/patch-vendor_github.com_10gen_openssl_init__posix.go	Fri Apr 19 07:34:43 2019	(r499327)
@@ -1,5 +1,5 @@
---- vendor/src/github.com/spacemonkeygo/openssl/init_posix.go.orig	2016-01-03 17:52:58 UTC
-+++ vendor/src/github.com/spacemonkeygo/openssl/init_posix.go
+--- vendor/github.com/10gen/openssl/init_posix.go.orig	2018-11-21 17:52:58 UTC
++++ vendor/github.com/10gen/openssl/init_posix.go
 @@ -12,7 +12,7 @@
  // See the License for the specific language governing permissions and
  // limitations under the License.

Modified: head/databases/mongodb40-tools/pkg-descr
==============================================================================
--- head/databases/mongodb36-tools/pkg-descr	Thu Apr 18 15:23:23 2019	(r499274)
+++ head/databases/mongodb40-tools/pkg-descr	Fri Apr 19 07:34:43 2019	(r499327)
@@ -1,6 +1,15 @@
-Since MongoDB 3.2, the tools bsondump, mongoimport, mongoexport, mongodump,
-mongorestore, mongostat, mongofiles and mongotop have been placed
-in a separate package and rewritten in Go. These are useful utilities for
-managing a MongoDB instance.
+Useful utilities for managing a MongoDB instance written in Go.
+
+- bsondump - display BSON files in a human-readable format
+- mongoimport - Convert data from JSON, TSV or CSV and insert them
+  into a collection
+- mongoexport - Write an existing collection to CSV or JSON format
+- mongodump/mongorestore - Dump MongoDB backups to disk in .BSON
+  format, or restore them to a live database
+- mongostat - Monitor live MongoDB servers, replica sets, or sharded
+  clusters
+- mongofiles - Read, write, delete, or update files in GridFS
+- mongotop - Monitor read/write activity on a mongo server
+- mongoreplay - Capture, observe, and replay traffic for MongoDB
 
 WWW: https://github.com/mongodb/mongo-tools

Modified: head/databases/mongodb40-tools/pkg-plist
==============================================================================
--- head/databases/mongodb36-tools/pkg-plist	Thu Apr 18 15:23:23 2019	(r499274)
+++ head/databases/mongodb40-tools/pkg-plist	Fri Apr 19 07:34:43 2019	(r499327)
@@ -1,11 +1,12 @@
-bin/bsondump
-bin/mongodump
-bin/mongoexport
-bin/mongofiles
-bin/mongoimport
-bin/mongorestore
-bin/mongostat
-bin/mongotop
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
+%%BSONDUMP%%bin/bsondump
+%%MONGODUMP%%bin/mongodump
+%%MONGOEXPORT%%bin/mongoexport
+%%MONGOFILES%%bin/mongofiles
+%%MONGOIMPORT%%bin/mongoimport
+%%MONGORESTORE%%bin/mongorestore
+%%MONGOTOP%%bin/mongoreplay
+%%MONGOSTAT%%bin/mongostat
+%%MONGOTOP%%bin/mongotop
 %%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
 %%PORTDOCS%%%%DOCSDIR%%/THIRD-PARTY-NOTICES



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904190734.x3J7YiFw012916>