Attachment #124359 for bug #167868





PORTNAME=	smokeping
PORTVERSION=	2.6.7
PORTREVISION=	1
CATEGORIES=	net-mgmt www
MASTER_SITES=	http://oss.oetiker.ch/smokeping/pub/ \
		http://smokeping.cs.pu.edu.tw/pub/

MAINTAINER=	rodrigo@bebik.net
COMMENT=	Latency logging and graphing system

LIB_DEPENDS=	rrd.6:${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 \
		p5-libwww>0:${PORTSDIR}/www/p5-libwww \

		p5-FCGI>0:${PORTSDIR}/www/p5-FCGI \
		p5-Config-Grammar>0:${PORTSDIR}/devel/p5-Config-Grammar \
		p5-Socket6>0:${PORTSDIR}/net/p5-Socket6
RUN_DEPENDS:=	${BUILD_DEPENDS}

USE_PERL5=	yes
USE_GMAKE=	yes


post-patch:
	${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
		${WRKSRC}/doc/Makefile.in \
		${WRKSRC}/bin/smokeping \
		${WRKSRC}/bin/smokeping_cgi \
		${WRKSRC}/bin/tSmoke

post-install:
.for FILE in basepage.html config smokemail tmail
	[ -f ${ETCDIR}/${FILE} ] || ${CP} ${ETCDIR}/${FILE}.dist ${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
.if !defined(BATCH)
	${CAT} ${PKGMESSAGE}
.endif




--- bin/smokeping.orig	2012-05-14 12:45:03.010872981 +0200
+++ bin/smokeping	2012-05-14 12:54:39.881874010 +0200
@@ -6,12 +6,11 @@
 
 use FindBin;
 # PERL5LIB
-use lib "$FindBin::Bin/../thirdparty/lib/perl5";
-use lib "$FindBin::Bin/../lib";
+use lib "%%PREFIX%%/smokeping/lib";
 
 use Smokeping;
  
-Smokeping::main("$FindBin::Bin/../etc/config");
+Smokeping::main("%%ETCDIR%%/config");
 
 =head1 NAME
 




--- bin/smokeping_cgi.orig	2012-05-14 12:45:11.565909114 +0200
+++ bin/smokeping_cgi	2012-05-14 12:55:19.866379488 +0200
@@ -6,8 +6,7 @@
 
 use FindBin;
 # PERL5LIB
-use lib "$FindBin::Bin/../thirdparty/lib/perl5";
-use lib "$FindBin::Bin/../lib";
+use lib "%%PREFIX%%/smokeping/lib";
 
 # don't bother with zombies
 $SIG{CHLD} = 'IGNORE';
@@ -18,7 +17,7 @@
 
 use CGI::Fast;
 
-my $cfg = (shift @ARGV) || "$FindBin::Bin/../etc/config";
+my $cfg = (shift @ARGV) || "%%ETCDIR%%/config";
 
 
 while (my $q = new CGI::Fast) {




--- bin/tSmoke.orig	2012-05-14 14:54:55.388873689 +0200
+++ bin/tSmoke	2012-05-14 14:56:15.881875827 +0200
@@ -53,8 +53,7 @@
 # Point the lib variables to your implementation
 use FindBin;
 # PERL5LIB
-use lib "$FindBin::Bin/../thirdparty/lib/perl5";
-use lib "$FindBin::Bin/../lib";
+use lib "%%PREFIX%%/smokeping/lib";
 
 use Smokeping;
 use Net::SMTP;
@@ -63,7 +62,7 @@
 use RRDs;
 
 # Point to your Smokeping config file
-my $cfgfile = "etc/config.dist";
+my $cfgfile = "%%ETCDIR%%/config";
 
 # global variables
 my $cfg;

Added Link Here

(-)files/patch-htdocs-Makefile.in (+11 lines)
1	--- htdocs/Makefile.in.orig 2012-05-14 13:21:26.387873095 +0200
2	+++ htdocs/Makefile.in 2012-05-14 13:22:37.617874000 +0200
3	@@ -424,7 +424,7 @@
4	install-data-local:
5	$(MKDIR) -p $(DESTDIR)$(HTDOCSDIR)
6	$(ECHO) "#!/bin/sh" > $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
7	- $(ECHO) "$(prefix)/bin/smokeping_cgi $(prefix)/etc/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
8	+ $(ECHO) "$(prefix)/bin/smokeping_cgi $(sysconfdir)/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
9	chmod +x $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
10
11	# Tell versions [3.59,3.63) of GNU make to not export all variables.

Return to bug 167868

Lines 7-21 Link Here

(-)Makefile (-4 / +11 lines)
7		7
8	PORTNAME= smokeping	8	PORTNAME= smokeping
9	PORTVERSION= 2.6.7	9	PORTVERSION= 2.6.7
		10	PORTREVISION= 1
10	CATEGORIES= net-mgmt www	11	CATEGORIES= net-mgmt www
11	MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/ \	12	MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/ \
12	http://smokeping.cs.pu.edu.tw/pub/	13	http://smokeping.cs.pu.edu.tw/pub/
13		14
14	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= rodrigo@bebik.net
15	COMMENT= Latency logging and graphing system	16	COMMENT= Latency logging and graphing system
16		17
17	RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool \	18	LIB_DEPENDS= rrd.6:${PORTSDIR}/databases/rrdtool
18	p5-CGI-Session>0:${PORTSDIR}/www/p5-CGI-Session \	19	BUILD_DEPENDS= p5-CGI-Session>0:${PORTSDIR}/www/p5-CGI-Session \
19	p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC \	20	p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC \
20	p5-SNMP_Session>0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \	21	p5-SNMP_Session>0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
21	p5-libwww>0:${PORTSDIR}/www/p5-libwww \	22	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
Lines 23-28 Link Here
23	p5-FCGI>0:${PORTSDIR}/www/p5-FCGI \	24	p5-FCGI>0:${PORTSDIR}/www/p5-FCGI \
24	p5-Config-Grammar>0:${PORTSDIR}/devel/p5-Config-Grammar \	25	p5-Config-Grammar>0:${PORTSDIR}/devel/p5-Config-Grammar \
25	p5-Socket6>0:${PORTSDIR}/net/p5-Socket6	26	p5-Socket6>0:${PORTSDIR}/net/p5-Socket6
		27	RUN_DEPENDS:= ${BUILD_DEPENDS}
26		28
27	USE_PERL5= yes	29	USE_PERL5= yes
28	USE_GMAKE= yes	30	USE_GMAKE= yes
Lines 157-169 Link Here
157		159
158	post-patch:	160	post-patch:
159	${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \	161	${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
160	${WRKSRC}/doc/Makefile.in	162	${WRKSRC}/doc/Makefile.in \
		163	${WRKSRC}/bin/smokeping \
		164	${WRKSRC}/bin/smokeping_cgi \
		165	${WRKSRC}/bin/tSmoke
161		166
162	post-install:	167	post-install:
163	.for FILE in basepage.html config smokemail tmail	168	.for FILE in basepage.html config smokemail tmail
164	[ -f ${ETCDIR}/${FILE} ] \|\| ${CP} ${ETCDIR}/${FILE}.dist ${ETCDIR}/${FILE}	169	[ -f ${ETCDIR}/${FILE} ] \|\| ${CP} ${ETCDIR}/${FILE}.dist ${ETCDIR}/${FILE}
165	.endfor	170	.endfor
166	[ -f ${PREFIX}/smokeping/htdocs/smokeping.fcgi ] \|\| ${CP} ${PREFIX}/smokeping/htdocs/smokeping.fcgi.dist ${PREFIX}/smokeping/htdocs/smokeping.fcgi	171	[ -f ${PREFIX}/smokeping/htdocs/smokeping.fcgi ] \|\| ${CP} ${PREFIX}/smokeping/htdocs/smokeping.fcgi.dist ${PREFIX}/smokeping/htdocs/smokeping.fcgi
		172	${MKDIR} ${PREFIX}/smokeping/htdocs/img
		173	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/smokeping/htdocs
167	.if !defined(BATCH)	174	.if !defined(BATCH)
168	${CAT} ${PKGMESSAGE}	175	${CAT} ${PKGMESSAGE}
169	.endif	176	.endif

Added Link Here

(-)files/patch-bin-smokeping (+17 lines)
1	--- bin/smokeping.orig 2012-05-14 12:45:03.010872981 +0200
2	+++ bin/smokeping 2012-05-14 12:54:39.881874010 +0200
3	@@ -6,12 +6,11 @@
4
5	use FindBin;
6	# PERL5LIB
7	-use lib "$FindBin::Bin/../thirdparty/lib/perl5";
8	-use lib "$FindBin::Bin/../lib";
9	+use lib "%%PREFIX%%/smokeping/lib";
10
11	use Smokeping;
12
13	-Smokeping::main("$FindBin::Bin/../etc/config");
14	+Smokeping::main("%%ETCDIR%%/config");
15
16	=head1 NAME
17

Added Link Here

(-)files/patch-bin-smokeping_cgi (+21 lines)
1	--- bin/smokeping_cgi.orig 2012-05-14 12:45:11.565909114 +0200
2	+++ bin/smokeping_cgi 2012-05-14 12:55:19.866379488 +0200
3	@@ -6,8 +6,7 @@
4
5	use FindBin;
6	# PERL5LIB
7	-use lib "$FindBin::Bin/../thirdparty/lib/perl5";
8	-use lib "$FindBin::Bin/../lib";
9	+use lib "%%PREFIX%%/smokeping/lib";
10
11	# don't bother with zombies
12	$SIG{CHLD} = 'IGNORE';
13	@@ -18,7 +17,7 @@
14
15	use CGI::Fast;
16
17	-my $cfg = (shift @ARGV) \|\| "$FindBin::Bin/../etc/config";
18	+my $cfg = (shift @ARGV) \|\| "%%ETCDIR%%/config";
19
20
21	while (my $q = new CGI::Fast) {

Added Link Here

(-)files/patch-bin-tSmoke (+21 lines)
1	--- bin/tSmoke.orig 2012-05-14 14:54:55.388873689 +0200
2	+++ bin/tSmoke 2012-05-14 14:56:15.881875827 +0200
3	@@ -53,8 +53,7 @@
4	# Point the lib variables to your implementation
5	use FindBin;
6	# PERL5LIB
7	-use lib "$FindBin::Bin/../thirdparty/lib/perl5";
8	-use lib "$FindBin::Bin/../lib";
9	+use lib "%%PREFIX%%/smokeping/lib";
10
11	use Smokeping;
12	use Net::SMTP;
13	@@ -63,7 +62,7 @@
14	use RRDs;
15
16	# Point to your Smokeping config file
17	-my $cfgfile = "etc/config.dist";
18	+my $cfgfile = "%%ETCDIR%%/config";
19
20	# global variables
21	my $cfg;