svn commit: r562114 - head/games/nwndata

[Fernando Apesteguía]

Author: fernape
Date: Wed Jan 20 08:00:42 2021
New Revision: 562114
URL: https://svnweb.freebsd.org/changeset/ports/562114

Log:
  games/nwndata: Makefile improvements
  
  - Replace EXTRACT_DEPENDS with USES for 7z extraction.
  - Use P7ZIP_CMD instead of 7z directly.
  - Delint Makefile a bit.
  
  PR:	252746
  Submitted by:	scf at FreeBSD.org (maintainer)

Modified:
  head/games/nwndata/Makefile

Modified: head/games/nwndata/Makefile
==============================================================================
--- head/games/nwndata/Makefile	Wed Jan 20 07:57:33 2021	(r562113)
+++ head/games/nwndata/Makefile	Wed Jan 20 08:00:42 2021	(r562114)
@@ -15,13 +15,18 @@ DISTFILES=
 MAINTAINER=	scf at 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
@@ -36,16 +41,14 @@ 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 | \