From a860be643fc2fe6ada32461cb09b5e1d416ce4c0 Mon Sep 17 00:00:00 2001 From: sthen Date: Tue, 6 Sep 2016 11:33:54 +0000 Subject: [PATCH] Fix syweb's path to rrdtool and mention PHP's use of /bin/sh in running programs. Prompted by a mail from thuban at yeuxdelibad.net and an old diff from Ralf Horstmann that I probably missed because it was sent to ports@ rather than the maintainer. Convert MESSAGE to README while there. --- www/syweb/Makefile | 28 +++++++++++++++------------- www/syweb/pkg/MESSAGE | 8 -------- www/syweb/pkg/PLIST | 4 +++- 3 files changed, 18 insertions(+), 22 deletions(-) delete mode 100644 www/syweb/pkg/MESSAGE diff --git a/www/syweb/Makefile b/www/syweb/Makefile index 99cb4474729..99c93f919ba 100644 --- a/www/syweb/Makefile +++ b/www/syweb/Makefile @@ -1,28 +1,28 @@ -# $OpenBSD: Makefile,v 1.21 2015/06/05 06:00:23 robert Exp $ +# $OpenBSD: Makefile,v 1.22 2016/09/06 11:33:54 sthen Exp $ -COMMENT= web frontend to symon -DISTNAME= syweb-0.65 -REVISION= 3 -CATEGORIES= www sysutils +COMMENT= web frontend to symon +DISTNAME= syweb-0.65 +REVISION= 4 +CATEGORIES= www sysutils -MAINTAINER= Stuart Henderson +MAINTAINER= Stuart Henderson -HOMEPAGE= http://www.xs4all.nl/~wpd/symon +HOMEPAGE= http://www.xs4all.nl/~wpd/symon # BSD PERMIT_PACKAGE_CDROM= Yes -MASTER_SITES= ${HOMEPAGE}/philes/ +MASTER_SITES= ${HOMEPAGE}/philes/ -NO_TEST= Yes -NO_BUILD= Yes +NO_TEST= Yes +NO_BUILD= Yes PREFIX= ${VARBASE}/www -MODULES= lang/php -RUN_DEPENDS= net/rrdtool +MODULES= lang/php +RUN_DEPENDS= net/rrdtool -WRKDIST= ${WRKDIR}/syweb +WRKDIST= ${WRKDIR}/syweb do-install: find ${WRKDIR} -name \*.orig -exec rm {} \; @@ -33,5 +33,7 @@ do-install: mkdir ${PREFIX}/symon/cache cd ${PREFIX}/htdocs/syweb && mv setup.inc setup.inc.sample chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/htdocs/syweb ${PREFIX}/symon + sed -i "s,'/bin/rrdtool','${LOCALBASE}/bin/rrdtool'," \ + ${PREFIX}/htdocs/syweb/setup.inc.sample .include diff --git a/www/syweb/pkg/MESSAGE b/www/syweb/pkg/MESSAGE deleted file mode 100644 index 97d59d0e1e1..00000000000 --- a/www/syweb/pkg/MESSAGE +++ /dev/null @@ -1,8 +0,0 @@ -syweb's default install assumes that: - - web server is chrooted at ${PREFIX} - - rrdtool is installed in the chroot - - symux rrd files are kept in ${PREFIX}/symon/rrds//*.rrd - -Customise ${PREFIX}/htdocs/syweb/setup.inc if these assumptions are -incorrect. rrdtool must also be copied into the chroot jail; for this, -see rrdtool's pkg-readme document. diff --git a/www/syweb/pkg/PLIST b/www/syweb/pkg/PLIST index 4654da91629..199d165163c 100644 --- a/www/syweb/pkg/PLIST +++ b/www/syweb/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.4 2014/05/07 18:10:27 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.5 2016/09/06 11:33:54 sthen Exp $ htdocs/syweb/ htdocs/syweb/class_cache.inc htdocs/syweb/class_graph.inc @@ -30,3 +30,5 @@ symon/hifn_test.layout symon/pf.layout symon/rrds/ symon/total_firewall.layout +@cwd ${LOCALBASE}/share/doc/pkg-readmes +${FULLPKGNAME}