[Bug 258006] www/grafana8: Update to 8.1.2
- In reply to: bugzilla-noreply_a_freebsd.org: "[Bug 258006] www/grafana8: Update to 8.1.2"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 23 Aug 2021 15:32:57 UTC
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258006 Nuno Teixeira <eduardo@FreeBSD.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |eduardo@FreeBSD.org --- Comment #1 from Nuno Teixeira <eduardo@FreeBSD.org> --- Hello, 1. 'portclippy -C': --- FATAL: Makefile: DISTVERSIONPREFIX appears out-of-order. FATAL: Makefile: order must be PORTNAME/PORTVERSION/DISTVERSIONPREFIX/DISTVERSION/DISTVERSIONSUFFIX/PORTREVISION/PORTEPOCH/CATEGORIES/MASTER_SITES/MASTER_SITE_SUBDIR/PROJECTHOST/PKGNAMEPREFIX/PKGNAMESUFFIX/DISTNAME/EXTRACT_SUFX/DISTFILES(_\w+)?/DIST_SUBDIR/EXTRACT_ONLY. --- it should be: --- PORTNAME= grafana DISTVERSIONPREFIX= v DISTVERSION= 8.1.2 --- 2. PORTREVISION must be set to zero since this port was updated (preference just remove "PORTREVISION= 1" 3. 'portclippy Makefile' sugests correction variables block: --- # PORTNAME block PORTNAME +DISTVERSIONPREFIX DISTVERSION -DISTVERSIONPREFIX PORTREVISION CATEGORIES MASTER_SITES PKGNAMESUFFIX DISTFILES # Maintainer block MAINTAINER COMMENT # License block LICENSE LICENSE_FILE # BROKEN/IGNORE/DEPRECATED messages ONLY_FOR_ARCHS # Dependencies RUN_DEPENDS # USES block USES USE_GITHUB USE_RC_SUBR -TAG # USES=go related variables GO_TARGET GO_BUILDFLAGS # Standard bsd.port.mk variables SUB_LIST -GRAFANA_USER -GRAFANA_GROUP # Users and groups block USERS GROUPS # Packaging list block PLIST_SUB # Unknown variables # WARNING: # Portclippy did not recognize the following variables. # They could be local variables only, misspellings of # framework variables, or Portclippy needs to be made aware # of them. Please double check them. # # Prefix them with an _ to tell Portclippy to ignore them. # This is also an important signal for other contributors # who are working on your port. It removes any doubt of # whether they are framework variables or not and whether # they are safe to remove/rename or not. GRAFANA_DATADIR +GRAFANA_GROUP GRAFANA_HOMEDIR GRAFANA_LOGDIR GRAFANA_PLUGINDIR GRAFANA_PROVISIONINGDIR +GRAFANA_USER +TAG --- 4. 'portfmt -D Makefile' sugests some alphabetical order too: --- --- Makefile +++ Makefile @@ -30,18 +30,17 @@ USE_RC_SUBR= grafana TAG= 103f8fa -GO_TARGET= ./pkg/cmd/grafana-server \ - ./pkg/cmd/grafana-cli +GO_TARGET= ./pkg/cmd/grafana-cli ./pkg/cmd/grafana-server GO_BUILDFLAGS= -ldflags="-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -SUB_LIST= GRAFANA_USER=${GRAFANA_USER} \ - GRAFANA_GROUP=${GRAFANA_GROUP} \ +SUB_LIST= GRAFANA_BUILDHASH=8ea303538f79ee32b68a \ GRAFANA_DATADIR=${GRAFANA_DATADIR} \ + GRAFANA_GROUP=${GRAFANA_GROUP} \ GRAFANA_HOMEDIR=${GRAFANA_HOMEDIR} \ GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \ GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \ GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} \ - GRAFANA_BUILDHASH=8ea303538f79ee32b68a + GRAFANA_USER=${GRAFANA_USER} GRAFANA_USER?= grafana GRAFANA_GROUP?= grafana --- Could you take a look at portlint/portclippy/portfmt tools? what do you think? Thanks -- You are receiving this mail because: You are the assignee for the bug.