cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't try and syslog during build, it interferes with aja's bulk builds

Browse Source 
inside a chroot. ok ajacoutot@
This commit is contained in:
sthen 2010-10-12 09:55:51 +00:00
parent 0037f49f9f
commit c731b3abf1
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/nfsen/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2010/07/12 22:07:39 sthen Exp $
# $OpenBSD: Makefile,v 1.5 2010/10/12 09:55:51 sthen Exp $
MULTI_PACKAGES= -main -web
COMMENT-main= web-based front end for the nfdump netflow tools
@ -7,7 +7,7 @@ COMMENT-web= html/php parts for nfsen
V= 1.3.2
DISTNAME= nfsen-$V
PKGNAME-main= ${DISTNAME}
REVISION-main= 0
REVISION-main= 1
PKGNAME-web= nfsen-web-$V
CATEGORIES= net www
HOMEPAGE= http://nfsen.sourceforge.net/

27
net/nfsen/patches/patch-install_pl
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-install_pl,v 1.1.1.1 2010/05/02 20:52:32 sthen Exp $
$OpenBSD: patch-install_pl,v 1.2 2010/10/12 09:55:51 sthen Exp $
--- install.pl.orig Wed Jun 10 09:34:16 2009
+++ install.pl Fri Apr 30 23:05:08 2010
+++ install.pl Tue Oct 12 09:44:35 2010
@@ -60,6 +60,8 @@ my @ProfileTag = (
"# \n",
);
@ -192,7 +192,26 @@ $OpenBSD: patch-install_pl,v 1.1.1.1 2010/05/02 20:52:32 sthen Exp $
# Load the required NfSen modules
unshift @INC, "libexec";
@@ -708,56 +718,63 @@ $NfConf::PERL = GetPerl();
@@ -677,7 +687,9 @@ if ( -f "$NfConf::CONFDIR/nfsen.conf" && -f "etc/nfsen
Log::LogInit();
-my $hints = NfSen::LoadHints();
+my $hints;
+if ($configure) {
+$hints = NfSen::LoadHints();
if ( $$$hints{'version'} == -1 ) {
# initial NfSen install or upgrade from old version without hints
$$$hints{'version'} = $nfsen_version;
@@ -686,6 +698,7 @@ if ( $$$hints{'version'} == -1 ) {
print "Upgrade from version '$$$hints{'version'}' installed at " . scalar localtime $$$hints{'installed'};
print "\n";
}
+}
my $rrd_version = $RRDs::VERSION;
@@ -708,56 +721,63 @@ $NfConf::PERL = GetPerl();
my ($nfsen_uid, $www_gid ) = VerifyConfig();
my $nfsen_run = 0;
@ -296,7 +315,7 @@ $OpenBSD: patch-install_pl,v 1.1.1.1 2010/05/02 20:52:32 sthen Exp $
Cleanup();
SetupEnv($nfsen_uid, $www_gid);
@@ -787,9 +804,10 @@ $$$hints{'version'} = $nfsen_version;
@@ -787,9 +807,10 @@ $$$hints{'version'} = $nfsen_version;
$$$hints{'installed'} = time();
NfSen::StoreHints();
chown $nfsen_uid, $www_gid, "$NfConf::PROFILESTATDIR/hints" || die "Can't chown hints db: $!\n";