Attachment #117629 for bug #159738

View | Details | Raw Unified | Return to bug 159738
Collapse All | Expand All

Lines 6-13 Link Here

(-)net-mgmt/nfsen/Makefile (-3 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= nfsen	8	PORTNAME= nfsen
9	PORTVERSION= 1.3.2	9	PORTVERSION= 1.3.5
10	PORTREVISION= 1
11	CATEGORIES= net-mgmt	10	CATEGORIES= net-mgmt
12	MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} \	11	MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} \
13	http://nfsen.sourceforge.net/	12	http://nfsen.sourceforge.net/
Lines 36-42 Link Here
36	${WRKSRC}/etc/nfsen-dist.conf	35	${WRKSRC}/etc/nfsen-dist.conf
37	@${RM} ${WRKSRC}/etc/nfsen-dist.conf.*	36	@${RM} ${WRKSRC}/etc/nfsen-dist.conf.*
38	@${REINPLACE_CMD} -e 's,%%PERL%%,${PERL},' -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/install.pl	37	@${REINPLACE_CMD} -e 's,%%PERL%%,${PERL},' -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/install.pl
39	@${RM} ${WRKSRC}/libexec/NfSenRRD.pm.orig
40		38
41	do-install:	39	do-install:
42	@${MKDIR} ${PREFIX}/var/${PORTNAME}/profiles/live	40	@${MKDIR} ${PREFIX}/var/${PORTNAME}/profiles/live

Lines 1-2 Link Here

(-)net-mgmt/nfsen/distinfo (-2 / +2 lines)
1	SHA256 (nfsen-1.3.2.tar.gz) = a51dc81f83ad2273201ba0ca1ee67d598b5a67dc64ea8430ab9ff60d23b259c1	1	SHA256 (nfsen-1.3.5.tar.gz) = b2afd700818c2f91182d2970a1759f1c0a8c2835990726f15f695514f00b1e43
2	SIZE (nfsen-1.3.2.tar.gz) = 6539382	2	SIZE (nfsen-1.3.5.tar.gz) = 221348




--- install.pl.orig	2010-09-09 09:56:05.000000000 +0400
+++ install.pl	2011-08-13 16:39:01.000000000 +0400

--- install.pl.orig
+++ install.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%%PERL%% -I %%PREFIX%%/libexec/nfsen
 #
 #
 #  Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung
@@ -85,33 +85,7 @@
 # Get Perl
 sub GetPerl {
 

 
 } # End of GetPerl
 
@@ -200,11 +174,8 @@
 	}
 
 	my @out = `$NfConf::PREFIX/nfdump -V`;
-	if ( scalar @out != 2 ) {
-		die "Error getting nfdump version";
-	}
 	chomp $out[0];
-	my ($major, $minor) = $out[0] =~ /Version:\s(\d)\.(\d)\s/;
+	my ($major, $minor) = $out[0] =~ /Version:\s(\d)\.(\d)[\.\s]/;
 	if ( defined $major && defined $minor) {
 		if ( $major >= 1 && $minor >= 6 ) {
 			print "Found $out[0]\n";
@@ -212,7 +183,9 @@
 			print "out[0]\n";
 			die "Nfdump version not compatible with current NfSen version.\n";
 		}
-	} 
+	} else {
+	       die "Error getting nfdump version";
+        }	       
 
 	my $www_gid = getgrnam($NfConf::WWWGROUP) || 
 		die "WWW group '$NfConf::WWWGROUP' not found on this system\n";

Return to bug 159738

Lines 1-15 Link Here

(-)net-mgmt/nfsen/files/patch-install.pl (-6 / +27 lines)
1		1	--- install.pl.orig 2010-09-09 09:56:05.000000000 +0400
2	$FreeBSD: ports/net-mgmt/nfsen/files/patch-install.pl,v 1.3 2006/04/25 18:22:23 pav Exp $	2	+++ install.pl 2011-08-13 16:39:01.000000000 +0400
3
4	--- install.pl.orig
5	+++ install.pl
6	@@ -1,4 +1,4 @@	3	@@ -1,4 +1,4 @@
7	-#!/usr/bin/perl	4	-#!/usr/bin/perl
8	+#!%%PERL%% -I %%PREFIX%%/libexec/nfsen	5	+#!%%PERL%% -I %%PREFIX%%/libexec/nfsen
9	#	6	#
10	#	7	#
11	# Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung	8	# Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung
12	@@ -81,33 +81,7 @@	9	@@ -85,33 +85,7 @@
13	# Get Perl	10	# Get Perl
14	sub GetPerl {	11	sub GetPerl {
15		12
Lines 44-46 Link Here
44		41
45	} # End of GetPerl	42	} # End of GetPerl
46		43
		44	@@ -200,11 +174,8 @@
		45	}
		46
		47	my @out = `$NfConf::PREFIX/nfdump -V`;
		48	- if ( scalar @out != 2 ) {
		49	- die "Error getting nfdump version";
		50	- }
		51	chomp $out[0];
		52	- my ($major, $minor) = $out[0] =~ /Version:\s(\d)\.(\d)\s/;
		53	+ my ($major, $minor) = $out[0] =~ /Version:\s(\d)\.(\d)[\.\s]/;
		54	if ( defined $major && defined $minor) {
		55	if ( $major >= 1 && $minor >= 6 ) {
		56	print "Found $out[0]\n";
		57	@@ -212,7 +183,9 @@
		58	print "out[0]\n";
		59	die "Nfdump version not compatible with current NfSen version.\n";
		60	}
		61	- }
		62	+ } else {
		63	+ die "Error getting nfdump version";
		64	+ }
		65
		66	my $www_gid = getgrnam($NfConf::WWWGROUP) \|\|
		67	die "WWW group '$NfConf::WWWGROUP' not found on this system\n";