Attachment 177727 Details for Bug 215065 – third revision

[patch] third revision

webgrind.diff (text/plain), 2.79 KB, created by Franco Fichtner on 2016-12-06 18:06:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2016-12-06 18:06:48 UTC

Size: 2.79 KB

patch

obsolete

>diff --git a/www/webgrind/Makefile b/www/webgrind/Makefile
>index 1e302d3..9a0d5af 100644
>--- a/www/webgrind/Makefile
>+++ b/www/webgrind/Makefile
>@@ -2,27 +2,25 @@
> # $FreeBSD$
> 
> PORTNAME=	webgrind
>-DISTVERSION=	1.0.s${SNAPSHOT}
>+PORTVERSION=	1.4.0
>+DISTVERSIONPREFIX=v
> CATEGORIES=	www
> 
>-MAINTAINER=	lwhsu@FreeBSD.org
>+MAINTAINER=	franco@opnsense.org
> COMMENT=	Xdebug Profiling Web Frontend in PHP
> 
> LICENSE=	BSD3CLAUSE
>+LICENSE_FILE=	${WRKSRC}/license.txt
>+
>+MAKEFILE=	${WRKSRC}/makefile
> 
> OPTIONS_DEFINE=	CALLGRAPH
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	jokkedk
>-GH_TAGNAME=	dc35393
>-
>-SNAPSHOT=	20140207
> 
> USES=		php
> 
>-NO_BUILD=	yes
>-NO_ARCH=	yes
>-
> PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
> 
> CALLGRAPH_USES=		python
>@@ -30,9 +28,12 @@ CALLGRAPH_RUN_DEPENDS=	dot:graphics/graphviz
> 
> post-patch-CALLGRAPH-on:
> 	@${REINPLACE_CMD} -e 's,/usr/bin/python,${PYTHON_CMD},' ${WRKSRC}/config.php
>+	@${REINPLACE_CMD} -e 's,/usr/bin/dot,/usr/local/bin/dot,' ${WRKSRC}/config.php
> 
> do-install:
>-	@${MKDIR} ${STAGEDIR}${WWWDIR}
>-	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "*" ${STAGEDIR}${WWWDIR} "! -name *.bak")
>+	@${RM} ${WRKSRC}/library/preprocessor.cpp ${WRKSRC}/makefile
>+	@${MKDIR} ${STAGEDIR}${WWWDIR}/bin
>+	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "*" ${STAGEDIR}${WWWDIR})
>+	${INSTALL_PROGRAM} ${WRKSRC}/bin/preprocessor ${STAGEDIR}${WWWDIR}/bin
> 
> .include <bsd.port.mk>
>diff --git a/www/webgrind/distinfo b/www/webgrind/distinfo
>index bab4122..f952bd7 100644
>--- a/www/webgrind/distinfo
>+++ b/www/webgrind/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (jokkedk-webgrind-1.0.s20140207-dc35393_GH0.tar.gz) = df099b796ee741c4648b6b93700080068978099f94ca0ce00c7683bb2ce421ad
>-SIZE (jokkedk-webgrind-1.0.s20140207-dc35393_GH0.tar.gz) = 74273
>+TIMESTAMP = 1480918901
>+SHA256 (jokkedk-webgrind-v1.4.0_GH0.tar.gz) = 06ce5f428394e7c031734b4c4d26460c3d712bc64a80dd0792bbe211bd012a04
>+SIZE (jokkedk-webgrind-v1.4.0_GH0.tar.gz) = 82347
>diff --git a/www/webgrind/files/patch-makefile b/www/webgrind/files/patch-makefile
>new file mode 100644
>index 0000000..ab2d62b
>--- /dev/null
>+++ b/www/webgrind/files/patch-makefile
>@@ -0,0 +1,17 @@
>+--- makefile.orig	2016-12-06 17:20:09 UTC
>++++ makefile
>+@@ -1,4 +1,5 @@
>+-CXX = g++
>++CXX ?= g++
>++CXXFLAGS ?= -O2
>+ SRCS = library/preprocessor.cpp
>+ OUT = bin/preprocessor
>+ 
>+@@ -15,6 +16,6 @@ clean:
>+ 	rm -f $(OUT)
>+ 
>+ $(OUT): $(SRCS)
>+-	$(CXX) -o $(OUT) -O2 -s $(SRCS)
>++	$(CXX) -o $(OUT) $(CXXFLAGS) -s $(SRCS)
>+ 
>+ .PHONY: all help clean
>diff --git a/www/webgrind/pkg-plist b/www/webgrind/pkg-plist
>index 23380e7..61d7a20 100644
>--- a/www/webgrind/pkg-plist
>+++ b/www/webgrind/pkg-plist
>@@ -1,7 +1,10 @@
> @owner %%WWWOWN%%
> @group %%WWWGRP%%
> %%WWWDIR%%/README.md
>+%%WWWDIR%%/bin/preprocessor
>+%%WWWDIR%%/composer.json
> %%WWWDIR%%/config.php
>+%%WWWDIR%%/favicon.ico
> %%WWWDIR%%/img/asc.gif
> %%WWWDIR%%/img/bg.gif
> %%WWWDIR%%/img/blank.gif

Flags:

franco: maintainer-approval?

Actions: View | Diff

Attachments on bug 215065: 177680 | 177726 | 177727