14 files changed, 0 insertions, 730 deletions
diff --git a/security/nss/Makefile b/security/nss/Makefile
deleted file mode 100644
index c1a8920bd..000000000
--- a/security/nss/Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-# Ports collection Makefile for:	nss
-# Date created:				18 December 2001
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
-#
-# $FreeBSD$
-#    $MCom: ports/security/nss/Makefile,v 1.5 2006/12/17 18:42:25 ahze Exp $
-
-PORTNAME=	nss
-PORTVERSION=	${_MAJOR}.${_MINOR}.${_PATCH}
-PORTREVISION=	4
-CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Libraries to support development of security-enabled applications
-
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	nspr4.1:${PORTSDIR}/devel/nspr
-
-_MAJOR=	3
-_MINOR=	11
-_PATCH=	4
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/mozilla/security/nss
-
-USE_LDCONFIG=	${PREFIX}/lib/nss
-USE_GMAKE=	yes
-USE_PERL5_BUILD=yes
-MAKE_ENV=	BSD_LDOPTS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
-		BUILD_OPT=1
-ALL_TARGET=	nss_build_all
-CFLAGS+=	-I${LOCALBASE}/include/nspr
-
-DIST=		${WRKSRC:H:H}/dist
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "alpha" && ${OSVERSION} < 500035
-IGNORE=	core dumps on alpha during build
-.endif
-
-EXTERNALS=	CVS dbm security/nss/cmd/zlib nsprpub security/dbm
-EXTRACT_AFTER_ARGS=| ${TAR} -xf -	\
-	${EXTERNALS:C,^,--exclude ${DISTNAME}/mozilla/,}
-
-BINS=${DIST}/${OPSYS}${OSREL}_OPT.OBJ
-
-INSTALL_BINS=	certcgi certutil checkcert cmsutil crlutil derdump makepqg \
-		mangle modutil ocspclnt oidcalc p7content p7env p7sign \
-		p7verify pk12util rsaperf shlibsign signtool signver \
-		ssltap strsclnt symkeyutil vfychain vfyserv
-
-test:
-	cd ${WRKSRC}/tests;	\
-		${SETENV} PATH="${BINS}/bin:${PATH}" \
-		    LD_LIBRARY_PATH="${BINS}/lib" \
-			./all.sh
-	@if ${GREP} -F '>Failed<'	\
-	    ${WRKSRC:H:H}/tests_results/security/*/results.html; then	\
-		echo "Some tests have failed. Let ${MAINTAINER} know.";	\
-		exit 1;	\
-	else	\
-		echo "All tests succeeded. Good news.";	\
-	fi
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" \
-		${WRKSRC:H:H}/security/coreconf/FreeBSD.mk
-	@${SED} -e 's|@exec_prefix@|${PREFIX}|; \
-		s|@includedir@|${PREFIX}/include/nss|; \
-		s|@libdir@|${PREFIX}/lib/nss|; \
-		s|@prefix@|${PREFIX}|' \
-		${FILESDIR}/nss-config.in >${WRKDIR}/nss-config
-	@${SED} -e 's|@PREFIX@|${PREFIX}|; s|@PORTVERSION@|${PORTVERSION}|' \
-		${FILESDIR}/nss.pc.in >${WRKDIR}/nss.pc
-.for i in MAJOR MINOR PATCH
-	@${SED} -i.${i} -e 's|@${i}@|${_${i}}|' ${WRKDIR}/nss-config
-.endfor
-
-do-install:
-	${MKDIR} ${PREFIX}/include/nss ${PREFIX}/lib/nss
-	${TAR} -C ${DIST}/public --dereference -cf - . | \
-		${TAR} -C ${PREFIX}/include/nss -xf -
-	${INSTALL_DATA} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib/*.so.1 \
-		${PREFIX}/lib/nss
-	${INSTALL_DATA} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib/libcrmf.a \
-	    	${PREFIX}/lib/nss
-.for bin in ${INSTALL_BINS}
-	${INSTALL_PROGRAM} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/bin/${bin} \
-		${PREFIX}/bin
-.endfor
-	cd ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib && \
-	    	${TAR} -cf - *.so | ${TAR} --unlink -C ${PREFIX}/lib/nss -xf -
-	${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKDIR}/nss.pc ${PREFIX}/libdata/pkgconfig
-
-.include <bsd.port.post.mk>
diff --git a/security/nss/distinfo b/security/nss/distinfo
deleted file mode 100644
index 11baff729..000000000
--- a/security/nss/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (nss-3.11.4.tar.gz) = 74af8ebdf94307f47ff8931adbef9c39
-SHA256 (nss-3.11.4.tar.gz) = c50062df123d733f25d4903f42e8855adf51b7324c786c714f7dd1ab9e328f06
-SIZE (nss-3.11.4.tar.gz) = 3713920
diff --git a/security/nss/files/nss-config.in b/security/nss/files/nss-config.in
deleted file mode 100644
index d2605fec9..000000000
--- a/security/nss/files/nss-config.in
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-
-major_version=@MAJOR@
-minor_version=@MINOR@
-patch_version=@PATCH@
-
-usage()
-{
-	cat <<EOF
-Usage: nss-config [OPTIONS] [LIBRARIES]
-Options:
-	[--prefix[=DIR]]
-	[--exec-prefix[=DIR]]
-	[--includedir[=DIR]]
-	[--libdir[=DIR]]
-	[--version]
-	[--libs]
-	[--cflags]
-Dynamic Libraries:
-	nss
-	ssl
-	smime
-EOF
-	exit $1
-}
-
-if test $# -eq 0; then
-	usage 1 1>&2
-fi
-
-lib_ssl=yes
-lib_smime=yes
-lib_nss=yes
-
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      prefix=$optarg
-      ;;
-    --prefix)
-      echo_prefix=yes
-      ;;
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      ;;
-    --exec-prefix)
-      echo_exec_prefix=yes
-      ;;
-    --includedir=*)
-      includedir=$optarg
-      ;;
-    --includedir)
-      echo_includedir=yes
-      ;;
-    --libdir=*)
-      libdir=$optarg
-      ;;
-    --libdir)
-      echo_libdir=yes
-      ;;
-    --version)
-      echo ${major_version}.${minor_version}.${patch_version}
-      ;;
-    --cflags)
-      echo_cflags=yes
-      ;;
-    --libs)
-      echo_libs=yes
-      ;;
-    ssl)
-      lib_ssl=yes
-      ;;
-    smime)
-      lib_smime=yes
-      ;;
-    nss)
-      lib_nss=yes
-      ;;
-    *)
-      usage 1 1>&2
-      ;;
-  esac
-  shift
-done
-
-# Set variables that may be dependent upon other variables
-if test -z "$exec_prefix"; then
-    exec_prefix=@exec_prefix@
-fi
-if test -z "$includedir"; then
-    includedir=@includedir@
-fi
-if test -z "$libdir"; then
-    libdir=@libdir@
-fi
-
-if test "$echo_prefix" = "yes"; then
-    echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
-    echo $exec_prefix
-fi
-
-if test "$echo_includedir" = "yes"; then
-    echo $includedir
-fi
-
-if test "$echo_libdir" = "yes"; then
-    echo $libdir
-fi
-
-if test "$echo_cflags" = "yes"; then
-    echo -I$includedir
-fi
-
-if test "$echo_libs" = "yes"; then
-      libdirs="-Wl,-R$libdir -L$libdir"
-      if test -n "$lib_ssl"; then
-	libdirs="$libdirs -lssl${major_version}"
-      fi
-      if test -n "$lib_smime"; then
-	libdirs="$libdirs -lsmime${major_version}"
-      fi
-      if test -n "$lib_nss"; then
-	libdirs="$libdirs -lnss${major_version}"
-      fi
-      echo $libdirs
-fi      
-
diff --git a/security/nss/files/nss.pc.in b/security/nss/files/nss.pc.in
deleted file mode 100644
index 7b1714374..000000000
--- a/security/nss/files/nss.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@PREFIX@
-libdir=@PREFIX@/lib/nss
-includedir=@PREFIX@/include
-
-Name: NSS
-Description: Mozilla Network Security Services
-Version: @PORTVERSION@
-Requires: nspr
-Libs: -L${libdir} -lnss3 -lsmime3 -lssl3
-Cflags: -I${includedir}/nss -I${includedir}/nss/nss
diff --git a/security/nss/files/patch-..::coreconf::FreeBSD.mk b/security/nss/files/patch-..::coreconf::FreeBSD.mk
deleted file mode 100644
index 7a0417e0f..000000000
--- a/security/nss/files/patch-..::coreconf::FreeBSD.mk
+++ /dev/null
@@ -1,62 +0,0 @@
---- ../coreconf/FreeBSD.mk.orig	Sat Jan 21 03:36:11 2006
-+++ ../coreconf/FreeBSD.mk	Tue Jan 30 21:13:41 2007
-@@ -37,9 +37,9 @@
- 
- include $(CORE_DEPTH)/coreconf/UNIX.mk
- 
--DEFAULT_COMPILER	= gcc
--CC			= gcc
--CCC			= g++
-+DEFAULT_COMPILER	= $(CC)
-+CC			?= gcc
-+CCC			= $(CXX)
- RANLIB			= ranlib
- 
- ifeq ($(OS_TEST),alpha)
-@@ -49,8 +49,14 @@
- endif
- 
- OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+OS_LIBS			= $(BSD_LDOPTS)
-+OPTIMIZER		=
- 
-+ifeq ($(OS_TEST),sparc64)
- DSO_CFLAGS		= -fPIC
-+else
-+DSO_CFLAGS		= -fpic
-+endif
- DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
- 
- #
-@@ -60,20 +66,18 @@
- USE_PTHREADS		= 1
- DEFINES			+= -D_THREAD_SAFE -D_REENTRANT
- OS_LIBS			+= -pthread
--DSO_LDOPTS		+= -pthread
-+DSO_LDOPTS		+= $(BSD_LDOPTS)
- endif
- 
- ARCH			= freebsd
- 
--MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+DLL_SUFFIX		= so.1
- 
--ifeq ($(MOZ_OBJFORMAT),elf)
--DLL_SUFFIX		= so
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS)
- else
--DLL_SUFFIX		= so.1.0
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
- endif
--
--MKSHLIB			= $(CC) $(DSO_LDOPTS)
- ifdef MAPFILE
- 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
- endif
-@@ -83,3 +87,5 @@
- G++INCLUDES		= -I/usr/include/g++
- 
- INCLUDES		+= -I/usr/X11R6/include
-+USE_SYSTEM_ZLIB		= 1
-+ZLIB_LIBS		= -lz
diff --git a/security/nss/files/patch-..::coreconf::command.mk b/security/nss/files/patch-..::coreconf::command.mk
deleted file mode 100644
index 1e3de66f7..000000000
--- a/security/nss/files/patch-..::coreconf::command.mk
+++ /dev/null
@@ -1,9 +0,0 @@
---- ../coreconf/command.mk	Mon Oct 10 19:46:12 2005
-+++ ../coreconf/command.mk	Wed Jan 18 17:23:28 2006
-@@ -46,5 +46,5 @@
- LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
- LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
--CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
-+CFLAGS        += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
- 		$(XCFLAGS)
- RANLIB        = echo
diff --git a/security/nss/files/patch-..::coreconf::rules.mk b/security/nss/files/patch-..::coreconf::rules.mk
deleted file mode 100644
index 59178ff6d..000000000
--- a/security/nss/files/patch-..::coreconf::rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../coreconf/rules.mk.orig	Thu Apr  3 16:48:00 2003
-+++ ../coreconf/rules.mk	Fri Apr 11 01:01:50 2003
-@@ -110,6 +110,7 @@
- endif
- ifdef SHARED_LIBRARY
- 	$(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR)
-+	ln -sf $(notdir $(SHARED_LIBRARY)) $(SOURCE_LIB_DIR)/$(notdir $(SHARED_LIBRARY:.so.1=.so))
- endif
- ifdef IMPORT_LIBRARY
- 	$(INSTALL) -m 775 $(IMPORT_LIBRARY) $(SOURCE_LIB_DIR)
diff --git a/security/nss/files/patch-Makefile b/security/nss/files/patch-Makefile
deleted file mode 100644
index af20e9a2a..000000000
--- a/security/nss/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Thu Apr 14 20:28:40 2005
-+++ Makefile	Tue Aug 30 15:32:11 2005
-@@ -78,7 +78,7 @@
- # (7) Execute "local" rules. (OPTIONAL).                              #
- #######################################################################
- 
--nss_build_all: build_coreconf build_nspr build_dbm all
-+nss_build_all: build_coreconf all
- 
- build_coreconf:
- 	cd $(CORE_DEPTH)/coreconf ;  $(MAKE)
diff --git a/security/nss/files/patch-cmd::platlibs.mk b/security/nss/files/patch-cmd::platlibs.mk
deleted file mode 100644
index 4ac01e3e4..000000000
--- a/security/nss/files/patch-cmd::platlibs.mk
+++ /dev/null
@@ -1,14 +0,0 @@
---- cmd/platlibs.mk	Wed Apr  6 17:35:41 2005
-+++ cmd/platlibs.mk	Wed Jul 27 22:22:59 2005
-@@ -72,5 +72,4 @@
- 	$(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
- 	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
--	$(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
- 	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
- 	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
-@@ -120,5 +118,4 @@
- 	$(CRYPTOLIB) \
- 	$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
--	$(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
- 	$(NULL)
- 
diff --git a/security/nss/files/patch-const b/security/nss/files/patch-const
deleted file mode 100644
index de5fae9f6..000000000
--- a/security/nss/files/patch-const
+++ /dev/null
@@ -1,46 +0,0 @@
---- cmd/modutil/modutil.h	Sun Apr 25 11:02:47 2004
-+++ cmd/modutil/modutil.h	Fri Jul 22 17:35:20 2005
-@@ -53,6 +53,6 @@
- #include "error.h"
- 
--Error FipsMode(char *arg);
--Error ChkFipsMode(char *arg);
-+Error FipsMode(const char *arg);
-+Error ChkFipsMode(const char *arg);
- Error AddModule(char *moduleName, char *libFile, char *ciphers,
-       char *mechanisms, char* modparms);
---- cmd/modutil/pk11.c	Sun Apr 25 11:02:47 2004
-+++ cmd/modutil/pk11.c	Fri Jul 22 17:36:48 2005
-@@ -53,5 +53,5 @@
-  */
- Error
--FipsMode(char *arg)
-+FipsMode(const char *arg)
- {
-     char *internal_name;
-@@ -62,14 +62,16 @@
- 		SECMOD_GetInternalModule()->commonName);
- 	    if(SECMOD_DeleteInternalModule(internal_name) != SECSuccess) {
--		PR_fprintf(PR_STDERR, "%s\n", SECU_Strerror(PORT_GetError()));
-+		PR_fprintf(PR_STDERR, "FipsMode(true): %s (%s)\n", SECU_Strerror(PORT_GetError()), internal_name);
- 		PR_smprintf_free(internal_name);
- 		PR_fprintf(PR_STDERR, errStrings[FIPS_SWITCH_FAILED_ERR]);
- 		return FIPS_SWITCH_FAILED_ERR;
- 	    }
--	    PR_smprintf_free(internal_name);
- 	    if (!PK11_IsFIPS()) {
-+		PR_fprintf(PR_STDERR, "FipsMode(true): in module %s", internal_name);
-+	        PR_smprintf_free(internal_name);
- 		PR_fprintf(PR_STDERR, errStrings[FIPS_SWITCH_FAILED_ERR]);
- 		return FIPS_SWITCH_FAILED_ERR;
- 	    }
-+	    PR_smprintf_free(internal_name);
- 	    PR_fprintf(PR_STDOUT, msgStrings[FIPS_ENABLED_MSG]);
- 	} else {
-@@ -112,5 +114,5 @@
-  */
- Error
--ChkFipsMode(char *arg)
-+ChkFipsMode(const char *arg)
- {
-     if(!PORT_Strcasecmp(arg, "true")) {
diff --git a/security/nss/files/patch-sysdb b/security/nss/files/patch-sysdb
deleted file mode 100644
index 79d5f20ee..000000000
--- a/security/nss/files/patch-sysdb
+++ /dev/null
@@ -1,179 +0,0 @@
-This patches NSS' code to use the Operating System's standard <db.h> header
-and the db-implementation from -lc. Seems to work on FreeBSD.
-
-	-mi
-
---- lib/softoken/cdbhdl.h	Sun Apr 25 11:03:16 2004
-+++ lib/softoken/cdbhdl.h	Fri Jul 22 00:25:16 2005
-@@ -43,6 +43,6 @@
- #define _CDBHDL_H_
- 
--#include "nspr.h"
--#include "mcom_db.h"
-+#include <nspr.h>
-+#include <db.h>
- #include "pcertt.h"
- 
---- lib/softoken/dbinit.c	Tue Mar 29 13:21:18 2005
-+++ lib/softoken/dbinit.c	Fri Jul 22 00:33:35 2005
-@@ -40,4 +40,5 @@
- 
- #include <ctype.h>
-+#include <fcntl.h>
- #include "seccomon.h"
- #include "prinit.h"
---- lib/softoken/dbmshim.c	Tue Mar 29 13:21:18 2005
-+++ lib/softoken/dbmshim.c	Fri Jul 22 00:35:33 2005
-@@ -40,5 +40,6 @@
-  * $Id: patch-sysdb,v 1.1 2006-12-09 15:17:54 ahze Exp $
-  */
--#include "mcom_db.h"
-+#include <db.h>
-+#include <fcntl.h>
- #include "secitem.h"
- #include "secder.h"
---- lib/softoken/keydb.c	Fri Jun  4 20:50:32 2004
-+++ lib/softoken/keydb.c	Fri Jul 22 00:37:01 2005
-@@ -46,5 +46,6 @@
- #include "secitem.h"
- #include "pcert.h"
--#include "mcom_db.h"
-+#include <db.h>
-+#include <fcntl.h>
- #include "lowpbe.h"
- #include "secerr.h"
---- lib/softoken/pcertdb.c	Tue Mar 29 13:21:18 2005
-+++ lib/softoken/pcertdb.c	Fri Jul 22 00:40:00 2005
-@@ -44,5 +44,6 @@
- #include "lowkeyti.h"
- #include "pcert.h"
--#include "mcom_db.h"
-+#include <db.h>
-+#include <fcntl.h>
- #include "pcert.h"
- #include "secitem.h"
---- lib/softoken/pk11db.c	Fri Apr  1 19:46:13 2005
-+++ lib/softoken/pk11db.c	Fri Jul 22 00:42:01 2005
-@@ -42,5 +42,6 @@
- #include "pk11pars.h"
- #include "pkcs11i.h"
--#include "mcom_db.h"
-+#include <db.h>
-+#include <fcntl.h>
- #include "cdbhdl.h"
- #include "secerr.h"
---- lib/softoken/keydbi.h	Tue Apr 27 19:04:38 2004
-+++ lib/softoken/keydbi.h	Fri Jul 22 00:43:24 2005
-@@ -42,7 +42,7 @@
- #define _KEYDBI_H_
- 
--#include "nspr.h"
-+#include <nspr.h>
- #include "seccomon.h"
--#include "mcom_db.h"
-+#include <db.h>
- 
- /*
---- lib/softoken/config.mk	Mon May 24 20:13:11 2004
-+++ lib/softoken/config.mk	Fri Jul 22 00:55:20 2005
-@@ -47,5 +47,4 @@
- 	$(CRYPTOLIB) \
- 	$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
--	$(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
- 	$(NULL)
- 
---- lib/certdb/certdb.c	Sat Mar  5 03:03:03 2005
-+++ lib/certdb/certdb.c	Fri Jul 22 01:02:11 2005
-@@ -53,5 +53,4 @@
- #include "keyhi.h"
- #include "secitem.h"
--#include "mcom_db.h"
- #include "certdb.h"
- #include "prprf.h"
---- lib/certdb/genname.c	Sun Apr 25 11:03:03 2004
-+++ lib/certdb/genname.c	Fri Jul 22 01:02:59 2005
-@@ -39,5 +39,4 @@
- #include "secitem.h"
- #include "secoidt.h"
--#include "mcom_db.h"
- #include "secasn1.h"
- #include "secder.h"
---- lib/certdb/stanpcertdb.c	Thu Dec  2 16:34:15 2004
-+++ lib/certdb/stanpcertdb.c	Fri Jul 22 01:03:19 2005
-@@ -38,5 +38,4 @@
- 
- #include "cert.h"
--#include "mcom_db.h"
- #include "certdb.h"
- #include "secitem.h"
---- lib/certdb/xauthkid.c	Sun Apr 25 11:03:03 2004
-+++ lib/certdb/xauthkid.c	Fri Jul 22 01:03:54 2005
-@@ -40,6 +40,5 @@
-  */
- 
--#include "prtypes.h"
--#include "mcom_db.h"
-+#include <prtypes.h>
- #include "seccomon.h"
- #include "secdert.h"
---- lib/certdb/xbsconst.c	Sun Apr 25 11:03:03 2004
-+++ lib/certdb/xbsconst.c	Fri Jul 22 01:05:41 2005
-@@ -39,6 +39,6 @@
-  */
- 
--#include "prtypes.h"
--#include "mcom_db.h"
-+#include <limits.h>	/* LONG_MAX */
-+#include <prtypes.h>
- #include "seccomon.h"
- #include "secdert.h"
-@@ -48,5 +48,5 @@
- #include "certt.h"
- #include "secder.h"
--#include "prprf.h"
-+#include <prprf.h>
- #include "secerr.h"
- 
---- lib/certdb/xconst.c	Tue Nov  9 01:13:32 2004
-+++ lib/certdb/xconst.c	Fri Jul 22 01:06:20 2005
-@@ -39,6 +39,5 @@
-  */
- 
--#include "prtypes.h"
--#include "mcom_db.h"
-+#include <prtypes.h>
- #include "seccomon.h"
- #include "secdert.h"
-@@ -48,5 +47,5 @@
- #include "cert.h"
- #include "secder.h"
--#include "prprf.h"
-+#include <prprf.h>
- #include "xconst.h"
- #include "genname.h"
---- lib/ckfw/dbm/ckdbm.h	Wed Jan 19 21:25:47 2005
-+++ lib/ckfw/dbm/ckdbm.h	Fri Jul 22 01:06:58 2005
-@@ -57,5 +57,5 @@
- #endif /* CKT_H */
- 
--#include "mcom_db.h"
-+#include <db.h>
- 
- NSS_EXTERN_DATA NSSCKMDInstance nss_dbm_mdInstance;
---- lib/freebl/mac_rand.c	Sun Apr 25 11:03:08 2004
-+++ lib/freebl/mac_rand.c	Fri Jul 22 01:08:19 2005
-@@ -40,5 +40,4 @@
- #endif
- #include "secrng.h"
--#include "mcom_db.h"
- #ifdef XP_MAC
- #include <Events.h>
---- lib/pk11wrap/secmodi.h	Mon Mar 28 15:45:37 2005
-+++ lib/pk11wrap/secmodi.h	Fri Jul 22 01:08:47 2005
-@@ -42,5 +42,5 @@
- #include "pkcs11.h"
- #include "nssilock.h"
--#include "mcom_db.h"
-+#include <db.h>
- #include "secoidt.h"
- #include "secdert.h"
diff --git a/security/nss/files/patch-tests b/security/nss/files/patch-tests
deleted file mode 100644
index 2ff07f35a..000000000
--- a/security/nss/files/patch-tests
+++ /dev/null
@@ -1,10 +0,0 @@
---- tests/common/init.sh	Mon Apr 11 22:24:17 2005
-+++ tests/common/init.sh	Fri Jul 22 16:55:36 2005
-@@ -197,5 +197,6 @@
-     case $HOST in
-         *\.*)
--            HOST=`echo $HOST | sed -e "s/\..*//"`
-+	    DOMSUF=${HOST#*.}	# remove Smallest Prefix matching ``*.''
-+	    HOST=${HOST%%.*}	# remove Largest Suffix ``.*''. See sh(1)
-             ;;
-         ?*)
diff --git a/security/nss/pkg-descr b/security/nss/pkg-descr
deleted file mode 100644
index 4d06c9a0a..000000000
--- a/security/nss/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Network Security Services (NSS) is a set of libraries designed to support
-cross-platform development of security-enabled server applications.
-Applications built with NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7,
-PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security
-standards.
-
-WWW: http://www.mozilla.org/projects/security/pki/nss/
diff --git a/security/nss/pkg-plist b/security/nss/pkg-plist
deleted file mode 100644
index cc12145c7..000000000
--- a/security/nss/pkg-plist
+++ /dev/null
@@ -1,133 +0,0 @@
-bin/certcgi
-bin/certutil
-bin/checkcert
-bin/cmsutil
-bin/crlutil
-bin/derdump
-bin/makepqg
-bin/mangle
-bin/modutil
-bin/nss-config
-bin/ocspclnt
-bin/oidcalc
-bin/p7content
-bin/p7env
-bin/p7sign
-bin/p7verify
-bin/pk12util
-bin/rsaperf
-bin/shlibsign
-bin/signtool
-bin/signver
-bin/ssltap
-bin/strsclnt
-bin/symkeyutil
-bin/vfychain
-bin/vfyserv
-include/nss/nss/base64.h
-include/nss/nss/blapit.h
-include/nss/nss/cert.h
-include/nss/nss/certdb.h
-include/nss/nss/certt.h
-include/nss/nss/ciferfam.h
-include/nss/nss/cmmf.h
-include/nss/nss/cmmft.h
-include/nss/nss/cms.h
-include/nss/nss/cmsreclist.h
-include/nss/nss/cmst.h
-include/nss/nss/crmf.h
-include/nss/nss/crmft.h
-include/nss/nss/cryptohi.h
-include/nss/nss/cryptoht.h
-include/nss/nss/ecl-exp.h
-include/nss/nss/hasht.h
-include/nss/nss/jar-ds.h
-include/nss/nss/jar.h
-include/nss/nss/jarfile.h
-include/nss/nss/key.h
-include/nss/nss/keyhi.h
-include/nss/nss/keyt.h
-include/nss/nss/keythi.h
-include/nss/nss/nss.h
-include/nss/nss/nssb64.h
-include/nss/nss/nssb64t.h
-include/nss/nss/nssbase.h
-include/nss/nss/nssbaset.h
-include/nss/nss/nssck.api
-include/nss/nss/nssckbi.h
-include/nss/nss/nssckepv.h
-include/nss/nss/nssckft.h
-include/nss/nss/nssckfw.h
-include/nss/nss/nssckfwc.h
-include/nss/nss/nssckfwt.h
-include/nss/nss/nssckg.h
-include/nss/nss/nssckmdt.h
-include/nss/nss/nssckt.h
-include/nss/nss/nssilckt.h
-include/nss/nss/nssilock.h
-include/nss/nss/nsslocks.h
-include/nss/nss/nssrwlk.h
-include/nss/nss/nssrwlkt.h
-include/nss/nss/ocsp.h
-include/nss/nss/ocspt.h
-include/nss/nss/p12.h
-include/nss/nss/p12plcy.h
-include/nss/nss/p12t.h
-include/nss/nss/pk11func.h
-include/nss/nss/pk11pqg.h
-include/nss/nss/pk11priv.h
-include/nss/nss/pk11pub.h
-include/nss/nss/pk11sdr.h
-include/nss/nss/pkcs11.h
-include/nss/nss/pkcs11f.h
-include/nss/nss/pkcs11n.h
-include/nss/nss/pkcs11p.h
-include/nss/nss/pkcs11t.h
-include/nss/nss/pkcs11u.h
-include/nss/nss/pkcs12.h
-include/nss/nss/pkcs12t.h
-include/nss/nss/pkcs7t.h
-include/nss/nss/portreg.h
-include/nss/nss/preenc.h
-include/nss/nss/secasn1.h
-include/nss/nss/secasn1t.h
-include/nss/nss/seccomon.h
-include/nss/nss/secder.h
-include/nss/nss/secdert.h
-include/nss/nss/secdig.h
-include/nss/nss/secdigt.h
-include/nss/nss/secerr.h
-include/nss/nss/sechash.h
-include/nss/nss/secitem.h
-include/nss/nss/secmime.h
-include/nss/nss/secmod.h
-include/nss/nss/secmodt.h
-include/nss/nss/secoid.h
-include/nss/nss/secoidt.h
-include/nss/nss/secpkcs5.h
-include/nss/nss/secpkcs7.h
-include/nss/nss/secport.h
-include/nss/nss/shsign.h
-include/nss/nss/smime.h
-include/nss/nss/ssl.h
-include/nss/nss/sslerr.h
-include/nss/nss/sslproto.h
-include/nss/nss/sslt.h
-include/nss/nss/watcomfx.h
-lib/nss/libcrmf.a
-lib/nss/libfreebl3.so
-lib/nss/libfreebl3.so.1
-lib/nss/libnss3.so
-lib/nss/libnss3.so.1
-lib/nss/libnssckbi.so
-lib/nss/libnssckbi.so.1
-lib/nss/libsmime3.so
-lib/nss/libsmime3.so.1
-lib/nss/libsoftokn3.so
-lib/nss/libsoftokn3.so.1
-lib/nss/libssl3.so
-lib/nss/libssl3.so.1
-libdata/pkgconfig/nss.pc
-@dirrm lib/nss
-@dirrm include/nss/nss
-@dirrm include/nss