Attachment #232500 for bug #262611




PORTNAME=	cask
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 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|%%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:
	${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


Lines 1-3 Link Here

(-)b/devel/cask/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1519807484	1	TIMESTAMP = 1646723508
2	SHA256 (cask-cask-v0.8.3_GH0.tar.gz) = 71bafe94b7ea08b0f9075df2cb3cc2063a00c88e64fb1bf7073ae1b5fa2560cc	2	SHA256 (cask-cask-v0.8.7_GH0.tar.gz) = 6b664da044e8faef77717f79bb90069ec9e7868e9c47da498057236b409a501b
3	SIZE (cask-cask-v0.8.3_GH0.tar.gz) = 311026	3	SIZE (cask-cask-v0.8.7_GH0.tar.gz) = 307293




--- 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




--- 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)
 

Added Link Here

(-)b/devel/cask/pkg-plist (+9 lines)
1	bin/cask
2	%%EMACS_VERSION_SITE_LISPDIR%%/cask/cask-bootstrap.el
3	%%EMACS_VERSION_SITE_LISPDIR%%/cask/cask-bootstrap.elc
4	%%EMACS_VERSION_SITE_LISPDIR%%/cask/cask-cli.el
5	%%EMACS_VERSION_SITE_LISPDIR%%/cask/cask-cli.elc
6	%%EMACS_VERSION_SITE_LISPDIR%%/cask/cask.el
7	%%EMACS_VERSION_SITE_LISPDIR%%/cask/cask.elc
8	%%EMACS_VERSION_SITE_LISPDIR%%/cask/templates/init-dev.tpl
9	%%EMACS_VERSION_SITE_LISPDIR%%/cask/templates/init.tpl

Return to bug 262611

Lines 1-43 Link Here

(-)b/devel/cask/Makefile (-19 / +36 lines)
1	PORTNAME= cask	1	PORTNAME= cask
2	PORTVERSION= 0.8.3	2	PORTVERSION= 0.8.7
3	DISTVERSIONPREFIX= v	3	DISTVERSIONPREFIX= v
4	PORTREVISION= 6
5	CATEGORIES= devel elisp	4	CATEGORIES= devel elisp
6	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}	5	PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
7		6
8	MAINTAINER= hrs@FreeBSD.org	7	MAINTAINER= hrs@FreeBSD.org
9	COMMENT= Project management tool for Emacs	8	COMMENT= Project management tool for Emacs
10		9
		10	_EL_DEPENDS= s.el${EMACS_PKGNAMESUFFIX}>=1.8.0:textproc/s.el@${EMACS_FLAVOR} \
		11	f.el${EMACS_PKGNAMESUFFIX}>=0.16.0:misc/f.el@${EMACS_FLAVOR} \
		12	commander.el${EMACS_PKGNAMESUFFIX}>=0.1.0:misc/commander.el@${EMACS_FLAVOR} \
		13	epl.el${EMACS_PKGNAMESUFFIX}>=0.5:devel/epl.el@${EMACS_FLAVOR} \
		14	melpa-package-build${EMACS_PKGNAMESUFFIX}>=1.2:devel/melpa-package-build@${EMACS_FLAVOR} \
		15	shut-up.el${EMACS_PKGNAMESUFFIX}>=0.1.0:misc/shut-up.el@${EMACS_FLAVOR} \
		16	ansi.el${EMACS_PKGNAMESUFFIX}>=0.4.1:misc/ansi.el@${EMACS_FLAVOR} \
		17	git.el${EMACS_PKGNAMESUFFIX}>=0.1.0:devel/git.el@${EMACS_FLAVOR}
		18	RUN_DEPENDS= ${_EL_DEPENDS}
		19	BUILD_DEPENDS= ${_EL_DEPENDS}
		20
		21	_EL_FILES= cask-bootstrap.el cask.el cask-cli.el
		22	_TPL_FILES= init.tpl init-dev.tpl
		23	_EL_SUBDIR= cask
		24	## feature dependencies for cask bootsrap - will be required during
		25	## build, to prevent the build from bootsrapping from ELPA
		26	_BOOTSTRAP_REQ= s f commander git epl shut-up cl-lib cl-generic package-build eieio ansi
		27	_BOOTSTRAP_EVAL=${_BOOTSTRAP_REQ:@S@--eval='(require (quote ${S}))'@}
		28
