From 6e5d381748a70531c89db10af376e1aae51ce48b Mon Sep 17 00:00:00 2001 From: Pawel Pekala Date: Fri, 9 Nov 2012 22:01:27 +0000 Subject: [PATCH] - Update to version 1.5.2 - Convert to optionsNG - Mark MAKE_JOBS_SAFE - Update projects homepage While I'm here: - Add missing deps - Install desktop entry file PR: ports/172068 Submitted by: KATO Tsuguru Feature safe: yes --- sysutils/nitrogen/Makefile | 54 +++++++++++++------ sysutils/nitrogen/distinfo | 4 +- .../files/patch-data-icon-theme-installer | 10 +++- .../nitrogen/files/patch-src-Thumbview.cc | 16 ------ sysutils/nitrogen/pkg-descr | 2 +- sysutils/nitrogen/pkg-plist | 10 ++-- 6 files changed, 54 insertions(+), 42 deletions(-) delete mode 100644 sysutils/nitrogen/files/patch-src-Thumbview.cc diff --git a/sysutils/nitrogen/Makefile b/sysutils/nitrogen/Makefile index 142decb936a7..a361eebca7ee 100644 --- a/sysutils/nitrogen/Makefile +++ b/sysutils/nitrogen/Makefile @@ -2,43 +2,65 @@ # $FreeBSD$ PORTNAME= nitrogen -PORTVERSION= 1.5.1 -PORTREVISION= 1 +PORTVERSION= 1.5.2 CATEGORIES= sysutils MASTER_SITES= http://projects.l3ib.org/nitrogen/files/ MAINTAINER= ports@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 - -LICENSE= GPLv2 - -USE_GNOME= gtk20 -INSTALLS_ICONS= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-inotify -CXXFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +LIB_DEPENDS= atkmm:${PORTSDIR}/accessibility/atkmm \ + glibmm:${PORTSDIR}/devel/glibmm \ + pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ + sigc-2.0:${PORTSDIR}/devel/libsigc++20 \ + pcre:${PORTSDIR}/devel/pcre \ + cairo:${PORTSDIR}/graphics/cairo \ + cairomm:${PORTSDIR}/graphics/cairomm \ + png15:${PORTSDIR}/graphics/png \ + freetype:${PORTSDIR}/print/freetype2 \ + expat:${PORTSDIR}/textproc/expat2 \ + fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ + gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \ + pangomm:${PORTSDIR}/x11-toolkits/pangomm \ + xcb:${PORTSDIR}/x11/libxcb +RUN_DEPENDS= gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \ + hicolor-icon-theme>0:${PORTSDIR}/misc/hicolor-icon-theme OPTIONS_DEFINE= XINERAMA -OPTIONS_DEFAULT= XINERAMA +OPTIONS_DEFAULT=XINERAMA + +USE_GETTEXT= yes +USE_ICONV= yes +USE_GNOME= gtk20 +USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \ + xrandr xrender +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-inotify +INSTALLS_ICONS= yes +MAKE_JOBS_SAFE= yes + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= nitrogen.1 +DESKTOP_ENTRIES="Nitrogen" "${COMMENT}" "${PORTNAME}.png" "${PORTNAME}" \ + "Graphics;Viewer;" true + .include .if ${PORT_OPTIONS:MXINERAMA} -CONFIGURE_ARGS+=--enable-xinerama 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 diff --git a/sysutils/nitrogen/distinfo b/sysutils/nitrogen/distinfo index a4aa6be4cdff..eb35deb52cd1 100644 --- a/sysutils/nitrogen/distinfo +++ b/sysutils/nitrogen/distinfo @@ -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 --git a/sysutils/nitrogen/files/patch-data-icon-theme-installer b/sysutils/nitrogen/files/patch-data-icon-theme-installer index ba76ba65c353..8a2dcaf0d2b9 100644 --- a/sysutils/nitrogen/files/patch-data-icon-theme-installer +++ b/sysutils/nitrogen/files/patch-data-icon-theme-installer @@ -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 --git a/sysutils/nitrogen/files/patch-src-Thumbview.cc b/sysutils/nitrogen/files/patch-src-Thumbview.cc deleted file mode 100644 index be393812d913..000000000000 --- a/sysutils/nitrogen/files/patch-src-Thumbview.cc +++ /dev/null @@ -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 --git a/sysutils/nitrogen/pkg-descr b/sysutils/nitrogen/pkg-descr index 5cb6d8bda6c4..2bf887d34ad3 100644 --- a/sysutils/nitrogen/pkg-descr +++ b/sysutils/nitrogen/pkg-descr @@ -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 --git a/sysutils/nitrogen/pkg-plist b/sysutils/nitrogen/pkg-plist index aa719e93a3ca..6628ce8d30fc 100644 --- a/sysutils/nitrogen/pkg-plist +++ b/sysutils/nitrogen/pkg-plist @@ -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