CVS commit: pkgsrc/databases/mongodb

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Fri May  1 22:17:18 UTC 2020

Modified Files:
        pkgsrc/databases/mongodb: Makefile

Log Message:
databases/mongodb: remove no-op file from SUBST_FILES

mongod_options.cpp doesn't contain any pathnames anymore.

While here, the substitutions for /var looked suspicious but were ok
since everything happens in the mongodb/ subdirectory.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 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.54 pkgsrc/databases/mongodb/Makefile:1.55
--- pkgsrc/databases/mongodb/Makefile:1.54      Sun Apr 19 10:05:50 2020
+++ pkgsrc/databases/mongodb/Makefile   Fri May  1 22:17:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2020/04/19 10:05:50 adam Exp $
+# $NetBSD: Makefile,v 1.55 2020/05/01 22:17:18 rillig Exp $
 
 DISTNAME=      mongodb-src-r4.2.6
 PKGNAME=       ${DISTNAME:S/src-r//}
@@ -93,7 +93,6 @@ SUBST_CLASSES+=               path
 SUBST_STAGE.path=      pre-build
 SUBST_MESSAGE.path=    Replacing database paths.
 SUBST_FILES.path=      debian/mongo.1 debian/mongod.1
-SUBST_FILES.path+=     src/mongo/db/mongod_options.cpp
 SUBST_FILES.path+=     src/mongo/db/storage/storage_options.cpp
 SUBST_SED.path=                -e 's,/data/db,${MONGODB_DBPATH},g'
 SUBST_SED.path+=       -e 's,/data/configdb,${MONGODB_CONFIGDBPATH},g'
@@ -103,8 +102,8 @@ SUBST_CLASSES+=             varbase
 SUBST_STAGE.varbase=   pre-build
 SUBST_MESSAGE.varbase= Changing /var to ${VARBASE}.
 SUBST_FILES.varbase=   debian/mongod.conf
-SUBST_SED.varbase=     -e 's,/var/lib,${VARBASE},g'
-SUBST_SED.varbase+=    -e 's,/var/log,${VARBASE},g'
+SUBST_SED.varbase=     -e 's,/var/lib/mongodb,${VARBASE}/mongodb,g'
+SUBST_SED.varbase+=    -e 's,/var/log/mongodb,${VARBASE}/mongodb,g'
 
 SUBST_CLASSES+=                python
 SUBST_STAGE.python=    pre-build