Attachment 209535 Details for Bug 242002 – add conflicts to other mongodb* ports and adds to databases/Makefile

[patch] add conflicts to other mongodb* ports and adds to databases/Makefile

mongodb42-conflicts.diff (text/plain), 1.75 KB, created by Ronald Klop on 2019-11-29 19:35:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ronald Klop

Created: 2019-11-29 19:35:40 UTC

Size: 1.75 KB

patch

obsolete

>Index: databases/Makefile
>===================================================================
>--- databases/Makefile	(revision 517346)
>+++ databases/Makefile	(working copy)
>@@ -200,6 +200,7 @@
>     SUBDIR += mongodb36-tools
>     SUBDIR += mongodb40
>     SUBDIR += mongodb40-tools
>+    SUBDIR += mongodb42
>     SUBDIR += mroonga
>     SUBDIR += mtools-mongodb
>     SUBDIR += mtop
>Index: databases/mongodb34/Makefile
>===================================================================
>--- databases/mongodb34/Makefile	(revision 517346)
>+++ databases/mongodb34/Makefile	(working copy)
>@@ -32,7 +32,7 @@
> USES=		compiler:c++14-lang cpe dos2unix python:build scons
> 
> CONFLICTS_BUILD=	mongo-cxx-driver
>-CONFLICTS_INSTALL=	mongodb36 mongodb40
>+CONFLICTS_INSTALL=	mongodb36 mongodb4[02]
> 
> DOS2UNIX_FILES=	src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h
> 
>Index: databases/mongodb36/Makefile
>===================================================================
>--- databases/mongodb36/Makefile	(revision 517346)
>+++ databases/mongodb36/Makefile	(working copy)
>@@ -31,7 +31,7 @@
> USE_RC_SUBR=	mongod
> 
> CONFLICTS_BUILD=	mongo-cxx-driver
>-CONFLICTS_INSTALL=	mongodb34 mongodb40
>+CONFLICTS_INSTALL=	mongodb34 mongodb4[02]
> 
> SHEBANG_FILES=	src/mongo/installer/compass/install_compass.in
> python_OLD_CMD=	@python_interpreter@
>Index: databases/mongodb40/Makefile
>===================================================================
>--- databases/mongodb40/Makefile	(revision 517346)
>+++ databases/mongodb40/Makefile	(working copy)
>@@ -33,7 +33,7 @@
> USE_RC_SUBR=	mongod
> 
> CONFLICTS_BUILD=	mongo-cxx-driver
>-CONFLICTS_INSTALL=	mongodb3[46]
>+CONFLICTS_INSTALL=	mongodb3[46] mongodb42
> 
> SHEBANG_FILES=	src/mongo/installer/compass/install_compass.in
> python_OLD_CMD=	@python_interpreter@

Flags:

ronald-lists: maintainer-approval+

Actions: View | Diff

Attachments on bug 242002: 209183 | 209191 | 209534 | 209535 | 214546 | 214661 | 214871 | 214962 | 214963