Attachment 232500 Details for Bug 262611 – devel/cask version update and boostrap patch

[patch] devel/cask version update and boostrap patch

devel_cask.diff (text/plain), 6.05 KB, created by Sean Champ on 2022-03-17 06:16:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sean Champ

Created: 2022-03-17 06:16:27 UTC

Size: 6.05 KB

patch

obsolete

>diff --git a/devel/cask/Makefile b/devel/cask/Makefile
>index 5d6b43c6824b..e4b847780351 100644
>--- a/devel/cask/Makefile
>+++ b/devel/cask/Makefile
>@@ -1,43 +1,60 @@
> PORTNAME=	cask
>-PORTVERSION=	0.8.3
>+PORTVERSION=	0.8.7
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	6
> CATEGORIES=	devel elisp
> PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
> 
> MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Project management tool for Emacs
> 
>+_EL_DEPENDS=	s.el${EMACS_PKGNAMESUFFIX}>=1.8.0:textproc/s.el@${EMACS_FLAVOR} \
>+		f.el${EMACS_PKGNAMESUFFIX}>=0.16.0:misc/f.el@${EMACS_FLAVOR} \
>+		commander.el${EMACS_PKGNAMESUFFIX}>=0.1.0:misc/commander.el@${EMACS_FLAVOR} \
>+		epl.el${EMACS_PKGNAMESUFFIX}>=0.5:devel/epl.el@${EMACS_FLAVOR} \
>+		melpa-package-build${EMACS_PKGNAMESUFFIX}>=1.2:devel/melpa-package-build@${EMACS_FLAVOR} \
>+		shut-up.el${EMACS_PKGNAMESUFFIX}>=0.1.0:misc/shut-up.el@${EMACS_FLAVOR} \
>+		ansi.el${EMACS_PKGNAMESUFFIX}>=0.4.1:misc/ansi.el@${EMACS_FLAVOR} \
>+		git.el${EMACS_PKGNAMESUFFIX}>=0.1.0:devel/git.el@${EMACS_FLAVOR}
>+RUN_DEPENDS=	${_EL_DEPENDS}
>+BUILD_DEPENDS=	${_EL_DEPENDS}
>+
>+_EL_FILES=	cask-bootstrap.el cask.el cask-cli.el
>+_TPL_FILES=	init.tpl init-dev.tpl
>+_EL_SUBDIR=	cask
>+## feature dependencies for cask bootsrap - will be required during
>+## build, to prevent the build from bootsrapping from ELPA
>+_BOOTSTRAP_REQ=	s f commander git epl shut-up cl-lib cl-generic package-build eieio ansi
>+_BOOTSTRAP_EVAL=${_BOOTSTRAP_REQ:@S@--eval='(require (quote ${S}))'@}
>+
> LICENSE=	GPLv3
> 
>-USES=		emacs python shebangfix
>+USES=		emacs shebangfix
> USE_GITHUB=	yes
> 
> CONFLICTS_INSTALL=	cask cask-emacs_*
> 
> NO_ARCH=	yes
>-NO_BUILD=	yes
>-
>-PLIST_FILES=	${EMACS_SITE_LISPDIR}/cask.el \
>-		${EMACS_SITE_LISPDIR}/cask-bootstrap.el \
>-		${EMACS_SITE_LISPDIR}/cask-cli.el \
>-		${EMACS_SITE_LISPDIR}/package-legacy.el \
>-		${EMACS_SITE_LISPDIR}/templates/init.tpl \
>-		${EMACS_SITE_LISPDIR}/templates/init-dev.tpl \
>-		bin/cask
>-
> SHEBANG_FILES=	bin/cask
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|os.path.dirname(CASK_BIN_DIRECTORY)|"${PREFIX}/${EMACS_SITE_LISPDIR}"|' \
>+	@${REINPLACE_CMD} -e 's|%%SRCDIR%%|"$$(realpath \"$$(dirname $$(realpath "$$0"))/../${EMACS_VERSION_SITE_LISPDIR}/${_EL_SUBDIR}\")"|'  \
> 	    ${WRKSRC}/bin/cask
> 
>+do-build:
>+	cd ${WRKSRC} && ${EMACS_CMD} --batch ${_BOOTSTRAP_EVAL} \
>+		 --eval='(push "${WRKSRC}" load-path)' \
>+		-f batch-byte-compile ${_EL_FILES}
>+
> do-install:
>-	(cd ${WRKSRC} && ${INSTALL_DATA} \
>-	    ${PLIST_FILES:M*.el:T} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR})
>-	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/templates
>-	(cd ${WRKSRC}/templates && ${INSTALL_DATA} ${PLIST_FILES:M*.tpl:T} \
>-	    ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/templates)
>+	${INSTALL} -d ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${_EL_SUBDIR}
>+.for F in ${_EL_FILES}
>+	${INSTALL_DATA} ${WRKSRC}/${F} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${_EL_SUBDIR}/${F}
>+	${INSTALL_DATA} ${WRKSRC}/${F:R}.elc ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${_EL_SUBDIR}/${F:R}.elc
>+.endfor
>+	${INSTALL} -d ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${_EL_SUBDIR}/templates
>+.for F in ${_TPL_FILES}
>+	${INSTALL_DATA} ${WRKSRC}/templates/${F} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${_EL_SUBDIR}/templates/${F}
>+.endfor
> 	${INSTALL_SCRIPT} ${WRKSRC}/bin/cask \
> 	    ${STAGEDIR}${PREFIX}/bin/cask
> 
>diff --git a/devel/cask/distinfo b/devel/cask/distinfo
>index b38112b5df2b..249780a537a4 100644
>--- a/devel/cask/distinfo
>+++ b/devel/cask/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1519807484
>-SHA256 (cask-cask-v0.8.3_GH0.tar.gz) = 71bafe94b7ea08b0f9075df2cb3cc2063a00c88e64fb1bf7073ae1b5fa2560cc
>-SIZE (cask-cask-v0.8.3_GH0.tar.gz) = 311026
>+TIMESTAMP = 1646723508
>+SHA256 (cask-cask-v0.8.7_GH0.tar.gz) = 6b664da044e8faef77717f79bb90069ec9e7868e9c47da498057236b409a501b
>+SIZE (cask-cask-v0.8.7_GH0.tar.gz) = 307293
>diff --git a/devel/cask/files/patch-bin-cask b/devel/cask/files/patch-bin-cask
>new file mode 100644
>index 000000000000..b0701050be9d
>--- /dev/null
>+++ b/devel/cask/files/patch-bin-cask
>@@ -0,0 +1,20 @@
>+--- bin/cask.orig	2021-03-30 16:56:47.000000000 +0000
>++++ bin/cask	2022-03-09 03:55:40.272789000 +0000
>+@@ -30,13 +30,13 @@
>+ 
>+ case $subcommand in
>+ 	emacs)
>+-		EMACSLOADPATH="$($CASK load-path)" PATH="$($CASK path)" EMACS="$EMACS" "$EMACS" "$@"
>++		env EMACSLOADPATH="$($CASK load-path)" PATH="$($CASK path)" EMACS="$EMACS" $EMACS "$@"
>+ 		;;
>+ 	exec)
>+-		EMACSLOADPATH="$($CASK load-path)" PATH="$($CASK path)" EMACS="$EMACS" "$@"
>++		env EMACSLOADPATH="$($CASK load-path)" PATH="$($CASK path)" EMACS="$EMACS" $@
>+ 		;;
>+ 	*)
>+-		SRCDIR=$(dirname $(dirname $(realpath $CASK)))
>+-		"$EMACS" -Q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@"
>++		SRCDIR=%%SRCDIR%%
>++		$EMACS -q --no-splash --no-x-resources --script "$SRCDIR/cask-cli.el" -- $subcommand "$@"
>+ 		;;
>+ esac
>diff --git a/devel/cask/files/patch-cask-bootstrap.el b/devel/cask/files/patch-cask-bootstrap.el
>new file mode 100644
>index 000000000000..6598de100b90
>--- /dev/null
>+++ b/devel/cask/files/patch-cask-bootstrap.el
>@@ -0,0 +1,16 @@
>+--- cask-bootstrap.el.orig	2021-03-30 16:56:47.000000000 +0000
>++++ cask-bootstrap.el	2022-03-08 22:47:50.683538000 +0000
>+@@ -65,12 +65,7 @@
>+     (require 'package-build (expand-file-name "package-build-legacy" cask-directory)))
>+ 
>+   (dolist (pkg deps)
>+-    (unless (featurep pkg)
>+-      (unless (package-installed-p pkg)
>+-        (unless package-archive-contents
>+-          (package-refresh-contents))
>+-        (package-install pkg))
>+-      (require pkg))))
>++    (require pkg)))
>+ 
>+ (provide 'cask-bootstrap)
>+ 
>diff --git a/devel/cask/pkg-plist b/devel/cask/pkg-plist
>new file mode 100644
>index 000000000000..29022b44afcc
>--- /dev/null
>+++ b/devel/cask/pkg-plist
>@@ -0,0 +1,9 @@
>+bin/cask
>+%%EMACS_VERSION_SITE_LISPDIR%%/cask/cask-bootstrap.el
>+%%EMACS_VERSION_SITE_LISPDIR%%/cask/cask-bootstrap.elc
>+%%EMACS_VERSION_SITE_LISPDIR%%/cask/cask-cli.el
>+%%EMACS_VERSION_SITE_LISPDIR%%/cask/cask-cli.elc
>+%%EMACS_VERSION_SITE_LISPDIR%%/cask/cask.el
>+%%EMACS_VERSION_SITE_LISPDIR%%/cask/cask.elc
>+%%EMACS_VERSION_SITE_LISPDIR%%/cask/templates/init-dev.tpl
>+%%EMACS_VERSION_SITE_LISPDIR%%/cask/templates/init.tpl

Actions: View | Diff

Attachments on bug 262611: 232500 | 232501 | 232502 | 232503 | 232504 | 232505 | 232506 | 232507 | 232508