diff options
| -rw-r--r-- | net/syncthing-gtk/Makefile | 15 | ||||
| -rw-r--r-- | net/syncthing-gtk/PLIST | 178 | ||||
| -rw-r--r-- | net/syncthing-gtk/distinfo | 12 | ||||
| -rw-r--r-- | net/syncthing-gtk/patches/patch-setup.py | 16 |
4 files changed, 160 insertions, 61 deletions
diff --git a/net/syncthing-gtk/Makefile b/net/syncthing-gtk/Makefile index 579b5bf2a8e..e3c029c5ac1 100644 --- a/net/syncthing-gtk/Makefile +++ b/net/syncthing-gtk/Makefile @@ -1,22 +1,21 @@ -# $NetBSD: Makefile,v 1.3 2016/08/03 10:23:17 adam Exp $ +# $NetBSD: Makefile,v 1.4 2016/09/01 17:30:21 wiz Exp $ -DISTNAME= syncthing-gtk-0.8.1 -PKGREVISION= 1 +DISTNAME= syncthing-gtk-0.9.2.1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=syncthing/} -GITHUB_PROJECT= syncthing-gtk GITHUB_TAG= v${PKGVERSION_NOREV} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/syncthing/syncthing-gtk -COMMENT= GTK3 & python based GUI for Syncthing +COMMENT= GTK3 & Python based GUI for Syncthing LICENSE= gnu-gpl-v2 -DEPENDS+= syncthing>=0.11.0:../../net/syncthing +DEPENDS+= syncthing>=0.13.0:../../net/syncthing DEPENDS+= psmisc-[0-9]*:../../sysutils/psmisc # for killall PYTHON_VERSIONS_ACCEPTED= 27 PYTHON_VERSIONED_DEPENDENCIES= dateutil +EGG_NAME= ${DISTNAME:S/0/v0/:S/-/_/} REPLACE_PYTHON+= *.py scripts/*.py syncthing_gtk/*.py @@ -35,9 +34,7 @@ BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.40.9nb2 # for introspection .include "../../graphics/librsvg/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../lang/python/versioned_dependencies.mk" -.include "../../lang/python/egg.mk" +.include "../../lang/python/distutils.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -# XXX --single-version-externally-managed comes from egg.mk, setup.py does not understand this -_PYSETUPTOOLSINSTALLARGS:=${_PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed} .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/syncthing-gtk/PLIST b/net/syncthing-gtk/PLIST index e12d1bbbcd5..a6b49d6cecd 100644 --- a/net/syncthing-gtk/PLIST +++ b/net/syncthing-gtk/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2016/01/18 00:28:39 abs Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/09/01 17:30:21 wiz Exp $ bin/syncthing-gtk +${PYSITELIB}/${EGG_FILE} ${PYSITELIB}/syncthing_gtk/__init__.py ${PYSITELIB}/syncthing_gtk/__init__.pyc ${PYSITELIB}/syncthing_gtk/__init__.pyo @@ -87,54 +88,139 @@ ${PYSITELIB}/syncthing_gtk/windows.pyo ${PYSITELIB}/syncthing_gtk/wizard.py ${PYSITELIB}/syncthing_gtk/wizard.pyc ${PYSITELIB}/syncthing_gtk/wizard.pyo +man/man1/syncthing-gtk.1 share/applications/syncthing-gtk.desktop share/icons/hicolor/128x128/apps/syncthing-gtk.png -share/icons/hicolor/16x16/apps/si-idle.png -share/icons/hicolor/16x16/apps/si-syncing-0.png -share/icons/hicolor/16x16/apps/si-syncing-1.png -share/icons/hicolor/16x16/apps/si-syncing-10.png -share/icons/hicolor/16x16/apps/si-syncing-11.png -share/icons/hicolor/16x16/apps/si-syncing-2.png -share/icons/hicolor/16x16/apps/si-syncing-3.png -share/icons/hicolor/16x16/apps/si-syncing-4.png -share/icons/hicolor/16x16/apps/si-syncing-5.png -share/icons/hicolor/16x16/apps/si-syncing-6.png -share/icons/hicolor/16x16/apps/si-syncing-7.png -share/icons/hicolor/16x16/apps/si-syncing-8.png -share/icons/hicolor/16x16/apps/si-syncing-9.png -share/icons/hicolor/16x16/apps/si-unknown.png share/icons/hicolor/16x16/apps/syncthing-gtk.png -share/icons/hicolor/24x24/apps/si-idle.png -share/icons/hicolor/24x24/apps/si-syncing-0.png -share/icons/hicolor/24x24/apps/si-syncing-1.png -share/icons/hicolor/24x24/apps/si-syncing-10.png -share/icons/hicolor/24x24/apps/si-syncing-11.png -share/icons/hicolor/24x24/apps/si-syncing-2.png -share/icons/hicolor/24x24/apps/si-syncing-3.png -share/icons/hicolor/24x24/apps/si-syncing-4.png -share/icons/hicolor/24x24/apps/si-syncing-5.png -share/icons/hicolor/24x24/apps/si-syncing-6.png -share/icons/hicolor/24x24/apps/si-syncing-7.png -share/icons/hicolor/24x24/apps/si-syncing-8.png -share/icons/hicolor/24x24/apps/si-syncing-9.png -share/icons/hicolor/24x24/apps/si-unknown.png +share/icons/hicolor/16x16/status/si-syncthing-0.png +share/icons/hicolor/16x16/status/si-syncthing-1.png +share/icons/hicolor/16x16/status/si-syncthing-10.png +share/icons/hicolor/16x16/status/si-syncthing-11.png +share/icons/hicolor/16x16/status/si-syncthing-2.png +share/icons/hicolor/16x16/status/si-syncthing-3.png +share/icons/hicolor/16x16/status/si-syncthing-4.png +share/icons/hicolor/16x16/status/si-syncthing-5.png +share/icons/hicolor/16x16/status/si-syncthing-6.png +share/icons/hicolor/16x16/status/si-syncthing-7.png +share/icons/hicolor/16x16/status/si-syncthing-8.png +share/icons/hicolor/16x16/status/si-syncthing-9.png +share/icons/hicolor/16x16/status/si-syncthing-black-0.png +share/icons/hicolor/16x16/status/si-syncthing-black-1.png +share/icons/hicolor/16x16/status/si-syncthing-black-10.png +share/icons/hicolor/16x16/status/si-syncthing-black-11.png +share/icons/hicolor/16x16/status/si-syncthing-black-2.png +share/icons/hicolor/16x16/status/si-syncthing-black-3.png +share/icons/hicolor/16x16/status/si-syncthing-black-4.png +share/icons/hicolor/16x16/status/si-syncthing-black-5.png +share/icons/hicolor/16x16/status/si-syncthing-black-6.png +share/icons/hicolor/16x16/status/si-syncthing-black-7.png +share/icons/hicolor/16x16/status/si-syncthing-black-8.png +share/icons/hicolor/16x16/status/si-syncthing-black-9.png +share/icons/hicolor/16x16/status/si-syncthing-black-idle.png +share/icons/hicolor/16x16/status/si-syncthing-black-unknown.png +share/icons/hicolor/16x16/status/si-syncthing-idle.png +share/icons/hicolor/16x16/status/si-syncthing-unknown.png +share/icons/hicolor/16x16/status/si-syncthing-white-0.png +share/icons/hicolor/16x16/status/si-syncthing-white-1.png +share/icons/hicolor/16x16/status/si-syncthing-white-10.png +share/icons/hicolor/16x16/status/si-syncthing-white-11.png +share/icons/hicolor/16x16/status/si-syncthing-white-2.png +share/icons/hicolor/16x16/status/si-syncthing-white-3.png +share/icons/hicolor/16x16/status/si-syncthing-white-4.png +share/icons/hicolor/16x16/status/si-syncthing-white-5.png +share/icons/hicolor/16x16/status/si-syncthing-white-6.png +share/icons/hicolor/16x16/status/si-syncthing-white-7.png +share/icons/hicolor/16x16/status/si-syncthing-white-8.png +share/icons/hicolor/16x16/status/si-syncthing-white-9.png +share/icons/hicolor/16x16/status/si-syncthing-white-idle.png +share/icons/hicolor/16x16/status/si-syncthing-white-unknown.png share/icons/hicolor/24x24/apps/syncthing-gtk.png +share/icons/hicolor/24x24/status/si-syncthing-0.png +share/icons/hicolor/24x24/status/si-syncthing-1.png +share/icons/hicolor/24x24/status/si-syncthing-10.png +share/icons/hicolor/24x24/status/si-syncthing-11.png +share/icons/hicolor/24x24/status/si-syncthing-2.png +share/icons/hicolor/24x24/status/si-syncthing-3.png +share/icons/hicolor/24x24/status/si-syncthing-4.png +share/icons/hicolor/24x24/status/si-syncthing-5.png +share/icons/hicolor/24x24/status/si-syncthing-6.png +share/icons/hicolor/24x24/status/si-syncthing-7.png +share/icons/hicolor/24x24/status/si-syncthing-8.png +share/icons/hicolor/24x24/status/si-syncthing-9.png +share/icons/hicolor/24x24/status/si-syncthing-black-0.png +share/icons/hicolor/24x24/status/si-syncthing-black-1.png +share/icons/hicolor/24x24/status/si-syncthing-black-10.png +share/icons/hicolor/24x24/status/si-syncthing-black-11.png +share/icons/hicolor/24x24/status/si-syncthing-black-2.png +share/icons/hicolor/24x24/status/si-syncthing-black-3.png +share/icons/hicolor/24x24/status/si-syncthing-black-4.png +share/icons/hicolor/24x24/status/si-syncthing-black-5.png +share/icons/hicolor/24x24/status/si-syncthing-black-6.png +share/icons/hicolor/24x24/status/si-syncthing-black-7.png +share/icons/hicolor/24x24/status/si-syncthing-black-8.png +share/icons/hicolor/24x24/status/si-syncthing-black-9.png +share/icons/hicolor/24x24/status/si-syncthing-black-idle.png +share/icons/hicolor/24x24/status/si-syncthing-black-unknown.png +share/icons/hicolor/24x24/status/si-syncthing-idle.png +share/icons/hicolor/24x24/status/si-syncthing-unknown.png +share/icons/hicolor/24x24/status/si-syncthing-white-0.png +share/icons/hicolor/24x24/status/si-syncthing-white-1.png +share/icons/hicolor/24x24/status/si-syncthing-white-10.png +share/icons/hicolor/24x24/status/si-syncthing-white-11.png +share/icons/hicolor/24x24/status/si-syncthing-white-2.png +share/icons/hicolor/24x24/status/si-syncthing-white-3.png +share/icons/hicolor/24x24/status/si-syncthing-white-4.png +share/icons/hicolor/24x24/status/si-syncthing-white-5.png +share/icons/hicolor/24x24/status/si-syncthing-white-6.png +share/icons/hicolor/24x24/status/si-syncthing-white-7.png +share/icons/hicolor/24x24/status/si-syncthing-white-8.png +share/icons/hicolor/24x24/status/si-syncthing-white-9.png +share/icons/hicolor/24x24/status/si-syncthing-white-idle.png +share/icons/hicolor/24x24/status/si-syncthing-white-unknown.png share/icons/hicolor/256x256/apps/syncthing-gtk.png -share/icons/hicolor/32x32/apps/si-idle.png -share/icons/hicolor/32x32/apps/si-syncing-0.png -share/icons/hicolor/32x32/apps/si-syncing-1.png -share/icons/hicolor/32x32/apps/si-syncing-10.png -share/icons/hicolor/32x32/apps/si-syncing-11.png -share/icons/hicolor/32x32/apps/si-syncing-2.png -share/icons/hicolor/32x32/apps/si-syncing-3.png -share/icons/hicolor/32x32/apps/si-syncing-4.png -share/icons/hicolor/32x32/apps/si-syncing-5.png -share/icons/hicolor/32x32/apps/si-syncing-6.png -share/icons/hicolor/32x32/apps/si-syncing-7.png -share/icons/hicolor/32x32/apps/si-syncing-8.png -share/icons/hicolor/32x32/apps/si-syncing-9.png -share/icons/hicolor/32x32/apps/si-unknown.png share/icons/hicolor/32x32/apps/syncthing-gtk.png +share/icons/hicolor/32x32/status/si-syncthing-0.png +share/icons/hicolor/32x32/status/si-syncthing-1.png +share/icons/hicolor/32x32/status/si-syncthing-10.png +share/icons/hicolor/32x32/status/si-syncthing-11.png +share/icons/hicolor/32x32/status/si-syncthing-2.png +share/icons/hicolor/32x32/status/si-syncthing-3.png +share/icons/hicolor/32x32/status/si-syncthing-4.png +share/icons/hicolor/32x32/status/si-syncthing-5.png +share/icons/hicolor/32x32/status/si-syncthing-6.png +share/icons/hicolor/32x32/status/si-syncthing-7.png +share/icons/hicolor/32x32/status/si-syncthing-8.png +share/icons/hicolor/32x32/status/si-syncthing-9.png +share/icons/hicolor/32x32/status/si-syncthing-black-0.png +share/icons/hicolor/32x32/status/si-syncthing-black-1.png +share/icons/hicolor/32x32/status/si-syncthing-black-10.png +share/icons/hicolor/32x32/status/si-syncthing-black-11.png +share/icons/hicolor/32x32/status/si-syncthing-black-2.png +share/icons/hicolor/32x32/status/si-syncthing-black-3.png +share/icons/hicolor/32x32/status/si-syncthing-black-4.png +share/icons/hicolor/32x32/status/si-syncthing-black-5.png +share/icons/hicolor/32x32/status/si-syncthing-black-6.png +share/icons/hicolor/32x32/status/si-syncthing-black-7.png +share/icons/hicolor/32x32/status/si-syncthing-black-8.png +share/icons/hicolor/32x32/status/si-syncthing-black-9.png +share/icons/hicolor/32x32/status/si-syncthing-black-idle.png +share/icons/hicolor/32x32/status/si-syncthing-black-unknown.png +share/icons/hicolor/32x32/status/si-syncthing-idle.png +share/icons/hicolor/32x32/status/si-syncthing-unknown.png +share/icons/hicolor/32x32/status/si-syncthing-white-0.png +share/icons/hicolor/32x32/status/si-syncthing-white-1.png +share/icons/hicolor/32x32/status/si-syncthing-white-10.png +share/icons/hicolor/32x32/status/si-syncthing-white-11.png +share/icons/hicolor/32x32/status/si-syncthing-white-2.png +share/icons/hicolor/32x32/status/si-syncthing-white-3.png +share/icons/hicolor/32x32/status/si-syncthing-white-4.png +share/icons/hicolor/32x32/status/si-syncthing-white-5.png +share/icons/hicolor/32x32/status/si-syncthing-white-6.png +share/icons/hicolor/32x32/status/si-syncthing-white-7.png +share/icons/hicolor/32x32/status/si-syncthing-white-8.png +share/icons/hicolor/32x32/status/si-syncthing-white-9.png +share/icons/hicolor/32x32/status/si-syncthing-white-idle.png +share/icons/hicolor/32x32/status/si-syncthing-white-unknown.png share/icons/hicolor/64x64/apps/syncthing-gtk-error.png share/icons/hicolor/64x64/apps/syncthing-gtk.png share/icons/hicolor/64x64/emblems/emblem-syncthing-active.png @@ -144,7 +230,13 @@ share/icons/hicolor/64x64/emblems/emblem-syncthing.png share/locale/cs/LC_MESSAGES/syncthing-gtk.mo share/locale/de/LC_MESSAGES/syncthing-gtk.mo share/locale/en/LC_MESSAGES/syncthing-gtk.mo +share/locale/es/LC_MESSAGES/syncthing-gtk.mo +share/locale/fr/LC_MESSAGES/syncthing-gtk.mo +share/locale/lt/LC_MESSAGES/syncthing-gtk.mo +share/locale/ru/LC_MESSAGES/syncthing-gtk.mo share/locale/sk/LC_MESSAGES/syncthing-gtk.mo +share/locale/vi/LC_MESSAGES/syncthing-gtk.mo +share/locale/zh/LC_MESSAGES/syncthing-gtk.mo share/pixmaps/syncthing-gtk.png share/syncthing-gtk/about.glade share/syncthing-gtk/app.glade diff --git a/net/syncthing-gtk/distinfo b/net/syncthing-gtk/distinfo index aa983a53e62..7d7db4ac056 100644 --- a/net/syncthing-gtk/distinfo +++ b/net/syncthing-gtk/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2016/01/18 00:28:39 abs Exp $ +$NetBSD: distinfo,v 1.4 2016/09/01 17:30:21 wiz Exp $ -SHA1 (syncthing-gtk-0.8.1.tar.gz) = c0121d9d407b2cc9a20fa9bb2170401f52d53b86 -RMD160 (syncthing-gtk-0.8.1.tar.gz) = d84bf5ad9c66aeb8c8549036ada62450a6afd0f5 -SHA512 (syncthing-gtk-0.8.1.tar.gz) = 0d405479a5d704a8a1615f972ab84ba6e8b06942a71c579786465135a77f80e155f45a2ac7a1cb6df7bdd7aa648f3cb4793e3ea64c0410d64621913c4103d9be -Size (syncthing-gtk-0.8.1.tar.gz) = 560387 bytes -SHA1 (patch-setup.py) = ff8903385570aa2b9b40b8cb41059b16e01370ed +SHA1 (syncthing-gtk-0.9.2.1.tar.gz) = 9e11d453f4fe8b85de99eb32b4dcbc1bd0fa02e5 +RMD160 (syncthing-gtk-0.9.2.1.tar.gz) = 240c6fd234350e6f3ab59c3e80d7018c7ec515f8 +SHA512 (syncthing-gtk-0.9.2.1.tar.gz) = cebd9342f66c90aeedc7b69cc67bd7b580038fb7553af07475b41421e834c1a5952388f80d4352d1f978abdee7a1c6eae4ea4aa4cb582094c52e140636430acf +Size (syncthing-gtk-0.9.2.1.tar.gz) = 763429 bytes +SHA1 (patch-setup.py) = c7487b2b196dfbc97b25780c391234db7aa2fc15 diff --git a/net/syncthing-gtk/patches/patch-setup.py b/net/syncthing-gtk/patches/patch-setup.py index 18f85afac25..cf1ac88ac33 100644 --- a/net/syncthing-gtk/patches/patch-setup.py +++ b/net/syncthing-gtk/patches/patch-setup.py @@ -1,10 +1,11 @@ -$NetBSD: patch-setup.py,v 1.1 2015/10/03 16:28:56 tnn Exp $ +$NetBSD: patch-setup.py,v 1.2 2016/09/01 17:30:21 wiz Exp $ Avoid calling git. +Install man page in proper directory for pkgsrc. ---- setup.py.orig 2015-02-12 13:40:21.000000000 +0000 +--- setup.py.orig 2016-08-29 04:05:55.000000000 +0000 +++ setup.py -@@ -9,13 +9,6 @@ def get_version(): +@@ -12,13 +12,6 @@ def get_version(): Returns current package version using git-describe or examining path. If both methods fails, returns 'unknown'. """ @@ -18,3 +19,12 @@ Avoid calling git. # Git-describe method failed, try to guess from working directory name path = os.getcwd().split(os.path.sep) version = 'unknown' +@@ -82,7 +75,7 @@ if __name__ == "__main__" : + "icons/%s.png" % x for x in ( + 'restart', 'settings', 'shutdown', "st-gtk-logo" + )]), +- ('share/man/man1', glob.glob("doc/*") ), ++ (os.environ['PKGMANDIR'] + '/man1', glob.glob("doc/*") ), + ('share/icons/hicolor/64x64/emblems', glob.glob("icons/emblem-*.png") ), + ('share/pixmaps', ["icons/syncthing-gtk.png"]), + ('share/applications', ['syncthing-gtk.desktop'] ), |