View | Details | Raw Unified | Return to bug 234310 | Differences between
and this patch

Collapse All | Expand All

(-)databases/Makefile (+1 lines)
Lines 206-211 Link Here
206
    SUBDIR += mongodb34-tools
206
    SUBDIR += mongodb34-tools
207
    SUBDIR += mongodb36
207
    SUBDIR += mongodb36
208
    SUBDIR += mongodb36-tools
208
    SUBDIR += mongodb36-tools
209
    SUBDIR += mongodb40
209
    SUBDIR += mroonga
210
    SUBDIR += mroonga
210
    SUBDIR += mrtg-mysql-load
211
    SUBDIR += mrtg-mysql-load
211
    SUBDIR += mtools-mongodb
212
    SUBDIR += mtools-mongodb
(-)databases/mongodb40/Makefile (-4 / +4 lines)
Lines 2-9 Link Here
2
2
3
PORTNAME=	mongodb
3
PORTNAME=	mongodb
4
DISTVERSIONPREFIX=	r
4
DISTVERSIONPREFIX=	r
5
DISTVERSION=	3.6.6
5
DISTVERSION=	4.0.5
6
PORTREVISION=	4
7
CATEGORIES=	databases net
6
CATEGORIES=	databases net
8
MASTER_SITES=	https://fastdl.mongodb.org/src/ \
7
MASTER_SITES=	https://fastdl.mongodb.org/src/ \
9
		http://fastdl.mongodb.org/src/ \
8
		http://fastdl.mongodb.org/src/ \
Lines 26-35 Link Here
26
		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
25
		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
27
LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
26
LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
28
		libpcre.so:devel/pcre \
27
		libpcre.so:devel/pcre \
28
		libcurl.so:ftp/curl \
29
		libsnappy.so:archivers/snappy
29
		libsnappy.so:archivers/snappy
30
30
31
CONFLICTS_BUILD=	mongo-cxx-driver
31
CONFLICTS_BUILD=	mongo-cxx-driver
32
CONFLICTS_INSTALL=	mongodb[32-4]*
32
CONFLICTS_INSTALL=	mongodb[32-6]*
33
33
34
USES=		compiler:c++14-lang cpe python:2.7,build scons shebangfix
34
USES=		compiler:c++14-lang cpe python:2.7,build scons shebangfix
35
USE_RC_SUBR=	mongod
35
USE_RC_SUBR=	mongod
Lines 71-77 Link Here
71
CPE_PRODUCT=	mongodb
71
CPE_PRODUCT=	mongodb
72
72
73
post-install:
73
post-install:
74
.for f in mongo mongod mongoperf mongos
74
.for f in mongo mongod mongos
75
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
75
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
76
.endfor
76
.endfor
77
	${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
77
	${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
(-)databases/mongodb40/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1532785629
1
TIMESTAMP = 1545599243
2
SHA256 (mongodb-src-r3.6.6.tar.gz) = e3b9e30941f314d0b1d89f85af3b1258aa2f72a9df21e44cf4aa08faf262e406
2
SHA256 (mongodb-src-r4.0.5.tar.gz) = d967098fc91d105cdb0f400c8b837e5c2795c3638d7720392bc47afb1efe1c10
3
SIZE (mongodb-src-r3.6.6.tar.gz) = 40391572
3
SIZE (mongodb-src-r4.0.5.tar.gz) = 49507822
(-)databases/mongodb40/files/patch-SConstruct (-8 / +12 lines)
Lines 1-6 Link Here
1
--- SConstruct.orig	2018-01-04 23:28:55 UTC
1
--- SConstruct.orig	2018-12-13 19:53:46.000000000 +0100
2
+++ SConstruct
2
+++ SConstruct	2018-12-23 22:10:10.927789000 +0100
3
@@ -922,9 +922,9 @@ if has_option('variables-help'):
3
@@ -1010,9 +1010,9 @@
4
     print(env_vars.GenerateHelpText(env))
4
     print(env_vars.GenerateHelpText(env))
5
     Exit(0)
5
     Exit(0)
6
 
6
 
Lines 13-19 Link Here
13
 
13
 
14
 def set_config_header_define(env, varname, varval = 1):
14
 def set_config_header_define(env, varname, varval = 1):
15
     env['CONFIG_HEADER_DEFINES'][varname] = varval
15
     env['CONFIG_HEADER_DEFINES'][varname] = varval
16
@@ -1612,7 +1612,7 @@ if env.TargetOSIs('posix'):
16
@@ -1770,7 +1770,7 @@
17
             # If runtime hardening is requested, then build anything
17
             # If runtime hardening is requested, then build anything
18
             # destined for an executable with the necessary flags for PIE.
18
             # destined for an executable with the necessary flags for PIE.
19
             env.AppendUnique(
19
             env.AppendUnique(
Lines 22-28 Link Here
22
                 PROGLINKFLAGS=['-pie'],
22
                 PROGLINKFLAGS=['-pie'],
23
             )
23
             )
24
 
24
 
25
@@ -1626,7 +1626,7 @@ if env.TargetOSIs('posix'):
25
@@ -1784,7 +1784,7 @@
26
                          "-Wno-unknown-pragmas",
26
                          "-Wno-unknown-pragmas",
27
                          "-Winvalid-pch"] )
27
                          "-Winvalid-pch"] )
28
     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
28
     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
Lines 31-46 Link Here
31
         if not has_option("disable-warnings-as-errors"):
31
         if not has_option("disable-warnings-as-errors"):
32
             env.Append( CCFLAGS=["-Werror"] )
32
             env.Append( CCFLAGS=["-Werror"] )
33
 
33
 
34
@@ -1661,10 +1661,10 @@ if env.TargetOSIs('posix'):
34
@@ -1820,12 +1820,12 @@
35
         env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
35
         env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
36
         env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
36
         env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
37
 
37
 
38
-    if optBuild:
38
-    if optBuild and not optBuildForSize:
39
-        env.Append( CCFLAGS=["-O2"] )
39
-        env.Append( CCFLAGS=["-O2"] )
40
-    elif optBuild and optBuildForSize: 
41
-        env.Append( CCFLAGS=["-Os"] )
40
-    else:
42
-    else:
41
-        env.Append( CCFLAGS=["-O0"] )
43
-        env.Append( CCFLAGS=["-O0"] )
42
+    #if optBuild:
44
+    #if optBuild and not optBuildForSize:
43
+    #    env.Append( CCFLAGS=["-O2"] )
45
+    #    env.Append( CCFLAGS=["-O2"] )
46
+    #elif optBuild and optBuildForSize: 
47
+    #    env.Append( CCFLAGS=["-Os"] )
44
+    #else:
48
+    #else:
45
+    #    env.Append( CCFLAGS=["-O0"] )
49
+    #    env.Append( CCFLAGS=["-O0"] )
46
 
50
 
(-)databases/mongodb40/pkg-plist (-1 lines)
Lines 1-6 Link Here
1
bin/install_compass
1
bin/install_compass
2
bin/mongo
2
bin/mongo
3
bin/mongod
3
bin/mongod
4
bin/mongoperf
5
bin/mongos
4
bin/mongos
6
@sample etc/mongodb.conf.sample
5
@sample etc/mongodb.conf.sample

Return to bug 234310