Date: Sat, 28 Sep 2013 15:02:14 +0000 (UTC) From: Olivier Duchateau <olivierd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328575 - in head/deskutils/steadyflow: . files Message-ID: <201309281502.r8SF2ER0031888@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivierd Date: Sat Sep 28 15:02:14 2013 New Revision: 328575 URL: http://svnweb.freebsd.org/changeset/ports/328575 Log: - 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) Added: head/deskutils/steadyflow/files/patch-CMakeLists.txt (contents, props changed) head/deskutils/steadyflow/files/patch-cmake__FindExtraDeps.cmake (contents, props changed) Modified: head/deskutils/steadyflow/Makefile head/deskutils/steadyflow/pkg-descr (contents, props changed) head/deskutils/steadyflow/pkg-plist Modified: head/deskutils/steadyflow/Makefile ============================================================================== --- head/deskutils/steadyflow/Makefile Sat Sep 28 15:02:05 2013 (r328574) +++ head/deskutils/steadyflow/Makefile Sat Sep 28 15:02:14 2013 (r328575) @@ -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> Added: head/deskutils/steadyflow/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/steadyflow/files/patch-CMakeLists.txt Sat Sep 28 15:02:14 2013 (r328575) @@ -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 Added: head/deskutils/steadyflow/files/patch-cmake__FindExtraDeps.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/steadyflow/files/patch-cmake__FindExtraDeps.cmake Sat Sep 28 15:02:14 2013 (r328575) @@ -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() + Modified: head/deskutils/steadyflow/pkg-descr ============================================================================== --- head/deskutils/steadyflow/pkg-descr Sat Sep 28 15:02:05 2013 (r328574) +++ head/deskutils/steadyflow/pkg-descr Sat Sep 28 15:02:14 2013 (r328575) @@ -2,4 +2,4 @@ Steadyflow is a GTK+ based download mana 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 Modified: head/deskutils/steadyflow/pkg-plist ============================================================================== --- head/deskutils/steadyflow/pkg-plist Sat Sep 28 15:02:05 2013 (r328574) +++ head/deskutils/steadyflow/pkg-plist Sat Sep 28 15:02:14 2013 (r328575) @@ -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/steadyflo @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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309281502.r8SF2ER0031888>