git: 632357b1615b - main - www/webgrind: Update to 1.9.2

From: Nuno Teixeira <eduardo_at_FreeBSD.org>
Date: Thu, 09 Jun 2022 10:03:41 UTC
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=632357b1615b63935c9038f8cb4ffa462e03dd4c

commit 632357b1615b63935c9038f8cb4ffa462e03dd4c
Author:     Franco Fichtner <franco@opnsense.org>
AuthorDate: 2022-06-09 09:59:33 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-06-09 10:03:11 +0000

    www/webgrind: Update to 1.9.2
    
     - use DISTVERSION instead of PORTVERSION
     - pet portlint
     - pet portclippy
    
    ChangeLog: https://github.com/jokkedk/webgrind/releases/tag/v1.9.2
    
    PR:             264546
---
 www/webgrind/Makefile             | 25 ++++++++++++-------------
 www/webgrind/distinfo             |  6 +++---
 www/webgrind/files/patch-makefile |  6 +++---
 www/webgrind/pkg-plist            | 12 ++++++++----
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/www/webgrind/Makefile b/www/webgrind/Makefile
index c2d2da5917c5..066793349be5 100644
--- a/www/webgrind/Makefile
+++ b/www/webgrind/Makefile
@@ -1,8 +1,8 @@
 # Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
 
 PORTNAME=	webgrind
-PORTVERSION=	1.5.0
-DISTVERSIONPREFIX=v
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.9.2
 CATEGORIES=	www
 
 MAINTAINER=	franco@opnsense.org
@@ -11,26 +11,25 @@ COMMENT=	Xdebug Profiling Web Frontend in PHP
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-MAKEFILE=	${WRKSRC}/makefile
-
-OPTIONS_DEFINE=	CALLGRAPH
-
+USES=		cpe php
+CPE_VENDOR=	webgrind_project
 USE_GITHUB=	yes
 GH_ACCOUNT=	jokkedk
 
-USES=		cpe php
+MAKEFILE=	${WRKSRC}/makefile
 
-CPE_VENDOR=	webgrind_project
+PLIST_SUB=	WWWGRP="${WWWGRP}" \
+		WWWOWN="${WWWOWN}"
 
-PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
+OPTIONS_DEFINE=	CALLGRAPH
 
-CALLGRAPH_USES=		python
-CALLGRAPH_RUN_DEPENDS=	dot:graphics/graphviz
+CALLGRAPH_DESC=	Enable call graph
 
-CALLGRAPH_DESC=		Enable call graph
+CALLGRAPH_RUN_DEPENDS=	dot:graphics/graphviz
+CALLGRAPH_USES=		python
 
 post-patch-CALLGRAPH-on:
-	@${REINPLACE_CMD} -e 's,/usr/bin/python,${PYTHON_CMD},' ${WRKSRC}/config.php
+	@${REINPLACE_CMD} -e 's,/usr/bin/python3,${PYTHON_CMD},' ${WRKSRC}/config.php
 	@${REINPLACE_CMD} -e 's,/usr/bin/dot,/usr/local/bin/dot,' ${WRKSRC}/config.php
 
 do-install:
diff --git a/www/webgrind/distinfo b/www/webgrind/distinfo
index e012f30af73c..0068cca5848b 100644
--- a/www/webgrind/distinfo
+++ b/www/webgrind/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496726780
-SHA256 (jokkedk-webgrind-v1.5.0_GH0.tar.gz) = cd42376807da4fc6c1c326f294d9cb7f71577b79c2d1f846035a3247c049e750
-SIZE (jokkedk-webgrind-v1.5.0_GH0.tar.gz) = 82570
+TIMESTAMP = 1654175247
+SHA256 (jokkedk-webgrind-v1.9.2_GH0.tar.gz) = 37831130c4016fce1e74f54e9e7d971a76056b32a15bac1dbe0cdc70e8538837
+SIZE (jokkedk-webgrind-v1.9.2_GH0.tar.gz) = 89094
diff --git a/www/webgrind/files/patch-makefile b/www/webgrind/files/patch-makefile
index ab2d62b3e336..7aab45c449ac 100644
--- a/www/webgrind/files/patch-makefile
+++ b/www/webgrind/files/patch-makefile
@@ -1,4 +1,4 @@
---- makefile.orig	2016-12-06 17:20:09 UTC
+--- makefile.orig	2022-05-31 07:36:32 UTC
 +++ makefile
 @@ -1,4 +1,5 @@
 -CXX = g++
@@ -11,7 +11,7 @@
  	rm -f $(OUT)
  
  $(OUT): $(SRCS)
--	$(CXX) -o $(OUT) -O2 -s $(SRCS)
-+	$(CXX) -o $(OUT) $(CXXFLAGS) -s $(SRCS)
+-	$(CXX) -o $(OUT) -O2 -s $(SRCS) -lz -DWITH_ZLIB
++	$(CXX) -o $(OUT) $(CXXFLAGS) -s $(SRCS) -lz -DWITH_ZLIB
  
  .PHONY: all help clean
diff --git a/www/webgrind/pkg-plist b/www/webgrind/pkg-plist
index 1742ecdd1eb1..0a11067b556c 100644
--- a/www/webgrind/pkg-plist
+++ b/www/webgrind/pkg-plist
@@ -1,9 +1,12 @@
 @owner %%WWWOWN%%
 @group %%WWWGRP%%
+%%WWWDIR%%/Dockerfile
+%%WWWDIR%%/Nmakefile
 %%WWWDIR%%/README.md
 %%WWWDIR%%/bin/preprocessor
 %%WWWDIR%%/composer.json
 %%WWWDIR%%/config.php
+%%WWWDIR%%/docker-compose.yml
 %%WWWDIR%%/favicon.ico
 %%WWWDIR%%/img/asc.gif
 %%WWWDIR%%/img/bg.gif
@@ -38,15 +41,16 @@
 %%WWWDIR%%/library/Preprocessor.php
 %%WWWDIR%%/library/Reader.php
 %%WWWDIR%%/library/gprof2dot.py
+%%WWWDIR%%/library/gzstream.h
 %%WWWDIR%%/styles/custom.css
 %%WWWDIR%%/styles/style.css
 %%WWWDIR%%/templates/fileviewer.phtml
 %%WWWDIR%%/templates/index.phtml
-@dir %%WWWDIR%%/templates
-@dir %%WWWDIR%%/styles
-@dir %%WWWDIR%%/library
-@dir %%WWWDIR%%/js
 @dir %%WWWDIR%%/img
+@dir %%WWWDIR%%/js
+@dir %%WWWDIR%%/library
+@dir %%WWWDIR%%/styles
+@dir %%WWWDIR%%/templates
 @dir %%WWWDIR%%
 @owner
 @group