diff options
| author | Michael Scheidell <scheidell@FreeBSD.org> | 2012-04-05 06:17:52 +0000 |
|---|---|---|
| committer | Michael Scheidell <scheidell@FreeBSD.org> | 2012-04-05 06:17:52 +0000 |
| commit | 2e24d295dca17f63c8ca27fa6ffbf481e03d24e2 (patch) | |
| tree | e0513c98428318ec336c9721f2fa5ed947ad5a5f | |
| parent | 82f13184e6cc45958f46c09c4bd1f4f3386d4f8e (diff) | |
| download | freebsd-ports-2e24d295dca17f63c8ca27fa6ffbf481e03d24e2.zip | |
- Resolve conflict with nagios
PR: ports/166573
Reported by: bapt@
Submitted by: Ildar Hizbulin <hizel@vyborg.ru> (maintainer)
Feature safe: yes
| -rw-r--r-- | net-mgmt/nagiosgraph/Makefile | 4 | ||||
| -rw-r--r-- | net-mgmt/nagiosgraph/pkg-plist | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/net-mgmt/nagiosgraph/Makefile b/net-mgmt/nagiosgraph/Makefile index d8cd7253f358..ab2e0ef2ced0 100644 --- a/net-mgmt/nagiosgraph/Makefile +++ b/net-mgmt/nagiosgraph/Makefile @@ -7,6 +7,7 @@ PORTNAME= nagiosgraph PORTVERSION= 1.4.4 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= SF @@ -68,8 +69,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/${NAGIOSWWWDIR}/stylesheets .endfor - ${MV} ${PREFIX}/${NAGIOSWWWDIR}/images/action.gif ${PREFIX}/${NAGIOSWWWDIR}/images/action.gif.bak - ${INSTALL_DATA} ${WRKSRC}/share/graph.gif ${PREFIX}/${NAGIOSWWWDIR}/images/action.gif + ${INSTALL_DATA} ${WRKSRC}/share/graph.gif ${PREFIX}/${NAGIOSWWWDIR}/images/action-nagiosgraph.gif .if !defined(NOPORTEXAMPLES) ${MKDIR} ${EXAMPLESDIR} diff --git a/net-mgmt/nagiosgraph/pkg-plist b/net-mgmt/nagiosgraph/pkg-plist index e78524583cfb..23f4de4b02ad 100644 --- a/net-mgmt/nagiosgraph/pkg-plist +++ b/net-mgmt/nagiosgraph/pkg-plist @@ -43,9 +43,7 @@ libexec/%%PORTNAME%%/insert.pl %%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showhost.cgi %%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/showservice.cgi %%NAGIOSWWWDIR%%/cgi-bin/%%PORTNAME%%/testcolor.cgi -@exec mv %D/%%NAGIOSWWWDIR%%%/images/action.gif %D/%%NAGIOSWWWDIR%%/images/action.gif.bak -%%NAGIOSWWWDIR%%/images/action.gif -@unexec mv %D/%%NAGIOSWWWDIR%%%/images/action.gif.bak %D/%%NAGIOSWWWDIR%%/images/action.gif +%%NAGIOSWWWDIR%%/images/action-nagiosgraph.gif %%NAGIOSWWWDIR%%/stylesheets/%%PORTNAME%%.css %%NAGIOSWWWDIR%%/stylesheets/%%PORTNAME%%.js %%NAGIOSWWWDIR%%/stylesheets/%%PORTNAME%%.ssi |