Update to 1.5.1

Add LICENSE

PR:		ports/149137
Submitted by:	Armin Pirkovitsch <armin at frozen-zone.org>
Approved by:	Jonathan Liu (maintainer)

5 files changed, 23 insertions, 53 deletions

diff --git a/sysutils/nitrogen/Makefile b/sysutils/nitrogen/Makefile
index fb3978a3bcdb..9d5bd10eb298 100644
--- a/sysutils/nitrogen/Makefile
+++ b/sysutils/nitrogen/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	nitrogen
-PORTVERSION=	1.0
-PORTREVISION=	4
+PORTVERSION=	1.5.1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://l3ib.org/nitrogen/files/ \
-		http://www.sourcefiles.org/Toys/Candy/
+MASTER_SITES=	http://projects.l3ib.org/nitrogen/files/
 
 MAINTAINER=	Net147@hotmail.com
 COMMENT=	Background browser and setter for X windows
@@ -20,6 +18,8 @@ LIB_DEPENDS=	gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24
 RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
+LICENSE=	GPLv2
+
 USE_GNOME=	gtk20
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/nitrogen/distinfo b/sysutils/nitrogen/distinfo
index 5d60be42cff3..e5fcaadd1bd6 100644
--- a/sysutils/nitrogen/distinfo
+++ b/sysutils/nitrogen/distinfo
@@ -1,3 +1,3 @@
-MD5 (nitrogen-1.0.tar.gz) = 9f5cae247a6aae12900a72cff4cd24f2
-SHA256 (nitrogen-1.0.tar.gz) = 7e708ed33bdde8d4d4a122207337e061a9ab4f3f62cfd08a617576dd55300213
-SIZE (nitrogen-1.0.tar.gz) = 231632
+MD5 (nitrogen-1.5.1.tar.gz) = e683d7c10c17bd18eb9fd78c87c4e08c
+SHA256 (nitrogen-1.5.1.tar.gz) = 10b0c84c5c98a4c27bfad60588af0648756542793e380b58c67111b62a88c16f
+SIZE (nitrogen-1.5.1.tar.gz) = 300606
diff --git a/sysutils/nitrogen/files/patch-src-NWindow.cc b/sysutils/nitrogen/files/patch-src-NWindow.cc
deleted file mode 100644
index c635ac99970a..000000000000
--- a/sysutils/nitrogen/files/patch-src-NWindow.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/NWindow.cc.orig	Sat May 12 05:12:25 2007
-+++ src/NWindow.cc	Wed Jul  4 17:07:08 2007
-@@ -155,9 +155,16 @@
- void NWindow::setup_select_boxes() {
- 		
- 	Glib::RefPtr<Gtk::IconTheme> icontheme = Gtk::IconTheme::get_default();
-+	Glib::RefPtr<Gtk::IconTheme> gnomeicontheme = Gtk::IconTheme::create();
- 	Glib::RefPtr<Gdk::Pixbuf> icon, genericicon;
- 
--	genericicon = icontheme->load_icon("image-x-generic", 16, Gtk::ICON_LOOKUP_NO_SVG);
-+	gnomeicontheme->set_custom_theme("gnome");
-+
-+	try {
-+		genericicon = icontheme->load_icon("image-x-generic", 16, Gtk::ICON_LOOKUP_NO_SVG);
-+	} catch (...) {
-+		genericicon = gnomeicontheme->load_icon("image-x-generic", 16, Gtk::ICON_LOOKUP_NO_SVG);
-+	}
- 
- 	// modes
- 	try {
diff --git a/sysutils/nitrogen/files/patch-src-Thumbview.cc b/sysutils/nitrogen/files/patch-src-Thumbview.cc
index 0b4dec6254ed..be393812d913 100644
--- a/sysutils/nitrogen/files/patch-src-Thumbview.cc
+++ b/sysutils/nitrogen/files/patch-src-Thumbview.cc
@@ -1,27 +1,16 @@
---- src/Thumbview.cc.orig	Tue Jan 30 04:01:36 2007
-+++ src/Thumbview.cc	Wed Jul  4 17:10:44 2007
-@@ -56,6 +56,11 @@
-  * Constructor, sets up gtk stuff, inits data and queues
-  */
- Thumbview::Thumbview() : dir("") {
-+	Glib::RefPtr<Gtk::IconTheme> icontheme = Gtk::IconTheme::get_default();
-+	Glib::RefPtr<Gtk::IconTheme> gnomeicontheme = Gtk::IconTheme::create();
-+
-+	gnomeicontheme->set_custom_theme("gnome");
-+
- 	set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
- 	set_shadow_type (Gtk::SHADOW_IN);
+--- src/Thumbview.cc.orig	2010-07-31 08:36:07.000000000 +0200
++++ src/Thumbview.cc	2010-07-31 08:36:33.000000000 +0200
+@@ -745,6 +745,8 @@
+ 	}
+ }
  
-@@ -96,7 +101,11 @@
- 	// store->set_sort_column (short_filename, Gtk::SORT_ASCENDING);
- 
- 	// load loading image
--	this->loading_image = Gtk::IconTheme::get_default()->load_icon("image-loading", 64, Gtk::ICON_LOOKUP_FORCE_SVG);
-+	try {
-+		this->loading_image = icontheme->load_icon("image-loading", 64, Gtk::ICON_LOOKUP_FORCE_SVG);
-+	} catch (...) {
-+		this->loading_image = gnomeicontheme->load_icon("image-loading", 64, Gtk::ICON_LOOKUP_FORCE_SVG);
-+	}
++#endif
++
+ void Thumbview::set_current_display_mode(DisplayMode newmode)
+ {
+     remove();
+@@ -776,4 +778,3 @@
+     signal_selected(path);
+ }
  
- 	// make our async queues
- 	this->aqueue_createthumbs = g_async_queue_new();
+-#endif
diff --git a/sysutils/nitrogen/pkg-plist b/sysutils/nitrogen/pkg-plist
index 20750baa1bcf..aa719e93a3ca 100644
--- a/sysutils/nitrogen/pkg-plist
+++ b/sysutils/nitrogen/pkg-plist
@@ -5,7 +5,8 @@ share/icons/hicolor/22x22/apps/nitrogen.png
 share/icons/hicolor/32x32/apps/nitrogen.png
 share/icons/hicolor/48x48/apps/nitrogen.png
 share/icons/hicolor/16x16/devices/video-display.png
-share/icons/hicolor/16x16/actions/wallpaper-bestfit.png
 share/icons/hicolor/16x16/actions/wallpaper-centered.png
 share/icons/hicolor/16x16/actions/wallpaper-scaled.png
 share/icons/hicolor/16x16/actions/wallpaper-tiled.png
+share/icons/hicolor/16x16/actions/wallpaper-zoomed.png
+share/icons/hicolor/16x16/mimetypes/image-x-generic.png