git: 97c5391bc427 - main - Mk/Uses/cabal.mk: Support for USE_CABAL in separate Makefile.cabal
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 17 Feb 2026 08:16:30 UTC
The branch main has been updated by alven:
URL: https://cgit.FreeBSD.org/ports/commit/?id=97c5391bc42719008f677b44ac279c592c283eb8
commit 97c5391bc42719008f677b44ac279c592c283eb8
Author: Älven <alven@FreeBSD.org>
AuthorDate: 2026-02-17 08:10:30 +0000
Commit: Älven <alven@FreeBSD.org>
CommitDate: 2026-02-17 08:15:49 +0000
Mk/Uses/cabal.mk: Support for USE_CABAL in separate Makefile.cabal
Like we already do have in Mk/Uses/cargo.mk for Makefile.crates.
* Adopt www/hs-postgrest to this change in framework.
Reviewed by: vvd@
Approved by: portmgr@ (arrowd@)
Approved by: db@, yuri@ (Mentors, implicit)
Differential Revision: https://reviews.freebsd.org/D51936
---
Mk/Uses/cabal.mk | 6 ++++++
www/hs-postgrest/Makefile | 6 ------
www/hs-postgrest/{Makefile.modules => Makefile.cabal} | 0
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk
index cf1ffe9874f9..d700961174b1 100644
--- a/Mk/Uses/cabal.mk
+++ b/Mk/Uses/cabal.mk
@@ -72,6 +72,12 @@ IGNORE= USES=cabal: invalid arguments: ${arg}
. endif
. endfor
+# The file including the USE_CABAL. To regenerate it it's required to run:
+# 1) make cabal-extract
+# 2) make cabal-configure
+# 3) make make-use-cabal > Makefile.cabal
+.sinclude "${MASTERDIR}/Makefile.cabal"
+
. if defined(CABAL_PROJECT) && !${_cabal_project_valid_VALUES:M${CABAL_PROJECT}}
IGNORE= CABAL_PROJECT: invalid value: ${CABAL_PROJECT}
. endif
diff --git a/www/hs-postgrest/Makefile b/www/hs-postgrest/Makefile
index 3d10c89e4ef3..1ea0fd98e158 100644
--- a/www/hs-postgrest/Makefile
+++ b/www/hs-postgrest/Makefile
@@ -39,12 +39,6 @@ PLIST_SUB= ETCDIR=${ETCDIR} \
POSTGREST_GROUP=${POSTGREST_GROUP} \
POSTGREST_USER=${POSTGREST_USER}
-# This file includes the USE_CABAL. To regenerate it it's required to run:
-# 1) make cabal-extract
-# 2) make cabal-configure
-# 3) make make-use-cabal && paste the USE_CABAL section to Makefile.modules
-.include "Makefile.modules"
-
POSTGREST_GROUP?= postgrest
POSTGREST_USER?= postgrest
diff --git a/www/hs-postgrest/Makefile.modules b/www/hs-postgrest/Makefile.cabal
similarity index 100%
rename from www/hs-postgrest/Makefile.modules
rename to www/hs-postgrest/Makefile.cabal