Date: Mon, 2 Apr 2012 07:02:21 GMT From: Ildar Hizbulin <hizel@vyborg.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/166573: [MANTAINER UPDATE] net-mgmt/nagiosgraph for compatible with pkgng Message-ID: <201204020702.q3272LX9077238@red.freebsd.org> Resent-Message-ID: <201204020710.q327ABQr094433@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 166573
>Category: ports
>Synopsis: [MANTAINER UPDATE] net-mgmt/nagiosgraph for compatible with pkgng
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Apr 02 07:10:11 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Ildar Hizbulin
>Release: 9.0-RELEASE
>Organization:
Ariadna-Link, JSC
>Environment:
FreeBSD nine 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Remove overwrite original nagios action.gif file for solve confilcts:
error report is:
pkg: nagiosgraph-1.4.4 conflicts with nagios-3.3.1 (installs files into the same
place). Problematic file: /usr/local/www/nagios/images/action.gif
thanks bapt@freebsd.org
>How-To-Repeat:
use pkgng
>Fix:
Patch attached with submission follows:
diff -ruN net-mgmt/nagiosgraph.orig/Makefile net-mgmt/nagiosgraph/Makefile
--- net-mgmt/nagiosgraph.orig/Makefile 2012-04-02 10:30:48.000000000 +0400
+++ net-mgmt/nagiosgraph/Makefile 2012-04-02 10:49:35.000000000 +0400
@@ -7,6 +7,7 @@
PORTNAME= nagiosgraph
PORTVERSION= 1.4.4
+PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= SF
@@ -68,8 +69,7 @@
${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 -ruN net-mgmt/nagiosgraph.orig/pkg-plist net-mgmt/nagiosgraph/pkg-plist
--- net-mgmt/nagiosgraph.orig/pkg-plist 2012-04-02 10:30:48.000000000 +0400
+++ net-mgmt/nagiosgraph/pkg-plist 2012-04-02 10:49:55.000000000 +0400
@@ -43,9 +43,7 @@
%%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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204020702.q3272LX9077238>