svn commit: r396911 - head/net-mgmt/phpweathermap
Dmitry Marakasov
amdmi3 at FreeBSD.org
Mon Sep 14 17:16:59 UTC 2015
Author: amdmi3
Date: Mon Sep 14 17:16:57 2015
New Revision: 396911
URL: https://svnweb.freebsd.org/changeset/ports/396911
Log:
- Move owner handling to plist, fixing build from non-root
- Unsilence install commands
- Drop @dirrm* from plist
- Switch to options helpers
- Add LICENSE_FILE
- Add NO_ARCH
Approved by: portmgr blanket
Modified:
head/net-mgmt/phpweathermap/Makefile
head/net-mgmt/phpweathermap/pkg-plist
Modified: head/net-mgmt/phpweathermap/Makefile
==============================================================================
--- head/net-mgmt/phpweathermap/Makefile Mon Sep 14 17:13:50 2015 (r396910)
+++ head/net-mgmt/phpweathermap/Makefile Mon Sep 14 17:16:57 2015 (r396911)
@@ -3,7 +3,7 @@
PORTNAME= phpweathermap
PORTVERSION= 0.97a
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt www
MASTER_SITES= http://www.network-weathermap.com/files/
DISTNAME= php-weathermap-${PORTVERSION}
@@ -12,11 +12,13 @@ MAINTAINER= hhyou at cs.nctu.edu.tw
COMMENT= Network visualisation tool with web editor
LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${LOCALBASE}/share/pear/Console/Getopt.php:${PORTSDIR}/devel/pear \
rrdtool:${PORTSDIR}/databases/rrdtool
NO_BUILD= yes
+NO_ARCH= yes
USES= zip
USE_PHP= gd
@@ -34,9 +36,10 @@ WRKSRC= ${WRKDIR}/weathermap
SUB_FILES= pkg-message
+PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+
OPTIONS_DEFINE= DOCS EXAMPLES
-.include <bsd.port.options.mk>
post-patch:
${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/editor.php
${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' \
@@ -53,18 +56,14 @@ do-install:
done
@${CP} -R ${WRKSRC}/lib ${STAGEDIR}/${DATADIR}
@(cd ${WRKSRC} && ${COPYTREE_SHARE} "${WM_WWW_DIRS}" ${STAGEDIR}/${DATADIR}/www)
- @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}/${DATADIR}/www
-.if ${PORT_OPTIONS:MEXAMPLES}
+do-install-EXAMPLES-on:
@(cd ${WRKSRC} && ${COPYTREE_SHARE} "random-bits" ${STAGEDIR}/${EXAMPLESDIR})
- @${FIND} ${STAGEDIR}/${EXAMPLESDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
- @${FIND} ${STAGEDIR}/${EXAMPLESDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
-.endif
+ ${FIND} ${STAGEDIR}/${EXAMPLESDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
+ ${FIND} ${STAGEDIR}/${EXAMPLESDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}/${DOCSDIR}
- @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}/${DOCSDIR}
-.endif
+ ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}/${DOCSDIR}
.include <bsd.port.mk>
Modified: head/net-mgmt/phpweathermap/pkg-plist
==============================================================================
--- head/net-mgmt/phpweathermap/pkg-plist Mon Sep 14 17:13:50 2015 (r396910)
+++ head/net-mgmt/phpweathermap/pkg-plist Mon Sep 14 17:16:57 2015 (r396911)
@@ -9,8 +9,6 @@ bin/phpweathermap
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/random-bits/suite-1.png
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/random-bits/suite-2.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/random-bits/suite-2.png
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/random-bits
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
%%DATADIR%%/HTML_ImageMap.class.php
%%DATADIR%%/WeatherMap.functions.php
%%DATADIR%%/WeatherMapLink.class.php
@@ -37,6 +35,8 @@ bin/phpweathermap
%%DATADIR%%/lib/poller-common.php
%%DATADIR%%/lib/post/WeatherMapPostProcessorTest.php
%%DATADIR%%/lib/pre/WeatherMapPreProcessorTest.php
+ at owner %%WWWOWN%%
+ at group %%WWWGRP%%
%%DATADIR%%/www/docs/example/Gradient_BK_800.png
%%DATADIR%%/www/docs/example/Vera.ttf
%%DATADIR%%/www/docs/example/VeraBI.ttf
@@ -166,16 +166,13 @@ bin/phpweathermap
%%DATADIR%%/www/images/wrench_orange.png
%%DATADIR%%/www/images/yellow-ball-64.png
%%DATADIR%%/www/overlib.js
- at dirrm %%DATADIR%%/www/images
- at dirrm %%DATADIR%%/www/editor-resources
- at dirrm %%DATADIR%%/www/docs/pages
- at dirrm %%DATADIR%%/www/docs/images
- at dirrm %%DATADIR%%/www/docs/example
- at dirrm %%DATADIR%%/www/docs
- at dirrm %%DATADIR%%/www/configs
- at dirrm %%DATADIR%%/www
- at dirrm %%DATADIR%%/lib/pre
- at dirrm %%DATADIR%%/lib/post
- at dirrm %%DATADIR%%/lib/datasources
- at dirrm %%DATADIR%%/lib
- at dirrm %%DATADIR%%
+ at dir %%DATADIR%%/www/images
+ at dir %%DATADIR%%/www/editor-resources
+ at dir %%DATADIR%%/www/docs/pages
+ at dir %%DATADIR%%/www/docs/images
+ at dir %%DATADIR%%/www/docs/example
+ at dir %%DATADIR%%/www/docs
+ at dir %%DATADIR%%/www/configs
+ at dir %%DATADIR%%/www
+ at owner
+ at group
More information about the svn-ports-all
mailing list