11	LICENSE= GPLv3	29	LICENSE= GPLv3
12		30
13	USES= emacs python shebangfix	31	USES= emacs shebangfix
14	USE_GITHUB= yes	32	USE_GITHUB= yes
15		33
16	CONFLICTS_INSTALL= cask cask-emacs_*	34	CONFLICTS_INSTALL= cask cask-emacs_*
17		35
18	NO_ARCH= yes	36	NO_ARCH= yes
19	NO_BUILD= yes
20
21	PLIST_FILES= ${EMACS_SITE_LISPDIR}/cask.el \
22	${EMACS_SITE_LISPDIR}/cask-bootstrap.el \
23	${EMACS_SITE_LISPDIR}/cask-cli.el \
24	${EMACS_SITE_LISPDIR}/package-legacy.el \
25	${EMACS_SITE_LISPDIR}/templates/init.tpl \
26	${EMACS_SITE_LISPDIR}/templates/init-dev.tpl \
27	bin/cask
28
29	SHEBANG_FILES= bin/cask	37	SHEBANG_FILES= bin/cask
30		38
31	post-patch:	39	post-patch:
32	@${REINPLACE_CMD} -e 's\|os.path.dirname(CASK_BIN_DIRECTORY)\|"${PREFIX}/${EMACS_SITE_LISPDIR}"\|' \	40	@${REINPLACE_CMD} -e 's\|%%SRCDIR%%\|"$$(realpath \"$$(dirname $$(realpath "$$0"))/../${EMACS_VERSION_SITE_LISPDIR}/${_EL_SUBDIR}\")"\|' \
33	${WRKSRC}/bin/cask	41	${WRKSRC}/bin/cask
34		42
		43	do-build:
		44	cd ${WRKSRC} && ${EMACS_CMD} --batch ${_BOOTSTRAP_EVAL} \
		45	--eval='(push "${WRKSRC}" load-path)' \
		46	-f batch-byte-compile ${_EL_FILES}
		47
35	do-install:	48	do-install:
36	(cd ${WRKSRC} && ${INSTALL_DATA} \	49	${INSTALL} -d ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${_EL_SUBDIR}
37	${PLIST_FILES:M*.el:T} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR})	50	.for F in ${_EL_FILES}
38	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/templates	51	${INSTALL_DATA} ${WRKSRC}/${F} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${_EL_SUBDIR}/${F}
39	(cd ${WRKSRC}/templates && ${INSTALL_DATA} ${PLIST_FILES:M*.tpl:T} \	52	${INSTALL_DATA} ${WRKSRC}/${F:R}.elc ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${_EL_SUBDIR}/${F:R}.elc
40	${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/templates)	53	.endfor
		54	${INSTALL} -d ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${_EL_SUBDIR}/templates
		55	.for F in ${_TPL_FILES}
		56	${INSTALL_DATA} ${WRKSRC}/templates/${F} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${_EL_SUBDIR}/templates/${F}
		57	.endfor
41	${INSTALL_SCRIPT} ${WRKSRC}/bin/cask \	58	${INSTALL_SCRIPT} ${WRKSRC}/bin/cask \
42	${STAGEDIR}${PREFIX}/bin/cask	59	${STAGEDIR}${PREFIX}/bin/cask
43		60

Added Link Here

(-)b/devel/cask/files/patch-bin-cask (+20 lines)
1	--- bin/cask.orig 2021-03-30 16:56:47.000000000 +0000
2	+++ bin/cask 2022-03-09 03:55:40.272789000 +0000
3	@@ -30,13 +30,13 @@
4
5	case $subcommand in
6	emacs)
7	- EMACSLOADPATH="$($CASK load-path)" PATH="$($CASK path)" EMACS="$EMACS" "$EMACS" "$@"
8	+ env EMACSLOADPATH="$($CASK load-path)" PATH="$($CASK path)" EMACS="$EMACS" $EMACS "$@"
9	;;
10	exec)
11	- EMACSLOADPATH="$($CASK load-path)" PATH="$($CASK path)" EMACS="$EMACS" "$@"
12	+ env EMACSLOADPATH="$($CASK load-path)" PATH="$($CASK path)" EMACS="$EMACS" $@
13	;;
14	*)
15	- SRCDIR=$(dirname $(dirname $(realpath $CASK)))
16	- "$EMACS" -Q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@"
17	+ SRCDIR=%%SRCDIR%%
18	+ $EMACS -q --no-splash --no-x-resources --script "$SRCDIR/cask-cli.el" -- $subcommand "$@"
19	;;
20	esac

Added Link Here

(-)b/devel/cask/files/patch-cask-bootstrap.el (+16 lines)
1	--- cask-bootstrap.el.orig 2021-03-30 16:56:47.000000000 +0000
2	+++ cask-bootstrap.el 2022-03-08 22:47:50.683538000 +0000
3	@@ -65,12 +65,7 @@
4	(require 'package-build (expand-file-name "package-build-legacy" cask-directory)))
5
6	(dolist (pkg deps)
7	- (unless (featurep pkg)
8	- (unless (package-installed-p pkg)
9	- (unless package-archive-contents
10	- (package-refresh-contents))
11	- (package-install pkg))
12	- (require pkg))))
13	+ (require pkg)))
14
15	(provide 'cask-bootstrap)
16