On Mon, Jun 10, 2024 at 07:28:06PM GMT, Jeremie Courreges-Anglas wrote:
> On Mon, Jun 10, 2024 at 10:17:02AM -0600, Abel Abraham Camarillo Ojeda wrote:
> > Hi,
> >
> > maybe we should specify the more restrictive licensing:
>
> sysutils/loki uses:
> # AGPLv3 + some bits Apache 2.0
>
> I'd suggest both should use the same license marker and the one in
> loki looks more complete. You could put the URL on a line of its own
> below.
How's this look?
diff /usr/ports
commit - 9b806ed96d86ec10e0a9e266ceb32cd519c5b953
path + /usr/ports
blob - d6ec8e8e744d82201a45c96a5deb934a45ec5c8a
file + sysutils/loki/Makefile
--- sysutils/loki/Makefile
+++ sysutils/loki/Makefile
@@ -4,6 +4,7 @@ COMMENT-promtail = tails log files and pushes them to
GH_ACCOUNT = grafana
GH_PROJECT = loki
GH_TAGNAME = v2.9.3
+REVISION = 0
CATEGORIES = sysutils
@@ -12,6 +13,7 @@ HOMEPAGE = https://grafana.com/oss/loki/
MULTI_PACKAGES = -main -promtail
# AGPLv3 + some bits Apache 2.0
+# https://grafana.com/licensing/
PERMIT_PACKAGE = Yes
MODULES = lang/go
diff /usr/ports
commit - 9b806ed96d86ec10e0a9e266ceb32cd519c5b953
path + /usr/ports
blob - 94620495334c2609324b26c4f7115806eaa170d9
file + sysutils/grafana/Makefile
--- sysutils/grafana/Makefile
+++ sysutils/grafana/Makefile
@@ -5,6 +5,7 @@ DISTNAME = grafana+vendor-$V
WRKDIST = ${WRKDIR}/grafana-$V
EXTRACT_SUFX = .tar.zst
PKGNAME = grafana-$V
+REVISION = 0
# running into the too long filenames now
TAR = ${LOCALBASE}/bin/gtar
@@ -25,7 +26,8 @@ DISTFILES.a = grafana-$V.linux-amd64.tar.gz{grafana-$
SITES = https://ports.lucasraab.me/
SITES.a = https://dl.grafana.com/oss/release/
-# Apache 2.0 (bundles roboto and opensans fonts)
+# AGPLv3 + some bits Apache 2.0
+# https://grafana.com/licensing/
PERMIT_PACKAGE = Yes
MODULES = lang/go
