Bug 196225 - misc/nagios-base-logos conflicts with nagios images
Summary: misc/nagios-base-logos conflicts with nagios images
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Many People
Assignee: Dmitry Sivachenko
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-12-23 08:32 UTC by Krzysztof
Modified: 2015-01-05 09:51 UTC (History)
0 users

See Also:
bugzilla: maintainer-feedback? (demon)

Attachments
Makefile.patch (489 bytes, patch)
2014-12-23 08:32 UTC, Krzysztof 		no flags Details | Diff
pkg-plist.patch (11.29 KB, patch)
2014-12-23 08:32 UTC, Krzysztof 		no flags Details | Diff
Makefile.patch (550 bytes, patch)
2014-12-23 09:14 UTC, Krzysztof 		no flags Details | Diff
poudriere.log (9.82 KB, text/plain)
2014-12-23 09:16 UTC, Krzysztof 		no flags Details
diff of logos files: logos-base and nagios-core (2.73 KB, text/plain)
2015-01-05 09:37 UTC, Krzysztof 		no flags Details
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Krzysztof 2014-12-23 08:32:17 UTC 
Created attachment 150901 [details]
Makefile.patch

I have monitoring server with nagios installed. Also I need some more images (logos) from misc/nagios-base-logos. But both nagios and misc/nagios-base-logos have got some common images. So there is conflict during installation.

I think it is good idea to install misc/nagios-base-logos to base/ subdir. This will be more elstic for users.

I've made patches. They are very simple. I'll test them via poudriere soon, so I will attach poudriere logs also
Comment 1 Bugzilla Automation freebsd_committer freebsd_triage 2014-12-23 08:32:17 UTC 
Auto-assigned to maintainer demon@FreeBSD.org
Comment 2 Krzysztof 2014-12-23 08:32:55 UTC 
Created attachment 150902 [details]
pkg-plist.patch
Comment 3 Krzysztof 2014-12-23 09:14:49 UTC 
Created attachment 150903 [details]
Makefile.patch
Comment 4 Krzysztof 2014-12-23 09:16:24 UTC 
Created attachment 150904 [details]
poudriere.log

Log from poudriere testport
Comment 5 Dmitry Sivachenko freebsd_committer freebsd_triage 2015-01-02 10:37:12 UTC 
I propose to remove duplicates from nagios-base-logos instead (and install files to the same directory).

So we avoid spamming system with duplicate images and keeping all images in the same place.

What do you think?
Comment 6 Krzysztof 2015-01-05 09:34:09 UTC 
Weel, I think I've done a bug too quickly. After investigation I've found, that nagios logos (installed with nagios) have more files that nagios-logos-base (I'm attaching diff of files).

So I think that my first suggestion has no sense :-)))

Maybe this port is not needed any more? I have no idea when base logos are installed without nagios...
Comment 7 Krzysztof 2015-01-05 09:37:08 UTC 
Created attachment 151348 [details]
diff of logos files: logos-base and nagios-core

I've installed base logos to seperate directory and make diff of logos installed with with nagios port. There are two columns: filename and filesize. As you can see base logos has less logos than nagios itself
Comment 8 Dmitry Sivachenko freebsd_committer freebsd_triage 2015-01-05 09:49:35 UTC 
Ah, I see, probably at some time they included these additional logos into main distribution (with update of nagios to version 3.3.1).
Comment 9 commit-hook freebsd_committer freebsd_triage 2015-01-05 09:51:37 UTC 
A commit references this bug:

Author: demon
Date: Mon Jan  5 09:51:04 UTC 2015
New revision: 376290
URL: https://svnweb.freebsd.org/changeset/ports/376290

Log:
  Remove nagios-base-logos, all these files are now in nagios distribution.

  PR:		196225
  Submitted by:	ports@bsdserwis.com

Changes:
  head/misc/Makefile
  head/misc/nagios-base-logos/