diff options
-rw-r--r-- | audio/abraca/Makefile | 31 | ||||
-rw-r--r-- | audio/abraca/distinfo | 4 | ||||
-rw-r--r-- | audio/abraca/files/patch-SConstruct | 18 | ||||
-rw-r--r-- | audio/abraca/files/patch-data_SConscript | 13 | ||||
-rw-r--r-- | audio/abraca/files/patch-data_ui_SConscript | 13 | ||||
-rw-r--r-- | audio/abraca/files/patch-src-components-filter-filter_model.vala | 11 | ||||
-rw-r--r-- | audio/abraca/files/patch-src-components-playlist-playlist_model.vala | 11 | ||||
-rw-r--r-- | audio/abraca/files/patch-src-medialib.vala | 19 | ||||
-rw-r--r-- | audio/abraca/files/patch-src_components_collections_collections_model.vala | 29 | ||||
-rw-r--r-- | audio/abraca/pkg-plist | 10 |
10 files changed, 29 insertions, 130 deletions
diff --git a/audio/abraca/Makefile b/audio/abraca/Makefile index 4093a570c6cc..0dc37f9bd10a 100644 --- a/audio/abraca/Makefile +++ b/audio/abraca/Makefile @@ -2,19 +2,20 @@ # $FreeBSD$ PORTNAME= abraca -PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTVERSION= 0.8.2 CATEGORIES= audio -MASTER_SITES= http://cloud.github.com/downloads/Abraca/Abraca/ +MASTER_SITES= SF/${PORTNAME} MAINTAINER= madpilot@FreeBSD.org COMMENT= GTK2 client for the XMMS2 music player BUILD_DEPENDS= ${LOCALBASE}/bin/valac:${PORTSDIR}/lang/vala LIB_DEPENDS= libxmmsclient.so:${PORTSDIR}/audio/xmms2 \ - libgee.so:${PORTSDIR}/devel/libgee06 + libgee-0.8.so:${PORTSDIR}/devel/libgee +RUN_DEPENDS= gnome-themes-standard>=3.0.0:${PORTSDIR}/x11-themes/gnome-themes-standard \ + gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme -USES= pkgconfig scons +USES= pkgconfig python:build tar:bzip2 USE_GNOME= gtk30 MAKE_ARGS= MANDIR=${MANPREFIX}/man @@ -27,11 +28,21 @@ NLS_USES= gettext .include <bsd.port.options.mk> -post-configure: -.if ${PORT_OPTIONS:MNLS} - @${REINPLACE_CMD} -e 's/%%NLS%%/1/' ${WRKSRC}/SConstruct -.else - @${REINPLACE_CMD} -e 's/%%NLS%%/0/' ${WRKSRC}/SConstruct +post-patch: +.if ! ${PORT_OPTIONS:MNLS} + @${REINPLACE_CMD} -e '/\.load(/s/ intltool//' \ + -e '/recurse/s/ po//' ${WRKSRC}/wscript .endif +do-configure: + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf configure ${_MAKE_JOBS} \ + --prefix=${PREFIX} --mandir=${PREFIX}/man + +do-build: + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf build ${_MAKE_JOBS} + +do-install: + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} waf install --destdir=${STAGEDIR} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + .include <bsd.port.mk> diff --git a/audio/abraca/distinfo b/audio/abraca/distinfo index a8666b0ef42f..965e9d47b601 100644 --- a/audio/abraca/distinfo +++ b/audio/abraca/distinfo @@ -1,2 +1,2 @@ -SHA256 (abraca-0.7.1.tar.gz) = d8e5853f86f180701bc0ebaa1172541b1aab3b07703881519cd3866102977036 -SIZE (abraca-0.7.1.tar.gz) = 684007 +SHA256 (abraca-0.8.2.tar.bz2) = 720fd7f07fa4bf6aa4139dcaba4ef47ade276436ea4e350f8340ca52abfad3ee +SIZE (abraca-0.8.2.tar.bz2) = 653487 diff --git a/audio/abraca/files/patch-SConstruct b/audio/abraca/files/patch-SConstruct deleted file mode 100644 index 24fce33e11c7..000000000000 --- a/audio/abraca/files/patch-SConstruct +++ /dev/null @@ -1,18 +0,0 @@ ---- SConstruct.orig 2012-03-19 01:54:28.000000000 +0100 -+++ SConstruct 2012-05-07 22:47:08.390528582 +0200 -@@ -59,7 +59,7 @@ - conf.Finish() - - env.Append(VALAPKGS = ['build-config']) --env.Append(CCFLAGS = ['-Wall', '-Wno-unused-variable', '-Wno-unused-but-set-variable']) -+env.Append(CCFLAGS = ['-Wall', '-Wno-unused-variable']) - #env.Append(CCFLAGS = ['-Wall', '-Wno-unused-variable', '-Wno-unused-but-set-variable', '-DHAVE_AVAHI_0_6']) - env.Append(CPPPATH = Dir('build')) - env.Append(LIBS = ['m']) -@@ -74,4 +74,5 @@ - env.SConscript('build/data/ui/SConscript', exports='env', duplicate=0) - env.SConscript('build/src/SConscript', exports='env', duplicate=0) - env.SConscript('build/gladeui/SConscript', exports='env', duplicate=0) --env.SConscript('build/po/SConscript', exports='env', duplicate=0) -+if %%NLS%%: -+ env.SConscript('build/po/SConscript', exports='env', duplicate=0) diff --git a/audio/abraca/files/patch-data_SConscript b/audio/abraca/files/patch-data_SConscript deleted file mode 100644 index a1faed38dc17..000000000000 --- a/audio/abraca/files/patch-data_SConscript +++ /dev/null @@ -1,13 +0,0 @@ ---- data/SConscript.orig 2011-01-22 18:16:43.000000000 +0100 -+++ data/SConscript 2012-02-04 16:19:46.829073844 +0100 -@@ -14,8 +14,8 @@ - - images, header, vapi = env.GdkPixBufCSource('abraca_images', lst) - --env.Append(CPPPATH = [Dir('.')]) --env.Append(VALAPKGPATH = [Dir('.')]) -+env.Append(CPPPATH = [Dir('.').abspath]) -+env.Append(VALAPKGPATH = [Dir('.').abspath]) - env.Append(VALAPKGS = ['abraca_images']) - - Export('images') diff --git a/audio/abraca/files/patch-data_ui_SConscript b/audio/abraca/files/patch-data_ui_SConscript deleted file mode 100644 index 1668376e2b5b..000000000000 --- a/audio/abraca/files/patch-data_ui_SConscript +++ /dev/null @@ -1,13 +0,0 @@ ---- data/ui/SConscript.orig 2011-01-22 18:16:43.000000000 +0100 -+++ data/ui/SConscript 2012-02-04 16:21:40.477072762 +0100 -@@ -10,8 +10,8 @@ - - ui, header, vapi = env.BinaryBlob('abraca_ui', lst) - --env.Append(CPPPATH = [Dir('.')]) --env.Append(VALAPKGPATH = [Dir('.')]) -+env.Append(CPPPATH = [Dir('.').abspath]) -+env.Append(VALAPKGPATH = [Dir('.').abspath]) - env.Append(VALAPKGS = ['abraca_ui']) - - Export('ui') diff --git a/audio/abraca/files/patch-src-components-filter-filter_model.vala b/audio/abraca/files/patch-src-components-filter-filter_model.vala deleted file mode 100644 index 86e44345fd4c..000000000000 --- a/audio/abraca/files/patch-src-components-filter-filter_model.vala +++ /dev/null @@ -1,11 +0,0 @@ ---- src/components/filter/filter_model.vala.orig 2012-06-17 19:04:56.000000000 +0200 -+++ src/components/filter/filter_model.vala 2013-07-31 18:17:53.287738608 +0200 -@@ -117,7 +117,7 @@ - * When GTK asks for the value of a column, check if the row - * has been resolved or not, otherwise resolve it. - */ -- public void get_value (Gtk.TreeIter iter, int column, ref GLib.Value val) -+ public void get_value (Gtk.TreeIter iter, int column, out GLib.Value val) - { - GLib.Value tmp1; - diff --git a/audio/abraca/files/patch-src-components-playlist-playlist_model.vala b/audio/abraca/files/patch-src-components-playlist-playlist_model.vala deleted file mode 100644 index 65742e3b4aa6..000000000000 --- a/audio/abraca/files/patch-src-components-playlist-playlist_model.vala +++ /dev/null @@ -1,11 +0,0 @@ ---- src/components/playlist/playlist_model.vala.orig 2012-06-17 19:04:56.000000000 +0200 -+++ src/components/playlist/playlist_model.vala 2013-07-31 18:19:16.480732632 +0200 -@@ -85,7 +85,7 @@ - * When GTK asks for the value of a column, check if the row - * has been resolved or not, otherwise resolve it. - */ -- public void get_value(Gtk.TreeIter iter, int column, ref GLib.Value val) { -+ public void get_value(Gtk.TreeIter iter, int column, out GLib.Value val) { - GLib.Value status; - - base.get_value(iter, Column.STATUS, out status); diff --git a/audio/abraca/files/patch-src-medialib.vala b/audio/abraca/files/patch-src-medialib.vala deleted file mode 100644 index aad625a18a38..000000000000 --- a/audio/abraca/files/patch-src-medialib.vala +++ /dev/null @@ -1,19 +0,0 @@ ---- src/medialib.vala.orig 2011-01-22 18:16:43.000000000 +0100 -+++ src/medialib.vala 2011-05-11 15:02:36.000000000 +0200 -@@ -588,14 +588,14 @@ - close.connect(on_close); - response.connect(on_response); - -- Configurable.register(this); -+/* Configurable.register(this); */ - show_all(); - } - - - private void on_close (Gtk.Dialog dialog) - { -- Configurable.unregister(this); -+/* Configurable.unregister(this); */ - } - - diff --git a/audio/abraca/files/patch-src_components_collections_collections_model.vala b/audio/abraca/files/patch-src_components_collections_collections_model.vala deleted file mode 100644 index 08b8331c1180..000000000000 --- a/audio/abraca/files/patch-src_components_collections_collections_model.vala +++ /dev/null @@ -1,29 +0,0 @@ ---- src/components/collections/collections_model.vala.orig 2012-06-17 19:04:56.000000000 +0200 -+++ src/components/collections/collections_model.vala 2013-03-08 16:25:01.542854653 +0100 -@@ -157,7 +157,7 @@ - */ - public void remove_temporary_playlist () - { -- remove(_temporary_playlist_iter); -+ remove(ref _temporary_playlist_iter); - has_temporary_playlist = false; - } - -@@ -258,7 +258,7 @@ - } - - while (iter_children(out child, parent)) { -- remove(child); -+ remove(ref child); - } - - int pos = iter_n_children(parent); -@@ -433,7 +433,7 @@ - - get(iter, Column.Name, out current); - if (name == current) { -- remove(iter); -+ remove(ref iter); - break; - } - } while (iter_next(ref iter)); diff --git a/audio/abraca/pkg-plist b/audio/abraca/pkg-plist index a45c3763a629..e08c957d01bd 100644 --- a/audio/abraca/pkg-plist +++ b/audio/abraca/pkg-plist @@ -1,8 +1,10 @@ bin/abraca man/man1/abraca.1.gz +share/appdata/org.xmms2.abraca.appdata.xml share/applications/abraca.desktop +share/icons/abraca-192.png share/icons/abraca.svg -%%NLS%%share/locale/de/LC_MESSAGES/abraca.mo -%%NLS%%share/locale/en/LC_MESSAGES/abraca.mo -%%NLS%%share/locale/nl/LC_MESSAGES/abraca.mo -%%NLS%%share/locale/sv/LC_MESSAGES/abraca.mo +%%NLS%%share/locale/de/LC_MESSAGES/Abraca.mo +%%NLS%%share/locale/en/LC_MESSAGES/Abraca.mo +%%NLS%%share/locale/nl/LC_MESSAGES/Abraca.mo +%%NLS%%share/locale/sv/LC_MESSAGES/Abraca.mo |