Index: head/games/nwndata/Makefile
===================================================================
--- head/games/nwndata/Makefile	(revision 562113)
+++ head/games/nwndata/Makefile	(revision 562114)
@@ -1,55 +1,58 @@
 # Created by: Erik Olson <erikolson@olsonexpress.com>
 # $FreeBSD$
 
 PORTNAME=	nwndata
 PORTVERSION=	${NWNVER}
 PORTREVISION=	${NWNREV}
 CATEGORIES=	games
 MASTER_SITES=	http://na.llnet.bioware.cdn.ea.com/u/f/eagames/bioware/neverwinternights/updates/linux/ \
 		http://lvlt.bioware.cdn.ea.com/bioware/u/f/eagames/bioware/neverwinternights/updates/linux/
 DISTNAME=	${NWRESOURCES}
 .if defined(CDROM_MOUNT) && exists(${CDROM_MOUNT}/KingmakerSetup.exe)
 DISTFILES=
 .endif
 
 MAINTAINER=	scf@FreeBSD.org
 COMMENT=	Neverwinter Nights Data Files
 
+LICENSE=	Proprietary
+
+ONLY_FOR_ARCHS=	amd64 i386
+ONLY_FOR_ARCHS_REASON=	Binary Distribution on x86 only
+
 # Setup port based upon whether this is the Diamond edition or straight NWN.
 .if defined(CDROM_MOUNT) && exists(${CDROM_MOUNT}/KingmakerSetup.exe)
 NWNVER=		1.61
 NWNREV=		0
 NWN_DIAMOND=	yes
 
-EXTRACT_DEPENDS+=	7z:archivers/p7zip
+USES=		7z:p7zip zip
 
 PLIST_SUB+=	DIAMOND="" ORIGINAL="@comment "
 .else
 NWNVER=		1.29
 NWNREV=		3
 NWRESOURCES=	nwresources${PORTVERSION:S/.//}
 
 PLIST_SUB+=	DIAMOND="@comment " ORIGINAL=""
 .endif
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/nwn
 RESTRICTED=	Distribution not allowed
 
-ONLY_FOR_ARCHS=	i386 amd64
-ONLY_FOR_ARCHS_REASON=	Binary Distribution on x86 only
-
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .if defined(NWN_DIAMOND)
-	7z e -y -x'r!*.dll' -x'r!*.exe' -o${WRKSRC}/Kingmaker\
-		${CDROM_MOUNT}/KingmakerSetup.exe
+	${LOCALBASE}/bin/${P7ZIP_CMD} e -y -x'r!*.dll' -x'r!*.exe'\
+		-o${WRKSRC}/Kingmaker ${CDROM_MOUNT}/KingmakerSetup.exe
 .for zipfile in Data_Shared.zip Data_linux.zip data/XP1.zip data/XP2.zip
-	(cd ${STAGEDIR}${DATADIR} && ${UNZIP_CMD} -o ${CDROM_MOUNT}/${zipfile})
+	(cd ${STAGEDIR}${DATADIR} && ${UNZIP_NATIVE_CMD}\
+		-o ${CDROM_MOUNT}/${zipfile})
 .endfor
 .else
 	(cd ${WRKSRC} && ${FIND} . -print | \
 	    ${CPIO} -pdmuv -R${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR})
 .endif
 
 .include <bsd.port.mk>