Date: Sun, 1 Dec 2013 18:42:35 +0100 (CET) From: User Rodrigo <rodrigo@bebik.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/184416: net-mgmt/smokeping stage fixes Message-ID: <201312011742.rB1HgZYL087481@q.workgroup> Resent-Message-ID: <201312011750.rB1Ho1Lv079882@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184416
>Category: ports
>Synopsis: net-mgmt/smokeping stage fixes
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 01 17:50:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: User Rodrigo
>Release: FreeBSD 10.0-BETA3 i386
>Organization:
>Environment:
System: FreeBSD q 10.0-BETA3 FreeBSD 10.0-BETA3 #0 r257580: Sun Nov 3 21:15:32 UTC 2013 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Port stage fix.
- remove no_stage
- fix lib_depends
- add licence
- fix manpages
>How-To-Repeat:
>Fix:
--- smokeping.diff begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 335354)
+++ Makefile (working copy)
@@ -10,7 +10,9 @@
MAINTAINER= rodrigo@bebik.net
COMMENT= Latency logging and graphing system
-LIB_DEPENDS= rrd:${PORTSDIR}/databases/rrdtool
+LICENSE= GPLv2
+
+LIB_DEPENDS= librrd.so:${PORTSDIR}/databases/rrdtool
BUILD_DEPENDS= p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session \
p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
p5-SNMP_Session>=0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
@@ -32,69 +34,6 @@
USE_RC_SUBR= smokeping
-MAN1= smokeping.1 \
- smokeping_cgi.1 \
- tSmoke.1
-MAN3= Smokeping_matchers_Avgratio.3 \
- Smokeping_matchers_CheckLatency.3 \
- Smokeping_matchers_CheckLoss.3 \
- Smokeping_matchers_ExpLoss.3 \
- Smokeping_matchers_Median.3 \
- Smokeping_matchers_Medratio.3 \
- Smokeping_matchers_base.3 \
- Smokeping_probes_AnotherDNS.3 \
- Smokeping_probes_AnotherSSH.3 \
- Smokeping_probes_CiscoRTTMonDNS.3 \
- Smokeping_probes_CiscoRTTMonEchoICMP.3 \
- Smokeping_probes_CiscoRTTMonTcpConnect.3 \
- Smokeping_probes_Curl.3 \
- Smokeping_probes_DNS.3 \
- Smokeping_probes_DismanPing.3 \
- Smokeping_probes_EchoPing.3 \
- Smokeping_probes_EchoPingChargen.3 \
- Smokeping_probes_EchoPingDNS.3 \
- Smokeping_probes_EchoPingDiscard.3 \
- Smokeping_probes_EchoPingHttp.3 \
- Smokeping_probes_EchoPingHttps.3 \
- Smokeping_probes_EchoPingIcp.3 \
- Smokeping_probes_EchoPingLDAP.3 \
- Smokeping_probes_EchoPingPlugin.3 \
- Smokeping_probes_EchoPingSmtp.3 \
- Smokeping_probes_EchoPingWhois.3 \
- Smokeping_probes_FPing.3 \
- Smokeping_probes_FPing6.3 \
- Smokeping_probes_FTPtransfer.3 \
- Smokeping_probes_IOSPing.3 \
- Smokeping_probes_LDAP.3 \
- Smokeping_probes_NFSping.3 \
- Smokeping_probes_OpenSSHJunOSPing.3 \
- Smokeping_probes_Radius.3 \
- Smokeping_probes_RemoteFPing.3 \
- Smokeping_probes_SendEmail.3 \
- Smokeping_probes_SSH.3 \
- Smokeping_probes_SipSak.3 \
- Smokeping_probes_TCPPing.3 \
- Smokeping_probes_TacacsPlus.3 \
- Smokeping_probes_TelnetIOSPing.3 \
- Smokeping_probes_TelnetJunOSPing.3 \
- Smokeping_probes_WebProxyFilter.3 \
- Smokeping_probes_base.3 \
- Smokeping_probes_basefork.3 \
- Smokeping_probes_basevars.3 \
- Smokeping_probes_passwordchecker.3 \
- Smokeping_probes_skel.3 \
- Smokeping_sorters_Loss.3 \
- Smokeping_sorters_Max.3 \
- Smokeping_sorters_Median.3 \
- Smokeping_sorters_StdDev.3 \
- Smokeping_sorters_base.3
-MAN5= smokeping_config.5 \
- smokeping_examples.5
-MAN7= smokeping_extend.7 \
- smokeping_install.7 \
- smokeping_master_slave.7 \
- smokeping_upgrade.7
-
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
USERS= smokeping
@@ -116,7 +55,6 @@
OPTIONS_DEFINE= ECHOPING CURL RADIUS TELNET DNS FPING LDAP LDAPSSL
OPTIONS_DEFAULT= FPING
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MFPING}
@@ -166,15 +104,10 @@
post-install:
.for FILE in basepage.html config smokemail tmail
- [ -f ${ETCDIR}/${FILE} ] || ${CP} ${ETCDIR}/${FILE}.dist ${ETCDIR}/${FILE}
+ [ -f ${STAGEDIR}${ETCDIR}/${FILE} ] || ${CP} ${STAGEDIR}${ETCDIR}/${FILE}.dist ${STAGEDIR}${ETCDIR}/${FILE}
.endfor
- [ -f ${PREFIX}/smokeping/htdocs/smokeping.fcgi ] || ${CP} ${PREFIX}/smokeping/htdocs/smokeping.fcgi.dist ${PREFIX}/smokeping/htdocs/smokeping.fcgi
- ${MKDIR} ${PREFIX}/smokeping/htdocs/img
- ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/smokeping/htdocs
- ${MKDIR} ${PREFIX}/var/smokeping
- ${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/var/smokeping
-.if !defined(BATCH)
- ${CAT} ${PKGMESSAGE}
-.endif
+ [ -f ${PREFIX}/smokeping/htdocs/smokeping.fcgi ] || ${CP} ${STAGEDIR}${PREFIX}/smokeping/htdocs/smokeping.fcgi.dist ${STAGEDIR}${PREFIX}/smokeping/htdocs/smokeping.fcgi
+ ${MKDIR} ${STAGEDIR}${PREFIX}/smokeping/htdocs/img
+ ${MKDIR} ${STAGEDIR}${PREFIX}/var/smokeping
.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
--- pkg-plist (revision 335354)
+++ pkg-plist (working copy)
@@ -26,6 +26,8 @@
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.simple
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.targetvars-with-Curl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.template
+@owner www
+@group www
smokeping/htdocs/cropper/cropper.css
smokeping/htdocs/cropper/cropper.js
smokeping/htdocs/cropper/cropper.uncompressed.js
@@ -42,6 +44,8 @@
smokeping/htdocs/cropper/marqueeHoriz.gif
smokeping/htdocs/cropper/marqueeVert.gif
smokeping/htdocs/cropper/smokeping-zoom.js
+@owner
+@group
smokeping/lib/Smokeping.pm
smokeping/lib/Smokeping/Colorspace.pm
smokeping/lib/Smokeping/Config.pm
@@ -112,7 +116,11 @@
@unexec rm -rf %D/smokeping/htdocs/img 2>/dev/null || true
@exec mkdir -p %D/var/smokeping
@exec chown smokeping:smokeping %D/var/smokeping
+@owner smokeping
+@group smokeping
@dirrmtry var/smokeping
+@owner
+@group
@dirrmtry var
@dirrm smokeping/lib/Smokeping/sorters
@dirrm smokeping/lib/Smokeping/probes
@@ -124,3 +132,72 @@
@dirrm smokeping/htdocs
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
@dirrmtry smokeping
+man/man1/smokeping.1.gz
+man/man1/smokeping_cgi.1.gz
+man/man1/tSmoke.1.gz
+man/man3/Smokeping_matchers_Avgratio.3.gz
+man/man3/Smokeping_matchers_CheckLatency.3.gz
+man/man3/Smokeping_matchers_CheckLoss.3.gz
+man/man3/Smokeping_matchers_ExpLoss.3.gz
+man/man3/Smokeping_matchers_Median.3.gz
+man/man3/Smokeping_matchers_Medratio.3.gz
+man/man3/Smokeping_matchers_base.3.gz
+man/man3/Smokeping_probes_AnotherDNS.3.gz
+man/man3/Smokeping_probes_AnotherSSH.3.gz
+man/man3/Smokeping_probes_CiscoRTTMonDNS.3.gz
+man/man3/Smokeping_probes_CiscoRTTMonEchoICMP.3.gz
+man/man3/Smokeping_probes_CiscoRTTMonTcpConnect.3.gz
+man/man3/Smokeping_probes_Curl.3.gz
+man/man3/Smokeping_probes_DNS.3.gz
+man/man3/Smokeping_probes_DismanPing.3.gz
+man/man3/Smokeping_probes_EchoPing.3.gz
+man/man3/Smokeping_probes_EchoPingChargen.3.gz
+man/man3/Smokeping_probes_EchoPingDNS.3.gz
+man/man3/Smokeping_probes_EchoPingDiscard.3.gz
+man/man3/Smokeping_probes_EchoPingHttp.3.gz
+man/man3/Smokeping_probes_EchoPingHttps.3.gz
+man/man3/Smokeping_probes_EchoPingIcp.3.gz
+man/man3/Smokeping_probes_EchoPingLDAP.3.gz
+man/man3/Smokeping_probes_EchoPingPlugin.3.gz
+man/man3/Smokeping_probes_EchoPingSmtp.3.gz
+man/man3/Smokeping_probes_EchoPingWhois.3.gz
+man/man3/Smokeping_probes_FPing.3.gz
+man/man3/Smokeping_probes_FPing6.3.gz
+man/man3/Smokeping_probes_FTPtransfer.3.gz
+man/man3/Smokeping_probes_IOSPing.3.gz
+man/man3/Smokeping_probes_LDAP.3.gz
+man/man3/Smokeping_probes_NFSping.3.gz
+man/man3/Smokeping_probes_OpenSSHJunOSPing.3.gz
+man/man3/Smokeping_probes_Radius.3.gz
+man/man3/Smokeping_probes_RemoteFPing.3.gz
+man/man3/Smokeping_probes_SSH.3.gz
+man/man3/Smokeping_probes_SendEmail.3.gz
+man/man3/Smokeping_probes_SipSak.3.gz
+man/man3/Smokeping_probes_TCPPing.3.gz
+man/man3/Smokeping_probes_TacacsPlus.3.gz
+man/man3/Smokeping_probes_TelnetIOSPing.3.gz
+man/man3/Smokeping_probes_TelnetJunOSPing.3.gz
+man/man3/Smokeping_probes_WebProxyFilter.3.gz
+man/man3/Smokeping_probes_base.3.gz
+man/man3/Smokeping_probes_basefork.3.gz
+man/man3/Smokeping_probes_basevars.3.gz
+man/man3/Smokeping_probes_passwordchecker.3.gz
+man/man3/Smokeping_probes_skel.3.gz
+man/man3/Smokeping_sorters_Loss.3.gz
+man/man3/Smokeping_sorters_Max.3.gz
+man/man3/Smokeping_sorters_Median.3.gz
+man/man3/Smokeping_sorters_StdDev.3.gz
+man/man3/Smokeping_sorters_base.3.gz
+man/man5/smokeping_config.5.gz
+man/man5/smokeping_examples.5.gz
+man/man7/smokeping_extend.7.gz
+man/man7/smokeping_install.7.gz
+man/man7/smokeping_master_slave.7.gz
+man/man7/smokeping_upgrade.7.gz
+etc/smokeping/basepage.html
+etc/smokeping/config
+etc/smokeping/smokemail
+etc/smokeping/tmail
+smokeping/htdocs/smokeping.fcgi
+@dirrmtry smokeping/htdocs/img
+
Service unavailableService unavailableService unavailable
--- smokeping.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312011742.rB1HgZYL087481>