From 6e5a9b29f143170b21a1661b4aa69af3360089f6 Mon Sep 17 00:00:00 2001 From: mnag Date: Wed, 15 Mar 2006 13:35:54 +0000 Subject: - Update to 1.2.3 - portlint(1) PR: 93697 Submitted by: maintainer --- net-mgmt/nfsen-devel/Makefile | 28 ++++++++++++++++------------ net-mgmt/nfsen-devel/distinfo | 6 +++--- net-mgmt/nfsen-devel/files/patch-install.pl | 6 ++++++ net-mgmt/nfsen-devel/pkg-plist | 1 + net-mgmt/nfsen/Makefile | 28 ++++++++++++++++------------ net-mgmt/nfsen/distinfo | 6 +++--- net-mgmt/nfsen/files/patch-install.pl | 6 ++++++ net-mgmt/nfsen/pkg-plist | 1 + 8 files changed, 52 insertions(+), 30 deletions(-) (limited to 'net-mgmt') diff --git a/net-mgmt/nfsen-devel/Makefile b/net-mgmt/nfsen-devel/Makefile index dc5b6ba7d466..5ea22e564604 100644 --- a/net-mgmt/nfsen-devel/Makefile +++ b/net-mgmt/nfsen-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nfsen -PORTVERSION= 1.2.2 +PORTVERSION= 1.2.3 CATEGORIES= net-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://nfsen.sourceforge.net/ @@ -15,34 +15,38 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= janos.mohacsi@bsd.hu COMMENT= Web based frontend to nfdump netflow collector -RUN_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/net/rrdtool \ - nfdump:${PORTSDIR}/net-mgmt/nfdump +RUN_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/net/rrdtool + +.if defined(WITH_IPV6) && !defined(NO_INET6) +RUN_DEPENDS+= nfdump:${PORTSDIR}/net-mgmt/nfdump-devel +.else +RUN_DEPENDS+= nfdump:${PORTSDIR}/net-mgmt/nfdump +.endif -HAS_CONFIGURE= yes USE_ICONV= yes USE_PERL5= yes USE_PHP= session pcre NO_BUILD= yes -USE_REINPLACE= yes PLIST_SUB+= PORTNAME=${PORTNAME} .include -pre-everything:: .if ${PERL_LEVEL} < 500600 IGNORE= requires at least perl 5.6.0 .endif -do-configure: - ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' -e 's,%%PORTNAME%%,${PORTNAME},' \ +post-patch: + @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' -e 's,%%PORTNAME%%,${PORTNAME},' \ ${WRKSRC}/etc/nfsen-dist.conf - ${REINPLACE_CMD} -e 's,%%PERL%%,${PERL},' ${WRKSRC}/install.pl - ${RM} ${WRKSRC}/etc/nfsen-dist.conf.* + @${REINPLACE_CMD} -e 's,%%PERL%%,${PERL},' -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/install.pl + @${RM} ${WRKSRC}/etc/nfsen-dist.conf.* do-install: - ${MKDIR} ${PREFIX}/var/${PORTNAME}/profiles/live - cd ${WRKSRC} ;${PERL} ${WRKSRC}/install.pl ${WRKSRC}/etc/nfsen-dist.conf + @${MKDIR} ${PREFIX}/var/${PORTNAME}/profiles/live + @${MKDIR} ${PREFIX}/libexec/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/installer-items/CopyRecursive.pm ${PREFIX}/libexec/${PORTNAME}/ ${INSTALL_SCRIPT} ${WRKSRC}/install.pl ${PREFIX}/bin/nfsen-reconfigure + cd ${WRKSRC} ;${PERL} ${WRKSRC}/install.pl ${WRKSRC}/etc/nfsen-dist.conf @${ECHO_MSG} "Configure your ${LOCALBASE}/etc/nfsen.conf to have necessary profiles "; @${ECHO_MSG} "Then run 'nfsen-reconfigure ${LOCALBASE}/etc/nfsen.conf' to correctly setup profile files"; diff --git a/net-mgmt/nfsen-devel/distinfo b/net-mgmt/nfsen-devel/distinfo index 38da4e5ce623..c5efbfcb18ce 100644 --- a/net-mgmt/nfsen-devel/distinfo +++ b/net-mgmt/nfsen-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (nfsen-1.2.2.tar.gz) = 26bbb94766ef70f1e350004cc671b2d7 -SHA256 (nfsen-1.2.2.tar.gz) = 6a9a4d31cb5fe7592656f16c3390fae0c3845283c2b47c938f07665fa7fa52a2 -SIZE (nfsen-1.2.2.tar.gz) = 3331005 +MD5 (nfsen-1.2.3.tar.gz) = bb18418d021526fea40bc3f88a837bc1 +SHA256 (nfsen-1.2.3.tar.gz) = dcd362f082d6a92b4400c69bf1784c3ee0c0e95a5c7c617ece36698ce7cba535 +SIZE (nfsen-1.2.3.tar.gz) = 3331295 diff --git a/net-mgmt/nfsen-devel/files/patch-install.pl b/net-mgmt/nfsen-devel/files/patch-install.pl index 6aabeb302540..dd144f62fb55 100644 --- a/net-mgmt/nfsen-devel/files/patch-install.pl +++ b/net-mgmt/nfsen-devel/files/patch-install.pl @@ -3,6 +3,12 @@ $FreeBSD$ --- install.pl.orig +++ install.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -I installer-items ++#!%%PERL%% -I %%PREFIX%%/libexec/nfsen + # + # + # Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung @@ -56,33 +56,7 @@ # Get Perl sub GetPerl { diff --git a/net-mgmt/nfsen-devel/pkg-plist b/net-mgmt/nfsen-devel/pkg-plist index 3b824342b6b2..561603d08ca1 100644 --- a/net-mgmt/nfsen-devel/pkg-plist +++ b/net-mgmt/nfsen-devel/pkg-plist @@ -8,6 +8,7 @@ bin/testPlugin etc/nfsen-dist.conf @exec [ -f %D/etc/nfsen.conf ] || cp %D/etc/nfsen-dist.conf %D/etc/nfsen.conf etc/nfsen-shell-param +libexec/%%PORTNAME%%/CopyRecursive.pm libexec/%%PORTNAME%%/GenGraph.pl libexec/%%PORTNAME%%/Log.pm libexec/%%PORTNAME%%/NfConf.pm diff --git a/net-mgmt/nfsen/Makefile b/net-mgmt/nfsen/Makefile index dc5b6ba7d466..5ea22e564604 100644 --- a/net-mgmt/nfsen/Makefile +++ b/net-mgmt/nfsen/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nfsen -PORTVERSION= 1.2.2 +PORTVERSION= 1.2.3 CATEGORIES= net-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://nfsen.sourceforge.net/ @@ -15,34 +15,38 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= janos.mohacsi@bsd.hu COMMENT= Web based frontend to nfdump netflow collector -RUN_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/net/rrdtool \ - nfdump:${PORTSDIR}/net-mgmt/nfdump +RUN_DEPENDS= ${SITE_PERL}/RRDp.pm:${PORTSDIR}/net/rrdtool + +.if defined(WITH_IPV6) && !defined(NO_INET6) +RUN_DEPENDS+= nfdump:${PORTSDIR}/net-mgmt/nfdump-devel +.else +RUN_DEPENDS+= nfdump:${PORTSDIR}/net-mgmt/nfdump +.endif -HAS_CONFIGURE= yes USE_ICONV= yes USE_PERL5= yes USE_PHP= session pcre NO_BUILD= yes -USE_REINPLACE= yes PLIST_SUB+= PORTNAME=${PORTNAME} .include -pre-everything:: .if ${PERL_LEVEL} < 500600 IGNORE= requires at least perl 5.6.0 .endif -do-configure: - ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' -e 's,%%PORTNAME%%,${PORTNAME},' \ +post-patch: + @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' -e 's,%%PORTNAME%%,${PORTNAME},' \ ${WRKSRC}/etc/nfsen-dist.conf - ${REINPLACE_CMD} -e 's,%%PERL%%,${PERL},' ${WRKSRC}/install.pl - ${RM} ${WRKSRC}/etc/nfsen-dist.conf.* + @${REINPLACE_CMD} -e 's,%%PERL%%,${PERL},' -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/install.pl + @${RM} ${WRKSRC}/etc/nfsen-dist.conf.* do-install: - ${MKDIR} ${PREFIX}/var/${PORTNAME}/profiles/live - cd ${WRKSRC} ;${PERL} ${WRKSRC}/install.pl ${WRKSRC}/etc/nfsen-dist.conf + @${MKDIR} ${PREFIX}/var/${PORTNAME}/profiles/live + @${MKDIR} ${PREFIX}/libexec/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/installer-items/CopyRecursive.pm ${PREFIX}/libexec/${PORTNAME}/ ${INSTALL_SCRIPT} ${WRKSRC}/install.pl ${PREFIX}/bin/nfsen-reconfigure + cd ${WRKSRC} ;${PERL} ${WRKSRC}/install.pl ${WRKSRC}/etc/nfsen-dist.conf @${ECHO_MSG} "Configure your ${LOCALBASE}/etc/nfsen.conf to have necessary profiles "; @${ECHO_MSG} "Then run 'nfsen-reconfigure ${LOCALBASE}/etc/nfsen.conf' to correctly setup profile files"; diff --git a/net-mgmt/nfsen/distinfo b/net-mgmt/nfsen/distinfo index 38da4e5ce623..c5efbfcb18ce 100644 --- a/net-mgmt/nfsen/distinfo +++ b/net-mgmt/nfsen/distinfo @@ -1,3 +1,3 @@ -MD5 (nfsen-1.2.2.tar.gz) = 26bbb94766ef70f1e350004cc671b2d7 -SHA256 (nfsen-1.2.2.tar.gz) = 6a9a4d31cb5fe7592656f16c3390fae0c3845283c2b47c938f07665fa7fa52a2 -SIZE (nfsen-1.2.2.tar.gz) = 3331005 +MD5 (nfsen-1.2.3.tar.gz) = bb18418d021526fea40bc3f88a837bc1 +SHA256 (nfsen-1.2.3.tar.gz) = dcd362f082d6a92b4400c69bf1784c3ee0c0e95a5c7c617ece36698ce7cba535 +SIZE (nfsen-1.2.3.tar.gz) = 3331295 diff --git a/net-mgmt/nfsen/files/patch-install.pl b/net-mgmt/nfsen/files/patch-install.pl index 6aabeb302540..dd144f62fb55 100644 --- a/net-mgmt/nfsen/files/patch-install.pl +++ b/net-mgmt/nfsen/files/patch-install.pl @@ -3,6 +3,12 @@ $FreeBSD$ --- install.pl.orig +++ install.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -I installer-items ++#!%%PERL%% -I %%PREFIX%%/libexec/nfsen + # + # + # Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung @@ -56,33 +56,7 @@ # Get Perl sub GetPerl { diff --git a/net-mgmt/nfsen/pkg-plist b/net-mgmt/nfsen/pkg-plist index 3b824342b6b2..561603d08ca1 100644 --- a/net-mgmt/nfsen/pkg-plist +++ b/net-mgmt/nfsen/pkg-plist @@ -8,6 +8,7 @@ bin/testPlugin etc/nfsen-dist.conf @exec [ -f %D/etc/nfsen.conf ] || cp %D/etc/nfsen-dist.conf %D/etc/nfsen.conf etc/nfsen-shell-param +libexec/%%PORTNAME%%/CopyRecursive.pm libexec/%%PORTNAME%%/GenGraph.pl libexec/%%PORTNAME%%/Log.pm libexec/%%PORTNAME%%/NfConf.pm -- cgit