summaryrefslogtreecommitdiff
path: root/security/nss/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'security/nss/cmd')
-rw-r--r--security/nss/cmd/SSLsample/client.mn4
-rw-r--r--security/nss/cmd/SSLsample/server.mn2
-rw-r--r--security/nss/cmd/addbuiltin/manifest.mn2
-rw-r--r--security/nss/cmd/atob/manifest.mn2
-rw-r--r--security/nss/cmd/bltest/manifest.mn2
-rw-r--r--security/nss/cmd/btoa/manifest.mn2
-rw-r--r--security/nss/cmd/certcgi/manifest.mn2
-rw-r--r--security/nss/cmd/certutil/manifest.mn2
-rw-r--r--security/nss/cmd/checkcert/manifest.mn2
-rw-r--r--security/nss/cmd/cmdlib/manifest.mn2
-rw-r--r--security/nss/cmd/crlutil/manifest.mn2
-rw-r--r--security/nss/cmd/crmf-cgi/manifest.mn2
-rw-r--r--security/nss/cmd/crmftest/manifest.mn2
-rw-r--r--security/nss/cmd/dbck/manifest.mn2
-rw-r--r--security/nss/cmd/dbtest/manifest.mn2
-rw-r--r--security/nss/cmd/derdump/manifest.mn2
-rw-r--r--security/nss/cmd/digest/manifest.mn2
-rw-r--r--security/nss/cmd/ilock/manifest.mn2
-rw-r--r--security/nss/cmd/keyutil/manifest.mn2
-rw-r--r--security/nss/cmd/lib/manifest.mn2
-rw-r--r--security/nss/cmd/makepqg/manifest.mn2
-rw-r--r--security/nss/cmd/manifest.mn2
-rw-r--r--security/nss/cmd/modutil/manifest.mn2
-rw-r--r--security/nss/cmd/ocspclnt/manifest.mn2
-rw-r--r--security/nss/cmd/oidcalc/manifest.mn2
-rw-r--r--security/nss/cmd/p7content/manifest.mn2
-rw-r--r--security/nss/cmd/p7env/manifest.mn2
-rw-r--r--security/nss/cmd/p7sign/manifest.mn2
-rw-r--r--security/nss/cmd/p7verify/manifest.mn2
-rw-r--r--security/nss/cmd/pk12util/manifest.mn2
-rw-r--r--security/nss/cmd/pkiutil/manifest.mn2
-rw-r--r--security/nss/cmd/pp/manifest.mn2
-rw-r--r--security/nss/cmd/rsaperf/manifest.mn2
-rw-r--r--security/nss/cmd/sdrtest/manifest.mn2
-rw-r--r--security/nss/cmd/selfserv/manifest.mn2
-rw-r--r--security/nss/cmd/signtool/manifest.mn4
-rw-r--r--security/nss/cmd/signver/manifest.mn4
-rw-r--r--security/nss/cmd/smimetools/manifest.mn2
-rw-r--r--security/nss/cmd/sslstrength/manifest.mn4
-rw-r--r--security/nss/cmd/ssltap/manifest.mn6
-rw-r--r--security/nss/cmd/strsclnt/manifest.mn2
-rw-r--r--security/nss/cmd/swfort/instinit/manifest.mn4
-rw-r--r--security/nss/cmd/swfort/manifest.mn2
-rw-r--r--security/nss/cmd/swfort/newuser/manifest.mn4
-rw-r--r--security/nss/cmd/tests/manifest.mn2
-rw-r--r--security/nss/cmd/tstclnt/manifest.mn2
-rw-r--r--security/nss/cmd/ttformat/manifest.mn2
-rw-r--r--security/nss/cmd/vfyserv/manifest.mn2
-rw-r--r--security/nss/cmd/zlib/manifest.mn2
49 files changed, 56 insertions, 58 deletions
diff --git a/security/nss/cmd/SSLsample/client.mn b/security/nss/cmd/SSLsample/client.mn
index 74930c5e5..5c7fa3d7c 100644
--- a/security/nss/cmd/SSLsample/client.mn
+++ b/security/nss/cmd/SSLsample/client.mn
@@ -32,7 +32,7 @@
CORE_DEPTH = ../../..
-MODULE = security
+MODULE = nss
EXPORTS =
@@ -44,7 +44,7 @@ PROGRAM = client
REQUIRES = dbm
-IMPORTS = security/lib/nss
+IMPORTS = nss/lib/nss
DEFINES = -DNSPR20
diff --git a/security/nss/cmd/SSLsample/server.mn b/security/nss/cmd/SSLsample/server.mn
index 74226f08f..3ce1181d9 100644
--- a/security/nss/cmd/SSLsample/server.mn
+++ b/security/nss/cmd/SSLsample/server.mn
@@ -32,7 +32,7 @@
CORE_DEPTH = ../../..
-MODULE = security
+MODULE = nss
EXPORTS =
diff --git a/security/nss/cmd/addbuiltin/manifest.mn b/security/nss/cmd/addbuiltin/manifest.mn
index c664c2d6c..b800ed92a 100644
--- a/security/nss/cmd/addbuiltin/manifest.mn
+++ b/security/nss/cmd/addbuiltin/manifest.mn
@@ -34,7 +34,7 @@
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
CSRCS = \
addbuiltin.c \
diff --git a/security/nss/cmd/atob/manifest.mn b/security/nss/cmd/atob/manifest.mn
index ed3717be6..f6c20bf19 100644
--- a/security/nss/cmd/atob/manifest.mn
+++ b/security/nss/cmd/atob/manifest.mn
@@ -34,7 +34,7 @@
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
# This next line is used by .mk files
# and gets translated into $LINCS in manifest.mnw
diff --git a/security/nss/cmd/bltest/manifest.mn b/security/nss/cmd/bltest/manifest.mn
index 4726d2a39..2bbe10999 100644
--- a/security/nss/cmd/bltest/manifest.mn
+++ b/security/nss/cmd/bltest/manifest.mn
@@ -32,7 +32,7 @@
#
CORE_DEPTH = ../../..
-MODULE = security
+MODULE = nss
REQUIRES = seccmd dbm
diff --git a/security/nss/cmd/btoa/manifest.mn b/security/nss/cmd/btoa/manifest.mn
index 8bbf6ee00..b82b26a5c 100644
--- a/security/nss/cmd/btoa/manifest.mn
+++ b/security/nss/cmd/btoa/manifest.mn
@@ -34,7 +34,7 @@
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
# This next line is used by .mk files
# and gets translated into $LINCS in manifest.mnw
diff --git a/security/nss/cmd/certcgi/manifest.mn b/security/nss/cmd/certcgi/manifest.mn
index e065a8e1a..9d659f821 100644
--- a/security/nss/cmd/certcgi/manifest.mn
+++ b/security/nss/cmd/certcgi/manifest.mn
@@ -34,7 +34,7 @@
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIREd.
-MODULE = security
+MODULE = nss
# This next line is used by .mk files
# and gets translated into $LINCS in manifest.mnw
diff --git a/security/nss/cmd/certutil/manifest.mn b/security/nss/cmd/certutil/manifest.mn
index 8d93b0116..9bf7af5b8 100644
--- a/security/nss/cmd/certutil/manifest.mn
+++ b/security/nss/cmd/certutil/manifest.mn
@@ -36,7 +36,7 @@ CORE_DEPTH = ../../..
DEFINES += -DNSPR20
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
CSRCS = \
certutil.c \
diff --git a/security/nss/cmd/checkcert/manifest.mn b/security/nss/cmd/checkcert/manifest.mn
index 9d5a99f73..470c203ec 100644
--- a/security/nss/cmd/checkcert/manifest.mn
+++ b/security/nss/cmd/checkcert/manifest.mn
@@ -34,7 +34,7 @@
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
# This next line is used by .mk files
# and gets translated into $LINCS in manifest.mnw
diff --git a/security/nss/cmd/cmdlib/manifest.mn b/security/nss/cmd/cmdlib/manifest.mn
index c9811a142..d276bdb23 100644
--- a/security/nss/cmd/cmdlib/manifest.mn
+++ b/security/nss/cmd/cmdlib/manifest.mn
@@ -45,5 +45,5 @@ EXPORTS = cmdutil.h \
CSRCS = cmdline.c \
$(NULL)
-REQUIRES = security nspr dbm
+REQUIRES = nss nspr dbm
diff --git a/security/nss/cmd/crlutil/manifest.mn b/security/nss/cmd/crlutil/manifest.mn
index 72fafb24a..169deb28a 100644
--- a/security/nss/cmd/crlutil/manifest.mn
+++ b/security/nss/cmd/crlutil/manifest.mn
@@ -34,7 +34,7 @@
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
# This next line is used by .mk files
# and gets translated into $LINCS in manifest.mnw
diff --git a/security/nss/cmd/crmf-cgi/manifest.mn b/security/nss/cmd/crmf-cgi/manifest.mn
index ceaf5a635..3a3496327 100644
--- a/security/nss/cmd/crmf-cgi/manifest.mn
+++ b/security/nss/cmd/crmf-cgi/manifest.mn
@@ -42,7 +42,7 @@ CSRCS = \
$(NULL)
-REQUIRES = security dbm seccmd
+REQUIRES = nss dbm seccmd
ifdef ATTACH_CGI
DEFINES += -DATTACH_CGI
diff --git a/security/nss/cmd/crmftest/manifest.mn b/security/nss/cmd/crmftest/manifest.mn
index b27e4a3d8..cd5275094 100644
--- a/security/nss/cmd/crmftest/manifest.mn
+++ b/security/nss/cmd/crmftest/manifest.mn
@@ -35,7 +35,7 @@ CORE_DEPTH = ../../..
DEPTH = .
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
EXPORTS = \
$(NULL)
diff --git a/security/nss/cmd/dbck/manifest.mn b/security/nss/cmd/dbck/manifest.mn
index 8424f819d..74e66c49e 100644
--- a/security/nss/cmd/dbck/manifest.mn
+++ b/security/nss/cmd/dbck/manifest.mn
@@ -36,7 +36,7 @@ CORE_DEPTH = ../../..
DEFINES += -DNSPR20
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
CSRCS = \
dbck.c \
diff --git a/security/nss/cmd/dbtest/manifest.mn b/security/nss/cmd/dbtest/manifest.mn
index e323f3011..0f6888088 100644
--- a/security/nss/cmd/dbtest/manifest.mn
+++ b/security/nss/cmd/dbtest/manifest.mn
@@ -34,7 +34,7 @@
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
# This next line is used by .mk files
# and gets translated into $LINCS in manifest.mnw
diff --git a/security/nss/cmd/derdump/manifest.mn b/security/nss/cmd/derdump/manifest.mn
index c00df3509..d9252cd0d 100644
--- a/security/nss/cmd/derdump/manifest.mn
+++ b/security/nss/cmd/derdump/manifest.mn
@@ -34,7 +34,7 @@
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
# This next line is used by .mk files
# and gets translated into $LINCS in manifest.mnw
diff --git a/security/nss/cmd/digest/manifest.mn b/security/nss/cmd/digest/manifest.mn
index 8150b2c1d..c84152d01 100644
--- a/security/nss/cmd/digest/manifest.mn
+++ b/security/nss/cmd/digest/manifest.mn
@@ -34,7 +34,7 @@
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
# This next line is used by .mk files
# and gets translated into $LINCS in manifest.mnw
diff --git a/security/nss/cmd/ilock/manifest.mn b/security/nss/cmd/ilock/manifest.mn
index fcea16608..4a8f7988c 100644
--- a/security/nss/cmd/ilock/manifest.mn
+++ b/security/nss/cmd/ilock/manifest.mn
@@ -35,7 +35,7 @@ CORE_DEPTH = ../../..
DEFINES += -DNSPR20
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
CSRCS = ilock.c
diff --git a/security/nss/cmd/keyutil/manifest.mn b/security/nss/cmd/keyutil/manifest.mn
index 40b938cac..e20a3d330 100644
--- a/security/nss/cmd/keyutil/manifest.mn
+++ b/security/nss/cmd/keyutil/manifest.mn
@@ -36,7 +36,7 @@ CORE_DEPTH = ../../..
DEFINES += -DNSPR20
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
CSRCS = \
keyutil.c \
diff --git a/security/nss/cmd/lib/manifest.mn b/security/nss/cmd/lib/manifest.mn
index 969596863..d2239ba72 100644
--- a/security/nss/cmd/lib/manifest.mn
+++ b/security/nss/cmd/lib/manifest.mn
@@ -64,5 +64,5 @@ OLD_CSRCS = dongle.c \
stubs.c \
$(NULL)
-REQUIRES = security nspr dbm
+REQUIRES = nss nspr dbm
diff --git a/security/nss/cmd/makepqg/manifest.mn b/security/nss/cmd/makepqg/manifest.mn
index 6053caeae..328797094 100644
--- a/security/nss/cmd/makepqg/manifest.mn
+++ b/security/nss/cmd/makepqg/manifest.mn
@@ -35,7 +35,7 @@ CORE_DEPTH = ../../..
# This next line is used by .mk files
# and gets translated into $LINCS in manifest.mnw
-REQUIRES = security seccmd dbm
+REQUIRES = nss seccmd dbm
# DIRS =
diff --git a/security/nss/cmd/manifest.mn b/security/nss/cmd/manifest.mn
index 1c02b487f..799fa2ef2 100644
--- a/security/nss/cmd/manifest.mn
+++ b/security/nss/cmd/manifest.mn
@@ -34,7 +34,7 @@
DEPTH = ../..
# MODULE = seccmd
-REQUIRES = security nspr libdbm
+REQUIRES = nss nspr libdbm
DIRS = lib \
zlib \
diff --git a/security/nss/cmd/modutil/manifest.mn b/security/nss/cmd/modutil/manifest.mn
index a40aec6db..a28e9a738 100644
--- a/security/nss/cmd/modutil/manifest.mn
+++ b/security/nss/cmd/modutil/manifest.mn
@@ -50,7 +50,7 @@ CPPSRCS =
PROGRAM = modutil
-REQUIRES = seccmd security dbm
+REQUIRES = seccmd nss dbm
DEFINES = -DNSPR20
diff --git a/security/nss/cmd/ocspclnt/manifest.mn b/security/nss/cmd/ocspclnt/manifest.mn
index 225bc7c4a..68a84b8c7 100644
--- a/security/nss/cmd/ocspclnt/manifest.mn
+++ b/security/nss/cmd/ocspclnt/manifest.mn
@@ -34,7 +34,7 @@
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
CSRCS = \
ocspclnt.c \
diff --git a/security/nss/cmd/oidcalc/manifest.mn b/security/nss/cmd/oidcalc/manifest.mn
index 890e112ef..7e1c3fad6 100644
--- a/security/nss/cmd/oidcalc/manifest.mn
+++ b/security/nss/cmd/oidcalc/manifest.mn
@@ -34,7 +34,7 @@
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
# This next line is used by .mk files
# and gets translated into $LINCS in manifest.mnw
diff --git a/security/nss/cmd/p7content/manifest.mn b/security/nss/cmd/p7content/manifest.mn
index ff7d7565d..3ebd21743 100644
--- a/security/nss/cmd/p7content/manifest.mn
+++ b/security/nss/cmd/p7content/manifest.mn
@@ -33,7 +33,7 @@
CORE_DEPTH = ../../..
-MODULE = security
+MODULE = nss
CSRCS = p7content.c
diff --git a/security/nss/cmd/p7env/manifest.mn b/security/nss/cmd/p7env/manifest.mn
index 511c541b0..7d51282f9 100644
--- a/security/nss/cmd/p7env/manifest.mn
+++ b/security/nss/cmd/p7env/manifest.mn
@@ -33,7 +33,7 @@
CORE_DEPTH = ../../..
-MODULE = security
+MODULE = nss
CSRCS = p7env.c
diff --git a/security/nss/cmd/p7sign/manifest.mn b/security/nss/cmd/p7sign/manifest.mn
index 7a190276b..d5134df48 100644
--- a/security/nss/cmd/p7sign/manifest.mn
+++ b/security/nss/cmd/p7sign/manifest.mn
@@ -33,7 +33,7 @@
CORE_DEPTH = ../../..
-MODULE = security
+MODULE = nss
CSRCS = p7sign.c
diff --git a/security/nss/cmd/p7verify/manifest.mn b/security/nss/cmd/p7verify/manifest.mn
index 5ac9e8a3f..7e841c700 100644
--- a/security/nss/cmd/p7verify/manifest.mn
+++ b/security/nss/cmd/p7verify/manifest.mn
@@ -33,7 +33,7 @@
CORE_DEPTH = ../../..
-MODULE = security
+MODULE = nss
CSRCS = p7verify.c
diff --git a/security/nss/cmd/pk12util/manifest.mn b/security/nss/cmd/pk12util/manifest.mn
index a15daef6b..40fd6d6ac 100644
--- a/security/nss/cmd/pk12util/manifest.mn
+++ b/security/nss/cmd/pk12util/manifest.mn
@@ -36,7 +36,7 @@ CORE_DEPTH = ../../..
DEFINES += -DNSPR20
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
CSRCS = \
pk12util.c \
diff --git a/security/nss/cmd/pkiutil/manifest.mn b/security/nss/cmd/pkiutil/manifest.mn
index 3ab2925fe..3f65c29ab 100644
--- a/security/nss/cmd/pkiutil/manifest.mn
+++ b/security/nss/cmd/pkiutil/manifest.mn
@@ -34,7 +34,7 @@
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
CSRCS = \
pkiutil.c \
diff --git a/security/nss/cmd/pp/manifest.mn b/security/nss/cmd/pp/manifest.mn
index dc0da84f9..f43c9c625 100644
--- a/security/nss/cmd/pp/manifest.mn
+++ b/security/nss/cmd/pp/manifest.mn
@@ -34,7 +34,7 @@
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
# This next line is used by .mk files
# and gets translated into $LINCS in manifest.mnw
diff --git a/security/nss/cmd/rsaperf/manifest.mn b/security/nss/cmd/rsaperf/manifest.mn
index b208672b7..802a63815 100644
--- a/security/nss/cmd/rsaperf/manifest.mn
+++ b/security/nss/cmd/rsaperf/manifest.mn
@@ -35,7 +35,7 @@ DEPTH = ../../..
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
INCLUDES += -I$(CORE_DEPTH)/nss/lib/softoken
diff --git a/security/nss/cmd/sdrtest/manifest.mn b/security/nss/cmd/sdrtest/manifest.mn
index 61daf390b..a8a08fed0 100644
--- a/security/nss/cmd/sdrtest/manifest.mn
+++ b/security/nss/cmd/sdrtest/manifest.mn
@@ -34,7 +34,7 @@
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
CSRCS = \
sdrtest.c \
diff --git a/security/nss/cmd/selfserv/manifest.mn b/security/nss/cmd/selfserv/manifest.mn
index f8050ed9e..e97085201 100644
--- a/security/nss/cmd/selfserv/manifest.mn
+++ b/security/nss/cmd/selfserv/manifest.mn
@@ -36,7 +36,7 @@ CORE_DEPTH = ../../..
DEFINES += -DNSPR20
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
CSRCS = selfserv.c
diff --git a/security/nss/cmd/signtool/manifest.mn b/security/nss/cmd/signtool/manifest.mn
index df226eebe..073cf5118 100644
--- a/security/nss/cmd/signtool/manifest.mn
+++ b/security/nss/cmd/signtool/manifest.mn
@@ -32,7 +32,7 @@
CORE_DEPTH = ../../..
-MODULE = security
+MODULE = nss
EXPORTS =
@@ -48,7 +48,7 @@ CSRCS = signtool.c \
PROGRAM = signtool
-REQUIRES = security dbm seccmd
+REQUIRES = dbm seccmd
DEFINES += -DNSPR20
diff --git a/security/nss/cmd/signver/manifest.mn b/security/nss/cmd/signver/manifest.mn
index 1ddccb504..9efdaad29 100644
--- a/security/nss/cmd/signver/manifest.mn
+++ b/security/nss/cmd/signver/manifest.mn
@@ -32,13 +32,13 @@
CORE_DEPTH = ../../..
-MODULE = security
+MODULE = nss
CSRCS = signver.c \
pk7print.c \
$(NULL)
-REQUIRES = security dbm seccmd
+REQUIRES = dbm seccmd
PROGRAM = signver
diff --git a/security/nss/cmd/smimetools/manifest.mn b/security/nss/cmd/smimetools/manifest.mn
index 9ed96c658..552cfec7d 100644
--- a/security/nss/cmd/smimetools/manifest.mn
+++ b/security/nss/cmd/smimetools/manifest.mn
@@ -33,7 +33,7 @@
CORE_DEPTH = ../../..
-MODULE = security
+MODULE = nss
CSRCS = cmsutil.c
diff --git a/security/nss/cmd/sslstrength/manifest.mn b/security/nss/cmd/sslstrength/manifest.mn
index 79e1a46ea..8b7cb7b0d 100644
--- a/security/nss/cmd/sslstrength/manifest.mn
+++ b/security/nss/cmd/sslstrength/manifest.mn
@@ -32,7 +32,7 @@
CORE_DEPTH = ../../..
-MODULE = security
+MODULE = nss
EXPORTS =
@@ -41,7 +41,7 @@ CSRCS = sslstrength.c \
PROGRAM = sslstrength
-REQUIRES = security dbm seccmd
+REQUIRES = dbm seccmd
DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\" -DDLL_SUFFIX=\"$(DLL_SUFFIX)\"
diff --git a/security/nss/cmd/ssltap/manifest.mn b/security/nss/cmd/ssltap/manifest.mn
index 0719e6de4..adfd2bd03 100644
--- a/security/nss/cmd/ssltap/manifest.mn
+++ b/security/nss/cmd/ssltap/manifest.mn
@@ -34,7 +34,7 @@
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
EXPORTS =
@@ -43,9 +43,7 @@ CSRCS = ssltap.c \
PROGRAM = ssltap
-# The MODULE is always implicitly required.
-# Listing it here in REQUIRES makes it appear twice in the cc command line.
-REQUIRES = security seccmd dbm
+REQUIRES = seccmd dbm
PACKAGE_FILES = ssltap-manual.html licence.doc ssltap.exe
diff --git a/security/nss/cmd/strsclnt/manifest.mn b/security/nss/cmd/strsclnt/manifest.mn
index 2333e2c2e..e54345f6d 100644
--- a/security/nss/cmd/strsclnt/manifest.mn
+++ b/security/nss/cmd/strsclnt/manifest.mn
@@ -35,7 +35,7 @@ CORE_DEPTH = ../../..
DEFINES += -DNSPR20
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
CSRCS = strsclnt.c
diff --git a/security/nss/cmd/swfort/instinit/manifest.mn b/security/nss/cmd/swfort/instinit/manifest.mn
index 83cb3e2da..8380f4246 100644
--- a/security/nss/cmd/swfort/instinit/manifest.mn
+++ b/security/nss/cmd/swfort/instinit/manifest.mn
@@ -34,11 +34,11 @@ CORE_DEPTH = ../../../..
DEFINES += -DNSPR20
-MODULE = security
+MODULE = nss
CSRCS = instinit.c
-REQUIRES = security nspr dbm seccmd
+REQUIRES = nspr dbm seccmd
PROGRAM = instinit
# PROGRAM = ./$(OBJDIR)/selfserv.exe
diff --git a/security/nss/cmd/swfort/manifest.mn b/security/nss/cmd/swfort/manifest.mn
index 2f8be569d..aaacd83e8 100644
--- a/security/nss/cmd/swfort/manifest.mn
+++ b/security/nss/cmd/swfort/manifest.mn
@@ -32,7 +32,7 @@
#
CORE_DEPTH = ../../..
-REQUIRES = security seccmd dbm
+REQUIRES = nss seccmd dbm
DIRS = instinit newuser
diff --git a/security/nss/cmd/swfort/newuser/manifest.mn b/security/nss/cmd/swfort/newuser/manifest.mn
index d48803b1e..4554c69ef 100644
--- a/security/nss/cmd/swfort/newuser/manifest.mn
+++ b/security/nss/cmd/swfort/newuser/manifest.mn
@@ -34,11 +34,11 @@ CORE_DEPTH = ../../../..
DEFINES += -DNSPR20
-MODULE = security
+MODULE = nss
CSRCS = newuser.c mktst.c
-REQUIRES = security nspr dbm seccmd
+REQUIRES = nspr dbm seccmd
PROGRAM = newuser
diff --git a/security/nss/cmd/tests/manifest.mn b/security/nss/cmd/tests/manifest.mn
index 528cc7678..20a90d2bf 100644
--- a/security/nss/cmd/tests/manifest.mn
+++ b/security/nss/cmd/tests/manifest.mn
@@ -34,7 +34,7 @@
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
CSRCS = vercrt.c \
vercrtfps.c
diff --git a/security/nss/cmd/tstclnt/manifest.mn b/security/nss/cmd/tstclnt/manifest.mn
index 00378736a..8762227e4 100644
--- a/security/nss/cmd/tstclnt/manifest.mn
+++ b/security/nss/cmd/tstclnt/manifest.mn
@@ -34,7 +34,7 @@
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
# This next line is used by .mk files
# and gets translated into $LINCS in manifest.mnw
diff --git a/security/nss/cmd/ttformat/manifest.mn b/security/nss/cmd/ttformat/manifest.mn
index d743cfb1c..c63d5b052 100644
--- a/security/nss/cmd/ttformat/manifest.mn
+++ b/security/nss/cmd/ttformat/manifest.mn
@@ -36,7 +36,7 @@ CORE_DEPTH = ../../..
DEFINES += -DNSPR20
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
CSRCS = ttformat.c
diff --git a/security/nss/cmd/vfyserv/manifest.mn b/security/nss/cmd/vfyserv/manifest.mn
index b2c85fadb..ccbca1d75 100644
--- a/security/nss/cmd/vfyserv/manifest.mn
+++ b/security/nss/cmd/vfyserv/manifest.mn
@@ -34,7 +34,7 @@
CORE_DEPTH = ../../..
# MODULE public and private header directories are implicitly REQUIRED.
-MODULE = security
+MODULE = nss
# This next line is used by .mk files
# and gets translated into $LINCS in manifest.mnw
diff --git a/security/nss/cmd/zlib/manifest.mn b/security/nss/cmd/zlib/manifest.mn
index 6b4fbd4ec..13460377c 100644
--- a/security/nss/cmd/zlib/manifest.mn
+++ b/security/nss/cmd/zlib/manifest.mn
@@ -54,7 +54,7 @@ CSRCS = adler32.c \
LIBRARY_NAME = zlib
-# REQUIRES = security
+# REQUIRES = nss
DEFINES = -DNSPR20=1 -DMOZILLA_CLIENT=1