git: 5f8da1a0f4e7 - main - databases/{closql,closql-devel}: Update to 2.0.0

From: Yasuhiro Kimura <yasu_at_FreeBSD.org>
Date: Fri, 16 Aug 2024 07:20:47 UTC
The branch main has been updated by yasu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5f8da1a0f4e7de69bfd97883ce5a7cfdff894795

commit 5f8da1a0f4e7de69bfd97883ce5a7cfdff894795
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2024-08-16 05:05:46 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2024-08-16 07:18:41 +0000

    databases/{closql,closql-devel}: Update to 2.0.0
    
    ChangeLog:      https://github.com/magit/closql/blob/v2.0.0/CHANGELOG
---
 databases/closql-devel/Makefile  | 17 ++++++++++-------
 databases/closql-devel/distinfo  |  6 +++---
 databases/closql-devel/pkg-plist |  3 ---
 databases/closql/Makefile        | 29 +++++++++++++++--------------
 databases/closql/distinfo        |  6 +++---
 5 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/databases/closql-devel/Makefile b/databases/closql-devel/Makefile
index 2051291baa97..edfc015d272b 100644
--- a/databases/closql-devel/Makefile
+++ b/databases/closql-devel/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	closql
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.1-49
-PORTREVISION=	2
-DISTVERSIONSUFFIX=	-gc591e6b
+DISTVERSION=	2.0.0
+DISTVERSIONSUFFIX=
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
@@ -13,10 +12,10 @@ WWW=		https://github.com/magit/closql
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.5:misc/compat.el@${EMACS_FLAVOR} \
-		emacsql-devel${EMACS_PKGNAMESUFFIX}>=3.1.1:databases/emacsql-devel@${EMACS_FLAVOR}
-RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.5:misc/compat.el@${EMACS_FLAVOR} \
-		emacsql-devel${EMACS_PKGNAMESUFFIX}>=3.1.1:databases/emacsql-devel@${EMACS_FLAVOR}
+BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=30.0.0.0:misc/compat.el@${EMACS_FLAVOR} \
+		emacsql-devel${EMACS_PKGNAMESUFFIX}>=4.0.0:databases/emacsql-devel@${EMACS_FLAVOR}
+RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=30.0.0.0:misc/compat.el@${EMACS_FLAVOR} \
+		emacsql-devel${EMACS_PKGNAMESUFFIX}>=4.0.0:databases/emacsql-devel@${EMACS_FLAVOR}
 
 USES=		emacs gmake
 USE_GITHUB=	yes
@@ -28,6 +27,10 @@ CONFLICTS_INSTALL=	closql closql-emacs_* # share/doc/closql/README.md
 
 NO_ARCH=	yes
 
+PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/closql-autoloads.el \
+		${EMACS_VERSION_SITE_LISPDIR}/closql.el \
+		${EMACS_VERSION_SITE_LISPDIR}/closql.elc
+
 PORTDOCS=	README.org
 
 OPTIONS_DEFINE=	DOCS
diff --git a/databases/closql-devel/distinfo b/databases/closql-devel/distinfo
index 19ae99460de5..a50644d374e5 100644
--- a/databases/closql-devel/distinfo
+++ b/databases/closql-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1717204682
-SHA256 (magit-closql-v1.2.1-49-gc591e6b_GH0.tar.gz) = 8b35392578e3b977ece4f93f4447b0c1ea5fb58cd63d191f5f7ec73b6af7cdc1
-SIZE (magit-closql-v1.2.1-49-gc591e6b_GH0.tar.gz) = 21671
+TIMESTAMP = 1723784467
+SHA256 (magit-closql-v2.0.0_GH0.tar.gz) = 14f3c0c9293b7faa5952afab9eaf49b33107630bd1773902477798fbacb26ccf
+SIZE (magit-closql-v2.0.0_GH0.tar.gz) = 21841
diff --git a/databases/closql-devel/pkg-plist b/databases/closql-devel/pkg-plist
deleted file mode 100644
index 34f8553a160e..000000000000
--- a/databases/closql-devel/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%EMACS_VERSION_SITE_LISPDIR%%/closql-autoloads.el
-%%EMACS_VERSION_SITE_LISPDIR%%/closql.el
-%%EMACS_VERSION_SITE_LISPDIR%%/closql.elc
diff --git a/databases/closql/Makefile b/databases/closql/Makefile
index 475cb77797e8..8ef10e5fe4b5 100644
--- a/databases/closql/Makefile
+++ b/databases/closql/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	closql
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.1
-PORTREVISION=	10
+DISTVERSION=	2.0.0
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
@@ -12,37 +11,39 @@ WWW=		https://github.com/magit/closql
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	emacsql${EMACS_PKGNAMESUFFIX}>=3.0.0:databases/emacsql@${EMACS_FLAVOR}
-RUN_DEPENDS=	emacsql${EMACS_PKGNAMESUFFIX}>=3.0.0:databases/emacsql@${EMACS_FLAVOR}
+BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=30.0.0.0:misc/compat.el@${EMACS_FLAVOR} \
+		emacsql${EMACS_PKGNAMESUFFIX}>=4.0.0:databases/emacsql@${EMACS_FLAVOR}
+RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=30.0.0.0:misc/compat.el@${EMACS_FLAVOR} \
+		emacsql${EMACS_PKGNAMESUFFIX}>=4.0.0:databases/emacsql@${EMACS_FLAVOR}
 
-USES=		emacs
+USES=		emacs gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
+MAKE_ENV+=	LOAD_PATH="${LOAD_PATH}"
+
 CONFLICTS_INSTALL=	closql closql-devel* closql-emacs_*
 
 NO_ARCH=	yes
 
-PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/closql.el \
+PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/closql-autoloads.el \
+		${EMACS_VERSION_SITE_LISPDIR}/closql.el \
 		${EMACS_VERSION_SITE_LISPDIR}/closql.elc
 
-PORTDOCS=	README.md
+PORTDOCS=	README.org
 
 OPTIONS_DEFINE=	DOCS
 
-do-build:
-	(cd ${WRKSRC} \
-	&& ${EMACS_CMD} -Q -batch -L . \
-		-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/emacsql \
-		-f batch-byte-compile closql.el)
+LOAD_PATH=	-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L \
+		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/emacsql
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} closql.el* \
+	(cd ${WRKSRC} && ${INSTALL_DATA} *.el* \
 	   ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR})
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.org ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/closql/distinfo b/databases/closql/distinfo
index 9f0d227def69..a50644d374e5 100644
--- a/databases/closql/distinfo
+++ b/databases/closql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1663525345
-SHA256 (magit-closql-v1.2.1_GH0.tar.gz) = 3f058e21c1b381b28f45b39da15df48a55a59200252df9c3aa55a060625b2e6b
-SIZE (magit-closql-v1.2.1_GH0.tar.gz) = 20830
+TIMESTAMP = 1723784467
+SHA256 (magit-closql-v2.0.0_GH0.tar.gz) = 14f3c0c9293b7faa5952afab9eaf49b33107630bd1773902477798fbacb26ccf
+SIZE (magit-closql-v2.0.0_GH0.tar.gz) = 21841