--- Makefile	(revision 449697)
+++ Makefile	(working copy)
@@ -1,3 +1,4 @@ 
+# Created by: Brooks Davis <brooks@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ca_root_nss
@@ -9,7 +10,8 @@ 
 MAINTAINER=	ports-secteam@FreeBSD.org
 COMMENT=	Root certificate bundle from the Mozilla Project
 
-LICENSE=	MPL
+LICENSE=	MPL20
+LICENSE_FILE=	${WRKSRC}/nss/COPYING
 
 OPTIONS_DEFINE=		ETCSYMLINK
 OPTIONS_DEFAULT=	ETCSYMLINK
@@ -22,7 +24,6 @@ 
 USES=		perl5 ssl:build
 USE_PERL5=	build
 NO_ARCH=	yes
-NO_WRKSUBDIR=	yes
 
 CERTDIR?=	share/certs
 PLIST_SUB+=	CERTDIR=${CERTDIR}
@@ -34,7 +35,7 @@ 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 VERSION_NSS=	3.32.1
 #NSS_SUFFIX=	-with-ckbi-1.98
-CERTDATA_TXT_PATH=	nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt
+CERTDATA_TXT_PATH=	nss/lib/ckfw/builtins/certdata.txt
 BUNDLE_PROCESSOR=	MAca-bundle.pl
 
 SUB_FILES=	MAca-bundle.pl pkg-message
@@ -42,17 +43,10 @@ 
 
 .include <bsd.port.options.mk>
 
-do-extract:
-	@${MKDIR} ${WRKDIR}
-	@${TAR} -C ${WRKDIR} -xf ${DISTDIR}/nss-${VERSION_NSS}${NSS_SUFFIX}${EXTRACT_SUFX} \
-	    ${CERTDATA_TXT_PATH}
-	@${CP} ${WRKDIR}/${CERTDATA_TXT_PATH} ${WRKDIR}
-	@${RM} -r ${WRKDIR}/nss-${VERSION_NSS}
-
 do-build:	apply-slist
 	@${SETENV} PATH=${LOCALBASE}/bin:$${PATH} \
 		${PERL} ${WRKDIR}/${BUNDLE_PROCESSOR} \
-	    < ${WRKDIR}/certdata.txt > \
+	    < ${WRKSRC}/${CERTDATA_TXT_PATH} > \
 	    ${WRKDIR}/ca-root-nss.crt
 
 do-install: