- Switch to devel/libgee (>= 0.8.x)

- Bump PORTREVISION
- Convert to new LIB_DEPENDS syntax
- Support STAGEDIR
- Adjust GNOME dependencies
- Replace tab by space in WWW entry (pkg-descr)

5 files changed, 58 insertions, 14 deletions

diff --git a/deskutils/steadyflow/Makefile b/deskutils/steadyflow/Makefile
index 8c8fc1c9289c..6f7668209a92 100644
--- a/deskutils/steadyflow/Makefile
+++ b/deskutils/steadyflow/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	steadyflow
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	https://launchpadlibrarian.net/109019071/ \
 	https://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/ \
@@ -12,24 +13,17 @@ COMMENT=	Simple download manager
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-		gee:${PORTSDIR}/devel/libgee06 \
-		notify:${PORTSDIR}/devel/libnotify \
-		unique-1:${PORTSDIR}/x11-toolkits/unique
+LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libgee-0.8.so:${PORTSDIR}/devel/libgee \
+		libnotify.so:${PORTSDIR}/devel/libnotify
 BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
 
 USE_XZ=	yes
 USES=		cmake pkgconfig gettext
 GLIB_SCHEMAS=	net.launchpad.steadyflow.gschema.xml
-USE_GNOME=	desktopfileutils glib20 gtk30
+USE_GNOME=	glib20 gtk30 intltool
 INSTALLS_ICONS=	yes
 CMAKE_ARGS=	-DCOMPILE_GSETTINGS_ON_INSTALL:BOOL=ON \
 		-DWANT_AYATANA:BOOL=OFF
 
-MAN1=	steadyflow.1
-
-NO_STAGE=	yes
-post-install:
-	@-update-desktop-database
-
 .include <bsd.port.mk>
diff --git a/deskutils/steadyflow/files/patch-CMakeLists.txt b/deskutils/steadyflow/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..1f6ba23425bd
--- /dev/null
+++ b/deskutils/steadyflow/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- ./CMakeLists.txt.orig	2012-06-30 12:39:35.000000000 +0000
++++ ./CMakeLists.txt	2013-09-25 11:46:49.000000000 +0000
+@@ -48,7 +48,7 @@
+ )
+ 
+ set(VALA_PACKAGES
+-	gee-1.0
++	${GEE_PACKAGE}
+ 	gio-2.0
+ 	glib-2.0
+ 	gtk+-3.0
diff --git a/deskutils/steadyflow/files/patch-cmake__FindExtraDeps.cmake b/deskutils/steadyflow/files/patch-cmake__FindExtraDeps.cmake
new file mode 100644
index 000000000000..614e9fbaccdb
--- /dev/null
+++ b/deskutils/steadyflow/files/patch-cmake__FindExtraDeps.cmake
@@ -0,0 +1,40 @@
+--- ./cmake/FindExtraDeps.cmake.orig	2012-06-30 12:39:35.000000000 +0000
++++ ./cmake/FindExtraDeps.cmake	2013-09-25 12:11:22.000000000 +0000
+@@ -1,13 +1,31 @@
+ message("-- Checking for libgee...")
+-pkg_check_modules(GEE gee-1.0)
++# libgee <= 0.6.x
++pkg_check_modules(GEE_10 gee-1.0)
++if(GEE_10_FOUND)
++    set(GEE_PACKAGE gee-1.0)
++
++    set(EXTRA_DEP_INCLUDES ${EXTRA_DEP_INCLUDES} ${GEE_10_INCLUDE_DIRS})
++    set(EXTRA_DEP_CFLAGS ${EXTRA_DEP_CFLAGS} ${GEE_10_CFLAGS_OTHER})
++    set(EXTRA_DEP_LIBS ${EXTRA_DEP_LIBS} ${GEE_10_LDFLAGS})
++
++    set(GEE_FOUND true)
++else()
++    # libgee >= 0.8.x
++    pkg_check_modules(GEE_08 gee-0.8)
++    if(GEE_08_FOUND)
++        set(GEE_PACKAGE gee-0.8)
++
++        set(EXTRA_DEP_INCLUDES ${EXTRA_DEP_INCLUDES} ${GEE_08_INCLUDE_DIRS})
++        set(EXTRA_DEP_CFLAGS ${EXTRA_DEP_CFLAGS} ${GEE_08_CFLAGS_OTHER})
++        set(EXTRA_DEP_LIBS ${EXTRA_DEP_LIBS} ${GEE_08_LDFLAGS})
++
++        set(GEE_FOUND true)
++    endif()
++endif()
+ message("-- Checking for libnotify >= 0.7...")
+ pkg_check_modules(LIBNOTIFY libnotify>=0.7)
+ 
+-if(GEE_FOUND)
+-    set(EXTRA_DEP_INCLUDES ${EXTRA_DEP_INCLUDES} ${GEE_INCLUDE_DIRS})
+-    set(EXTRA_DEP_CFLAGS ${EXTRA_DEP_CFLAGS} ${GEE_CFLAGS_OTHER})
+-    set(EXTRA_DEP_LIBS ${EXTRA_DEP_LIBS} ${GEE_LDFLAGS})
+-else()
++if(NOT GEE_FOUND)
+     message(FATAL_ERROR "libgee not found")
+ endif()
+ 
diff --git a/deskutils/steadyflow/pkg-descr b/deskutils/steadyflow/pkg-descr
index 9ae44d2ab6bb..04827c6baa6c 100644
--- a/deskutils/steadyflow/pkg-descr
+++ b/deskutils/steadyflow/pkg-descr
@@ -2,4 +2,4 @@ Steadyflow is a GTK+ based download manager that aims for minimalism, and
 ease of use. It should be easy to control, whether from the GUI, command
 line, or D-Bus.
 
-WWW:	https://launchpad.net/steadyflow
+WWW: https://launchpad.net/steadyflow
diff --git a/deskutils/steadyflow/pkg-plist b/deskutils/steadyflow/pkg-plist
index f84170d838df..f70abfed6076 100644
--- a/deskutils/steadyflow/pkg-plist
+++ b/deskutils/steadyflow/pkg-plist
@@ -1,4 +1,5 @@
 bin/steadyflow
+man/man1/steadyflow.1.gz
 share/applications/steadyflow.desktop
 share/icons/hicolor/16x16/apps/steadyflow.svg
 share/icons/hicolor/22x22/apps/steadyflow.svg
@@ -78,5 +79,3 @@ share/locale/zh_TW/LC_MESSAGES/steadyflow.mo
 @dirrmtry share/locale/fo
 @dirrmtry share/locale/ast/LC_MESSAGES
 @dirrmtry share/locale/ast
-@exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true