ports/172068: sysutils/nitrogen: Update to version 1.5.2

Tue Sep 25 18:20:22 UTC 2012

>Number:         172068
>Category:       ports
>Synopsis:       sysutils/nitrogen: Update to version 1.5.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 25 18:20:21 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update to version 1.5.2

Remove file:
files/patch-src-Thumbview.cc

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/sysutils/nitrogen/Makefile sysutils/nitrogen/Makefile

--- /usr/ports/sysutils/nitrogen/Makefile	2012-09-22 14:18:20.000000000 +0900
+++ sysutils/nitrogen/Makefile	2012-09-25 01:34:57.000000000 +0900
@@ -2,42 +2,45 @@
 # $FreeBSD: ports/sysutils/nitrogen/Makefile,v 1.9 2012/09/22 05:18:20 tabthorpe Exp $
 
 PORTNAME=	nitrogen
-PORTVERSION=	1.5.1
-PORTREVISION=	1
+PORTVERSION=	1.5.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://projects.l3ib.org/nitrogen/files/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Background browser and setter for X windows
 
+LICENSE=	GPLv2 # (or later)
+
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 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
+RUN_DEPENDS=	gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \
+		hicolor-icon-theme>0:${PORTSDIR}/misc/hicolor-icon-theme
 
-LICENSE=	GPLv2
+OPTIONS_DEFINE=	XINERAMA
+OPTIONS_DEFAULT=XINERAMA
 
 USE_GNOME=	gtk20
-INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-inotify
-CXXFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+INSTALLS_ICONS=	yes
+MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	XINERAMA "Xinerama support" on
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		nitrogen.1
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_XINERAMA)
-CONFIGURE_ARGS+=--disable-xinerama
-.else
-CONFIGURE_ARGS+=--enable-xinerama
+.if ${PORT_OPTIONS:MXINERAMA}
 USE_XORG+=	xinerama
+CONFIGURE_ARGS+=--enable-xinerama
+.else
+CONFIGURE_ARGS+=--disable-xinerama
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/data/icon-theme-installer
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/sysutils/nitrogen/distinfo sysutils/nitrogen/distinfo
--- /usr/ports/sysutils/nitrogen/distinfo	2011-03-19 21:32:56.000000000 +0900
+++ sysutils/nitrogen/distinfo	2012-09-24 19:41:24.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (nitrogen-1.5.1.tar.gz) = 10b0c84c5c98a4c27bfad60588af0648756542793e380b58c67111b62a88c16f
-SIZE (nitrogen-1.5.1.tar.gz) = 300606
+SHA256 (nitrogen-1.5.2.tar.gz) = 60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2
+SIZE (nitrogen-1.5.2.tar.gz) = 307356
diff -urN /usr/ports/sysutils/nitrogen/files/patch-data-icon-theme-installer sysutils/nitrogen/files/patch-data-icon-theme-installer
--- /usr/ports/sysutils/nitrogen/files/patch-data-icon-theme-installer	2007-07-31 11:29:50.000000000 +0900
+++ sysutils/nitrogen/files/patch-data-icon-theme-installer	2012-09-25 01:27:12.000000000 +0900
@@ -1,5 +1,11 @@
---- data/icon-theme-installer.orig	Sun Dec 31 16:59:08 2006
-+++ data/icon-theme-installer	Tue Jul  3 21:45:35 2007
+--- data/icon-theme-installer.orig	2007-08-07 07:20:48.000000000 +0900
++++ data/icon-theme-installer	2012-09-25 01:26:45.000000000 +0900
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!%%LOCALBASE%%/bin/bash
+ 
+ # icon-theme-installer
+ # Copyright (C) 2006 Novell, Inc.
 @@ -101,12 +101,12 @@
  	exit 1
  fi
diff -urN /usr/ports/sysutils/nitrogen/files/patch-src-Thumbview.cc sysutils/nitrogen/files/patch-src-Thumbview.cc
--- /usr/ports/sysutils/nitrogen/files/patch-src-Thumbview.cc	2010-08-03 05:18:28.000000000 +0900
+++ sysutils/nitrogen/files/patch-src-Thumbview.cc	1970-01-01 09:00:00.000000000 +0900
@@ -1,16 +0,0 @@
---- 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 @@
- 	}
- }
- 
-+#endif
-+
- void Thumbview::set_current_display_mode(DisplayMode newmode)
- {
-     remove();
-@@ -776,4 +778,3 @@
-     signal_selected(path);
- }
- 
--#endif
diff -urN /usr/ports/sysutils/nitrogen/pkg-descr sysutils/nitrogen/pkg-descr
--- /usr/ports/sysutils/nitrogen/pkg-descr	2007-07-31 11:29:50.000000000 +0900
+++ sysutils/nitrogen/pkg-descr	2012-09-24 19:37:46.000000000 +0900
@@ -1,4 +1,4 @@
 Nitrogen is a background browser and setter for X windows. It is written
 in C++ using the gtkmm toolkit.
 
-WWW: http://l3ib.org/nitrogen
+WWW: http://projects.l3ib.org/nitrogen
diff -urN /usr/ports/sysutils/nitrogen/pkg-plist sysutils/nitrogen/pkg-plist
--- /usr/ports/sysutils/nitrogen/pkg-plist	2010-08-03 05:18:28.000000000 +0900
+++ sysutils/nitrogen/pkg-plist	2012-09-25 01:33:34.000000000 +0900
@@ -1,12 +1,12 @@
 bin/nitrogen
 share/icons/hicolor/128x128/apps/nitrogen.png
-share/icons/hicolor/16x16/apps/nitrogen.png
-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-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/apps/nitrogen.png
+share/icons/hicolor/16x16/devices/video-display.png
 share/icons/hicolor/16x16/mimetypes/image-x-generic.png
+share/icons/hicolor/22x22/apps/nitrogen.png
+share/icons/hicolor/32x32/apps/nitrogen.png
+share/icons/hicolor/48x48/apps/nitrogen.png
>Release-Note:
>Audit-Trail:
>Unformatted:

