diff --git a/Mk/Uses/7z.mk b/Mk/Uses/7z.mk index 5f5bd05feab6..fb029b3317d7 100644 --- a/Mk/Uses/7z.mk +++ b/Mk/Uses/7z.mk @@ -1,57 +1,57 @@ # Extract 7-Zip archives # # Feature: 7z # Usage: USES=7z or USES=7z:ARGS -# Valid ARGS: p7zip, partial +# Valid ARGS: 7-zip, partial # -# p7zip Extract using 7z(1) instead of bsdtar(1) +# 7-zip Extract using 7zz(1) instead of bsdtar(1) # partial Extract only files tagged with :7z or in EXTRACT_ONLY_7z # # MAINTAINER: jbeich@FreeBSD.org .if !defined(_INCLUDE_USES_7Z_MK) _INCLUDE_USES_7Z_MK= yes -P7ZIP_CMD?= 7z -P7ZIP_BEFORE_ARGS?= x -bd -y -o${P7ZIP_WRKDIR} >/dev/null -P7ZIP_AFTER_ARGS?= # empty -P7ZIP_WRKDIR?= ${EXTRACT_WRKDIR} +7-ZIP_CMD?= 7zz +7-ZIP_BEFORE_ARGS?= x -bd -y -o${7-ZIP_WRKDIR} >/dev/null +7-ZIP_AFTER_ARGS?= # empty +7-ZIP_WRKDIR?= ${EXTRACT_WRKDIR} -.if !empty(7z_ARGS:Np7zip:Npartial) -IGNORE= USES=7z has invalid arguments: ${7z_ARGS:Np7zip:Npartial} +.if !empty(7z_ARGS:N7-zip:Npartial) +IGNORE= USES=7z has invalid arguments: ${7z_ARGS:N7-zip:Npartial} .endif -.if ${7z_ARGS:Mp7zip} -EXTRACT_DEPENDS+= ${P7ZIP_CMD}:archivers/p7zip +.if ${7z_ARGS:M7-zip} +EXTRACT_DEPENDS+= ${7-ZIP_CMD}:archivers/7-zip .endif .if ! ${7z_ARGS:Mpartial} EXTRACT_SUFX?= .7z .endif -.if ${7z_ARGS:Mp7zip} && ! ${7z_ARGS:Mpartial} -EXTRACT_CMD?= ${P7ZIP_CMD} -EXTRACT_BEFORE_ARGS?= ${P7ZIP_BEFORE_ARGS} -EXTRACT_AFTER_ARGS?= ${P7ZIP_AFTER_ARGS} +.if ${7z_ARGS:M7-zip} && ! ${7z_ARGS:Mpartial} +EXTRACT_CMD?= ${7-ZIP_CMD} +EXTRACT_BEFORE_ARGS?= ${7-ZIP_BEFORE_ARGS} +EXTRACT_AFTER_ARGS?= ${7-ZIP_AFTER_ARGS} .endif -.if ! ${7z_ARGS:Mp7zip} && ${7z_ARGS:Mpartial} && defined(EXTRACT_ONLY) +.if ! ${7z_ARGS:M7-zip} && ${7z_ARGS:Mpartial} && defined(EXTRACT_ONLY) EXTRACT_ONLY+= ${EXTRACT_ONLY_7z} .endif -.if ${7z_ARGS:Mp7zip} && ${7z_ARGS:Mpartial} +.if ${7z_ARGS:M7-zip} && ${7z_ARGS:Mpartial} EXTRACT_ONLY?= ${DISTFILES:N*\:*7z*:C/:.*//} EXTRACT_ONLY_7z?= ${DISTFILES:M*\:*7z*:C/:.*//} -_USES_extract+= 520:do-p7zip-extract -do-p7zip-extract: +_USES_extract+= 520:do-7-zip-extract +do-7-zip-extract: @for file in ${EXTRACT_ONLY_7z}; do \ - if ! ${P7ZIP_CMD} ${P7ZIP_BEFORE_ARGS} \ - ${_DISTDIR}/$$file ${P7ZIP_AFTER_ARGS}; \ + if ! ${7-ZIP_CMD} ${7-ZIP_BEFORE_ARGS} \ + ${_DISTDIR}/$$file ${7-ZIP_AFTER_ARGS}; \ then \ exit 1; \ fi; \ done .endif .endif diff --git a/games/nwndata/Makefile b/games/nwndata/Makefile index fb6b566bb029..6b60ad4c4f74 100644 --- a/games/nwndata/Makefile +++ b/games/nwndata/Makefile @@ -1,59 +1,59 @@ # Created by: Erik Olson 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 LICENSE_NAME= Proprietary LICENSE_TEXT= Distribution not allowed LICENSE_PERMS= auto-accept ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= binary distribution for 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 -USES= 7z:p7zip zip +USES= 7z:7-zip 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 do-install: ${MKDIR} ${STAGEDIR}${DATADIR} .if defined(NWN_DIAMOND) - ${LOCALBASE}/bin/${P7ZIP_CMD} e -y -x'r!*.dll' -x'r!*.exe'\ + ${LOCALBASE}/bin/${7-ZIP_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_NATIVE_CMD}\ -o ${CDROM_MOUNT}/${zipfile}) .endfor .else (cd ${WRKSRC} && ${FIND} . -print | \ ${CPIO} -pdmuv -R${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}) .endif .include diff --git a/korean/nanumfonts-otf/Makefile b/korean/nanumfonts-otf/Makefile index 330d8683311c..765ff79cedc5 100644 --- a/korean/nanumfonts-otf/Makefile +++ b/korean/nanumfonts-otf/Makefile @@ -1,81 +1,81 @@ PORTNAME= nanumfonts PORTVERSION= 20170921 CATEGORIES= korean MASTER_SITES= http://appdown.naver.com/naver/font/NanumFont/setup/ \ LOCAL/jkim PKGNAMESUFFIX= -${FONTTYPE} DISTFILES= ${DISTFILE_LIST:S/^/${DISTFILE_PRFX}/:S/$/${DISTFILE_SUFX}/} DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} MAINTAINER= jkim@FreeBSD.org COMMENT= Nanum family Hangul fonts (${FONTFORMAT}) LICENSE= OFL11 DISTFILE_LIST= ALL DISTFILE_PRFX= NanumFontSetup_${FONTTYPE:tu}_ DISTFILE_SUFX= _hangeulcamp.exe DISTINFO_FILE= ${PKGDIR}/distinfo.${FONTTYPE} EXTRACT_AFTER_ARGS= ${EXTRACT_SUBDIR} EXTRACT_SUBDIR= \$$WINDIR/Fonts NO_ARCH= yes NO_BUILD= yes -USES= 7z:p7zip fonts +USES= 7z:7-zip fonts FONTTYPE?= otf FONTFORMAT?= OpenType FONTNAME= nanum-${FONTTYPE} FONTLIST= BarunGothic \ BarunGothicBold \ BarunGothicLight \ BarunGothicUltraLight \ BarunpenB \ BarunpenR \ Brush \ Gothic \ GothicBold \ GothicExtraBold \ GothicLight \ Myeongjo \ MyeongjoBold \ MyeongjoExtraBold \ Pen \ SquareB \ SquareEB \ SquareL \ SquareR .if ${FONTTYPE} == otf FONTLIST+= SquareRoundOTFB \ SquareRoundOTFEB \ SquareRoundOTFL \ SquareRoundOTFR .else FONTLIST+= SquareRoundB \ SquareRoundEB \ SquareRoundL \ SquareRoundR .endif FONTFILES= ${FONTLIST:S|^|Nanum|:S|$|.${FONTTYPE}|} PLIST_FILES= ${FONTFILES:S|^|${FONTSDIR}/|} OPTIONS_DEFINE= ECO ECO_DESC= Include Eco family fonts ECO_VARS= DISTFILE_LIST+="GOTHICECO MYUNGJOECO" .for f in GothicEco MyeongjoEco ECO_VARS+= FONTLIST+="${f} ${f}Bold ${f}ExtraBold" .endfor .include do-install: ${MKDIR} ${STAGEDIR}${FONTSDIR} .for f in ${FONTFILES} ${INSTALL_DATA} ${WRKDIR}/${EXTRACT_SUBDIR}/${f} ${STAGEDIR}${FONTSDIR} .endfor .include