From bb506b7985672fbc09cdb243f6297277a6c22958 Mon Sep 17 00:00:00 2001 From: "nicolson%netscape.com" Date: Fri, 6 Sep 2002 16:38:56 +0000 Subject: Fix 164126: makefile build error. Change the NSS module name from "security" to "nss". --- security/nss/cmd/SSLsample/client.mn | 4 ++-- security/nss/cmd/SSLsample/server.mn | 2 +- security/nss/cmd/addbuiltin/manifest.mn | 2 +- security/nss/cmd/atob/manifest.mn | 2 +- security/nss/cmd/bltest/manifest.mn | 2 +- security/nss/cmd/btoa/manifest.mn | 2 +- security/nss/cmd/certcgi/manifest.mn | 2 +- security/nss/cmd/certutil/manifest.mn | 2 +- security/nss/cmd/checkcert/manifest.mn | 2 +- security/nss/cmd/cmdlib/manifest.mn | 2 +- security/nss/cmd/crlutil/manifest.mn | 2 +- security/nss/cmd/crmf-cgi/manifest.mn | 2 +- security/nss/cmd/crmftest/manifest.mn | 2 +- security/nss/cmd/dbck/manifest.mn | 2 +- security/nss/cmd/dbtest/manifest.mn | 2 +- security/nss/cmd/derdump/manifest.mn | 2 +- security/nss/cmd/digest/manifest.mn | 2 +- security/nss/cmd/ilock/manifest.mn | 2 +- security/nss/cmd/keyutil/manifest.mn | 2 +- security/nss/cmd/lib/manifest.mn | 2 +- security/nss/cmd/makepqg/manifest.mn | 2 +- security/nss/cmd/manifest.mn | 2 +- security/nss/cmd/modutil/manifest.mn | 2 +- security/nss/cmd/ocspclnt/manifest.mn | 2 +- security/nss/cmd/oidcalc/manifest.mn | 2 +- security/nss/cmd/p7content/manifest.mn | 2 +- security/nss/cmd/p7env/manifest.mn | 2 +- security/nss/cmd/p7sign/manifest.mn | 2 +- security/nss/cmd/p7verify/manifest.mn | 2 +- security/nss/cmd/pk12util/manifest.mn | 2 +- security/nss/cmd/pkiutil/manifest.mn | 2 +- security/nss/cmd/pp/manifest.mn | 2 +- security/nss/cmd/rsaperf/manifest.mn | 2 +- security/nss/cmd/sdrtest/manifest.mn | 2 +- security/nss/cmd/selfserv/manifest.mn | 2 +- security/nss/cmd/signtool/manifest.mn | 4 ++-- security/nss/cmd/signver/manifest.mn | 4 ++-- security/nss/cmd/smimetools/manifest.mn | 2 +- security/nss/cmd/sslstrength/manifest.mn | 4 ++-- security/nss/cmd/ssltap/manifest.mn | 6 ++---- security/nss/cmd/strsclnt/manifest.mn | 2 +- security/nss/cmd/swfort/instinit/manifest.mn | 4 ++-- security/nss/cmd/swfort/manifest.mn | 2 +- security/nss/cmd/swfort/newuser/manifest.mn | 4 ++-- security/nss/cmd/tests/manifest.mn | 2 +- security/nss/cmd/tstclnt/manifest.mn | 2 +- security/nss/cmd/ttformat/manifest.mn | 2 +- security/nss/cmd/vfyserv/manifest.mn | 2 +- security/nss/cmd/zlib/manifest.mn | 2 +- security/nss/lib/asn1/manifest.mn | 4 ++-- security/nss/lib/base/manifest.mn | 4 ++-- security/nss/lib/certdb/manifest.mn | 4 ++-- security/nss/lib/certhigh/manifest.mn | 4 ++-- security/nss/lib/ckfw/builtins/manifest.mn | 4 ++-- security/nss/lib/ckfw/dbm/manifest.mn | 4 ++-- security/nss/lib/ckfw/manifest.mn | 4 ++-- security/nss/lib/crmf/manifest.mn | 4 +--- security/nss/lib/cryptohi/manifest.mn | 2 +- security/nss/lib/dev/manifest.mn | 4 ++-- security/nss/lib/fortcrypt/manifest.mn | 4 ++-- security/nss/lib/fortcrypt/swfort/manifest.mn | 4 ++-- security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn | 4 ++-- security/nss/lib/freebl/manifest.mn | 2 +- security/nss/lib/jar/manifest.mn | 4 ++-- security/nss/lib/nss/manifest.mn | 4 ++-- security/nss/lib/pk11wrap/manifest.mn | 4 ++-- security/nss/lib/pkcs12/manifest.mn | 4 ++-- security/nss/lib/pkcs7/manifest.mn | 4 ++-- security/nss/lib/pki/manifest.mn | 4 ++-- security/nss/lib/pki1/manifest.mn | 4 ++-- security/nss/lib/smime/manifest.mn | 4 ++-- security/nss/lib/softoken/manifest.mn | 2 +- security/nss/lib/ssl/manifest.mn | 4 ++-- security/nss/lib/util/manifest.mn | 2 +- security/nss/manifest.mn | 2 +- security/nss/tests/pkcs11/netscape/suites/manifest.mn | 9 --------- .../nss/tests/pkcs11/netscape/suites/security/pkcs11/manifest.mn | 2 +- .../nss/tests/pkcs11/netscape/suites/security/ssl/manifest.mn | 9 +-------- 78 files changed, 104 insertions(+), 124 deletions(-) (limited to 'security') 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 diff --git a/security/nss/lib/asn1/manifest.mn b/security/nss/lib/asn1/manifest.mn index 36558ab60..5bc732222 100644 --- a/security/nss/lib/asn1/manifest.mn +++ b/security/nss/lib/asn1/manifest.mn @@ -44,12 +44,12 @@ PRIVATE_EXPORTS = \ EXPORTS = \ $(NULL) -MODULE = security +MODULE = nss CSRCS = \ asn1.c \ $(NULL) -REQUIRES = security nspr +REQUIRES = nspr LIBRARY_NAME = asn1 diff --git a/security/nss/lib/base/manifest.mn b/security/nss/lib/base/manifest.mn index 13cf9447b..87ea50dad 100644 --- a/security/nss/lib/base/manifest.mn +++ b/security/nss/lib/base/manifest.mn @@ -44,7 +44,7 @@ EXPORTS = \ nssbase.h \ $(NULL) -MODULE = security +MODULE = nss CSRCS = \ arena.c \ @@ -60,6 +60,6 @@ CSRCS = \ whatnspr.c \ $(NULL) -REQUIRES = security nspr +REQUIRES = nspr LIBRARY_NAME = nssb diff --git a/security/nss/lib/certdb/manifest.mn b/security/nss/lib/certdb/manifest.mn index 33b3fb612..f947b6676 100644 --- a/security/nss/lib/certdb/manifest.mn +++ b/security/nss/lib/certdb/manifest.mn @@ -44,7 +44,7 @@ PRIVATE_EXPORTS = \ certxutl.h \ $(NULL) -MODULE = security +MODULE = nss CSRCS = \ alg1485.c \ @@ -61,7 +61,7 @@ CSRCS = \ xconst.c \ $(NULL) -REQUIRES = security dbm +REQUIRES = dbm LIBRARY_NAME = certdb diff --git a/security/nss/lib/certhigh/manifest.mn b/security/nss/lib/certhigh/manifest.mn index d7d0a2247..80deff5bb 100644 --- a/security/nss/lib/certhigh/manifest.mn +++ b/security/nss/lib/certhigh/manifest.mn @@ -41,7 +41,7 @@ PRIVATE_EXPORTS = \ ocspti.h \ $(NULL) -MODULE = security +MODULE = nss CSRCS = \ certhtml.c \ @@ -53,7 +53,7 @@ CSRCS = \ xcrldist.c \ $(NULL) -REQUIRES = security dbm +REQUIRES = dbm LIBRARY_NAME = certhi diff --git a/security/nss/lib/ckfw/builtins/manifest.mn b/security/nss/lib/ckfw/builtins/manifest.mn index 4ccb55b62..23360f081 100644 --- a/security/nss/lib/ckfw/builtins/manifest.mn +++ b/security/nss/lib/ckfw/builtins/manifest.mn @@ -34,7 +34,7 @@ MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" CORE_DEPTH = ../../../.. -MODULE = security +MODULE = nss EXPORTS = \ nssckbi.h \ @@ -52,7 +52,7 @@ CSRCS = \ certdata.c \ $(NULL) -REQUIRES = security nspr +REQUIRES = nspr LIBRARY_NAME = nssckbi diff --git a/security/nss/lib/ckfw/dbm/manifest.mn b/security/nss/lib/ckfw/dbm/manifest.mn index 193e46bef..8f0053b39 100644 --- a/security/nss/lib/ckfw/dbm/manifest.mn +++ b/security/nss/lib/ckfw/dbm/manifest.mn @@ -34,7 +34,7 @@ MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" CORE_DEPTH = ../../../.. -MODULE = security +MODULE = nss CSRCS = \ anchor.c \ @@ -47,7 +47,7 @@ CSRCS = \ db.c \ $(NULL) -REQUIRES = security dbm nspr +REQUIRES = dbm nspr LIBRARY_NAME = nssckdbm diff --git a/security/nss/lib/ckfw/manifest.mn b/security/nss/lib/ckfw/manifest.mn index 8a4f15086..fb84a733b 100644 --- a/security/nss/lib/ckfw/manifest.mn +++ b/security/nss/lib/ckfw/manifest.mn @@ -57,7 +57,7 @@ EXPORTS = \ nssckt.h \ $(NULL) -MODULE = security +MODULE = nss CSRCS = \ find.c \ @@ -74,6 +74,6 @@ CSRCS = \ mechanism.c \ $(NULL) -REQUIRES = security nspr +REQUIRES = nspr LIBRARY_NAME = nssckfw diff --git a/security/nss/lib/crmf/manifest.mn b/security/nss/lib/crmf/manifest.mn index 67e145d09..9a1958bce 100644 --- a/security/nss/lib/crmf/manifest.mn +++ b/security/nss/lib/crmf/manifest.mn @@ -33,7 +33,7 @@ CORE_DEPTH = ../../.. -MODULE = security +MODULE = nss EXPORTS = \ crmf.h \ @@ -68,6 +68,4 @@ CSRCS = crmfenc.c \ asn1cmn.c \ $(NULL) -REQUIRES = dbm - LIBRARY_NAME = crmf diff --git a/security/nss/lib/cryptohi/manifest.mn b/security/nss/lib/cryptohi/manifest.mn index a4a76a7df..ff0125ac8 100644 --- a/security/nss/lib/cryptohi/manifest.mn +++ b/security/nss/lib/cryptohi/manifest.mn @@ -32,7 +32,7 @@ # CORE_DEPTH = ../../.. -MODULE = security +MODULE = nss REQUIRES = dbm diff --git a/security/nss/lib/dev/manifest.mn b/security/nss/lib/dev/manifest.mn index effab4805..6297b4cc3 100644 --- a/security/nss/lib/dev/manifest.mn +++ b/security/nss/lib/dev/manifest.mn @@ -45,7 +45,7 @@ PRIVATE_EXPORTS = \ EXPORTS = \ $(NULL) -MODULE = security +MODULE = nss CSRCS = \ devmod.c \ @@ -61,6 +61,6 @@ DEFINES = -DNSS_3_4_CODE PRIVATE_EXPORTS += devm.h devtm.h endif -REQUIRES = security nspr +REQUIRES = nspr LIBRARY_NAME = nssdev diff --git a/security/nss/lib/fortcrypt/manifest.mn b/security/nss/lib/fortcrypt/manifest.mn index 6dc9019c4..04057bcba 100644 --- a/security/nss/lib/fortcrypt/manifest.mn +++ b/security/nss/lib/fortcrypt/manifest.mn @@ -32,7 +32,7 @@ # CORE_DEPTH = ../../.. -MODULE = security +MODULE = nss LIBRARY_NAME = fort #LIBRARY_VERSION = 32 @@ -46,5 +46,5 @@ CSRCS = forsock.c \ EXPORTS = PRIVATE_EXPORTS = maci.h cryptint.h -REQUIRES = security dbm +REQUIRES = dbm diff --git a/security/nss/lib/fortcrypt/swfort/manifest.mn b/security/nss/lib/fortcrypt/swfort/manifest.mn index 6320cdd62..597d86c3c 100644 --- a/security/nss/lib/fortcrypt/swfort/manifest.mn +++ b/security/nss/lib/fortcrypt/swfort/manifest.mn @@ -32,7 +32,7 @@ # CORE_DEPTH = ../../../.. -MODULE = security +MODULE = nss LIBRARY_NAME = swfci #LIBRARY_VERSION = 12 @@ -49,4 +49,4 @@ DIRS = pkcs11 EXPORTS = swfort.h swfortt.h PRIVATE_EXPORTS = swforti.h swfortti.h -REQUIRES = security dbm nspr +REQUIRES = dbm nspr diff --git a/security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn b/security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn index 7ef8c2009..fce80320a 100644 --- a/security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn +++ b/security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn @@ -33,7 +33,7 @@ CORE_DEPTH = ../../../../.. -MODULE = security +MODULE = nss LIBRARY_NAME = swft #LIBRARY_VERSION = 32 @@ -52,7 +52,7 @@ INCLUDES = -I../.. EXPORTS = -REQUIRES = security dbm +REQUIRES = dbm DEFINES = -DSWFORT diff --git a/security/nss/lib/freebl/manifest.mn b/security/nss/lib/freebl/manifest.mn index 0a102e6ed..50b48d289 100644 --- a/security/nss/lib/freebl/manifest.mn +++ b/security/nss/lib/freebl/manifest.mn @@ -32,7 +32,7 @@ # CORE_DEPTH = ../../.. -MODULE = security +MODULE = nss ifndef FREEBL_RECURSIVE_BUILD LIBRARY_NAME = freebl diff --git a/security/nss/lib/jar/manifest.mn b/security/nss/lib/jar/manifest.mn index 9a47b1558..3ab975b84 100644 --- a/security/nss/lib/jar/manifest.mn +++ b/security/nss/lib/jar/manifest.mn @@ -29,7 +29,7 @@ # may use your version of this file under either the MPL or the # GPL. -MODULE = security +MODULE = nss LIBRARY_NAME = jar @@ -46,7 +46,7 @@ CSRCS = \ jarint.c \ $(NULL) -REQUIRES = security dbm +REQUIRES = dbm EXPORTS = jar.h jar-ds.h jarfile.h diff --git a/security/nss/lib/nss/manifest.mn b/security/nss/lib/nss/manifest.mn index 1fbdc045d..fe80ef67a 100644 --- a/security/nss/lib/nss/manifest.mn +++ b/security/nss/lib/nss/manifest.mn @@ -40,14 +40,14 @@ EXPORTS = \ nss.h \ $(NULL) -MODULE = security +MODULE = nss CSRCS = \ nssinit.c \ nssver.c \ $(NULL) -REQUIRES = security dbm +REQUIRES = dbm MAPFILE = $(OBJDIR)/nss.def diff --git a/security/nss/lib/pk11wrap/manifest.mn b/security/nss/lib/pk11wrap/manifest.mn index b72f15da9..49d7f3b6e 100644 --- a/security/nss/lib/pk11wrap/manifest.mn +++ b/security/nss/lib/pk11wrap/manifest.mn @@ -46,7 +46,7 @@ PRIVATE_EXPORTS = \ dev3hack.h \ $(NULL) -MODULE = security +MODULE = nss CSRCS = \ dev3hack.c \ @@ -65,7 +65,7 @@ CSRCS = \ pk11pbe.c \ $(NULL) -REQUIRES = security dbm +REQUIRES = dbm LIBRARY_NAME = pk11wrap diff --git a/security/nss/lib/pkcs12/manifest.mn b/security/nss/lib/pkcs12/manifest.mn index c8b4981d3..e40f8620f 100644 --- a/security/nss/lib/pkcs12/manifest.mn +++ b/security/nss/lib/pkcs12/manifest.mn @@ -41,7 +41,7 @@ EXPORTS = \ p12t.h \ $(NULL) -MODULE = security +MODULE = nss CSRCS = \ p12local.c \ @@ -53,6 +53,6 @@ CSRCS = \ p12d.c \ $(NULL) -REQUIRES = security dbm +REQUIRES = dbm LIBRARY_NAME = pkcs12 diff --git a/security/nss/lib/pkcs7/manifest.mn b/security/nss/lib/pkcs7/manifest.mn index 64cc3e05f..7f4c0ff81 100644 --- a/security/nss/lib/pkcs7/manifest.mn +++ b/security/nss/lib/pkcs7/manifest.mn @@ -43,7 +43,7 @@ PRIVATE_EXPORTS = \ p7local.h \ $(NULL) -MODULE = security +MODULE = nss CSRCS = \ certread.c \ @@ -55,6 +55,6 @@ CSRCS = \ secmime.c \ $(NULL) -REQUIRES = security dbm +REQUIRES = dbm LIBRARY_NAME = pkcs7 diff --git a/security/nss/lib/pki/manifest.mn b/security/nss/lib/pki/manifest.mn index c4bf70b24..835049c2a 100644 --- a/security/nss/lib/pki/manifest.mn +++ b/security/nss/lib/pki/manifest.mn @@ -44,7 +44,7 @@ PRIVATE_EXPORTS = \ EXPORTS = \ $(NULL) -MODULE = security +MODULE = nss CSRCS = \ asymmkey.c \ @@ -65,7 +65,7 @@ PRIVATE_EXPORTS += pkistore.h pki3hack.h pkitm.h pkim.h DEFINES = -DNSS_3_4_CODE endif -REQUIRES = security nspr +REQUIRES = nspr LIBRARY_NAME = nsspki LIBRARY_VERSION = 3 diff --git a/security/nss/lib/pki1/manifest.mn b/security/nss/lib/pki1/manifest.mn index b4d8c476a..2a70cf4fa 100644 --- a/security/nss/lib/pki1/manifest.mn +++ b/security/nss/lib/pki1/manifest.mn @@ -46,7 +46,7 @@ PRIVATE_EXPORTS = \ EXPORTS = \ $(NULL) -MODULE = security +MODULE = nss CSRCS = \ atav.c \ @@ -59,6 +59,6 @@ CSRCS = \ rdnseq.c \ $(NULL) -REQUIRES = security nspr +REQUIRES = nspr LIBRARY_NAME = pki1 diff --git a/security/nss/lib/smime/manifest.mn b/security/nss/lib/smime/manifest.mn index 328a55e25..10c559ef0 100644 --- a/security/nss/lib/smime/manifest.mn +++ b/security/nss/lib/smime/manifest.mn @@ -44,7 +44,7 @@ PRIVATE_EXPORTS = \ cmslocal.h \ $(NULL) -MODULE = security +MODULE = nss MAPFILE = $(OBJDIR)/smime.def CSRCS = \ @@ -71,7 +71,7 @@ CSRCS = \ smimever.c \ $(NULL) -REQUIRES = security dbm +REQUIRES = dbm LIBRARY_NAME = smime LIBRARY_VERSION = 3 diff --git a/security/nss/lib/softoken/manifest.mn b/security/nss/lib/softoken/manifest.mn index f19bde205..2d43a9db4 100644 --- a/security/nss/lib/softoken/manifest.mn +++ b/security/nss/lib/softoken/manifest.mn @@ -32,7 +32,7 @@ # CORE_DEPTH = ../../.. -MODULE = security +MODULE = nss REQUIRES = dbm diff --git a/security/nss/lib/ssl/manifest.mn b/security/nss/lib/ssl/manifest.mn index 066c5620c..ae6431a27 100644 --- a/security/nss/lib/ssl/manifest.mn +++ b/security/nss/lib/ssl/manifest.mn @@ -48,7 +48,7 @@ EXPORTS = \ preenc.h \ $(NULL) -MODULE = security +MODULE = nss MAPFILE = $(OBJDIR)/ssl.def CSRCS = \ @@ -77,7 +77,7 @@ CSRCS = \ $(NULL) -REQUIRES = security dbm +REQUIRES = dbm LIBRARY_NAME = ssl LIBRARY_VERSION = 3 diff --git a/security/nss/lib/util/manifest.mn b/security/nss/lib/util/manifest.mn index f793abe08..b7d9a00d2 100644 --- a/security/nss/lib/util/manifest.mn +++ b/security/nss/lib/util/manifest.mn @@ -85,7 +85,7 @@ CSRCS = \ utf8.c \ $(NULL) -MODULE = security +MODULE = nss # don't duplicate module name in REQUIRES REQUIRES = dbm diff --git a/security/nss/manifest.mn b/security/nss/manifest.mn index 97533f29e..778f366eb 100644 --- a/security/nss/manifest.mn +++ b/security/nss/manifest.mn @@ -37,7 +37,7 @@ IMPORTS = nspr20/v4.2 \ dbm/DBM_1_61_RTM \ $(NULL) -RELEASE = security +RELEASE = nss DIRS = lib cmd diff --git a/security/nss/tests/pkcs11/netscape/suites/manifest.mn b/security/nss/tests/pkcs11/netscape/suites/manifest.mn index 119fd5509..5eb557d84 100644 --- a/security/nss/tests/pkcs11/netscape/suites/manifest.mn +++ b/security/nss/tests/pkcs11/netscape/suites/manifest.mn @@ -32,15 +32,6 @@ # CORE_DEPTH = ../../../../.. -# MODULE = sectools - -# IMPORTS = nspr20/19971209C \ -# dbm/DBM_1_5 \ -# security/HCL_1_5 \ -# sectools/bin/19971218 \ -# sectools/lib/19971218 \ -# $(NULL) - DIRS = security \ $(NULL) diff --git a/security/nss/tests/pkcs11/netscape/suites/security/pkcs11/manifest.mn b/security/nss/tests/pkcs11/netscape/suites/security/pkcs11/manifest.mn index 1d3d7a4b5..eca912157 100644 --- a/security/nss/tests/pkcs11/netscape/suites/security/pkcs11/manifest.mn +++ b/security/nss/tests/pkcs11/netscape/suites/security/pkcs11/manifest.mn @@ -39,7 +39,7 @@ CSRCS = pk11test.c PROGRAM = pk11test -REQUIRES = seccmd dbm security +REQUIRES = seccmd dbm nss REGRESSION_SPEC = pkcs11.reg diff --git a/security/nss/tests/pkcs11/netscape/suites/security/ssl/manifest.mn b/security/nss/tests/pkcs11/netscape/suites/security/ssl/manifest.mn index 532bb61dd..46c8a7d53 100644 --- a/security/nss/tests/pkcs11/netscape/suites/security/ssl/manifest.mn +++ b/security/nss/tests/pkcs11/netscape/suites/security/ssl/manifest.mn @@ -43,14 +43,7 @@ CSRCS = sslt.c \ PROGRAM = sslt -#IMPORTS = nspr20/19980120 \ -# sectools/bin/STP_1_51 \ -# sectools/lib/STP_1_51 \ -# security/HCL_1_51 \ -# dbm/DBM_1_5 \ -# $(NULL) - -REQUIRES = security dbm seccmd +REQUIRES = nss dbm seccmd DEFINES = -DNSPR20 -DREPLACER -- cgit v1.2.1