From owner-svn-ports-head@freebsd.org Wed Jan 20 08:00:43 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4E44B4EDAC2; Wed, 20 Jan 2021 08:00:43 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DLHyM1lh0z3rKv; Wed, 20 Jan 2021 08:00:43 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2F03815EAC; Wed, 20 Jan 2021 08:00:43 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10K80hOB090159; Wed, 20 Jan 2021 08:00:43 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10K80hoO090158; Wed, 20 Jan 2021 08:00:43 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <202101200800.10K80hoO090158@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Wed, 20 Jan 2021 08:00:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r562114 - head/games/nwndata X-SVN-Group: ports-head X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: head/games/nwndata X-SVN-Commit-Revision: 562114 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jan 2021 08:00:43 -0000 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@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@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 | \