syncthing: imported to pkgsrc

diff --git a/Makefile b/Makefile
index 2ad591c14bc98af644d8062233d572319faf9d1b..c050da8aee29e351bdb349e0f2d7209b1cea4486 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3678,8 +3678,6 @@ SUBDIR+=  sync-server-dependencies
 SUBDIR+=       synce-dynamite
 SUBDIR+=       synce-kde
 SUBDIR+=       synce-orange
-SUBDIR+=       syncthing
-SUBDIR+=       syncthing-gtk
 SUBDIR+=       syncthing-inotify
 SUBDIR+=       synfig
 SUBDIR+=       synfigstudio

diff --git a/syncthing-gtk/DESCR b/syncthing-gtk/DESCR
deleted file mode 100644 (file)
index 87268cb..0000000
--- a/syncthing-gtk/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-GTK3 & python based GUI for Syncthing.

diff --git a/syncthing-gtk/Makefile b/syncthing-gtk/Makefile
deleted file mode 100644 (file)
index 2a06db0..0000000
--- a/syncthing-gtk/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2015/08/24 10:51:13 thomasklausner Exp $
-
-DISTNAME=      syncthing-gtk-0.7.5.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
-LICENSE=       gnu-gpl-v2
-
-DEPENDS+=      syncthing>=0.11.0:../../wip/syncthing
-DEPENDS+=      psmisc-[0-9]*:../../sysutils/psmisc # for killall
-
-PYTHON_VERSIONS_ACCEPTED=      27
-PYTHON_VERSIONED_DEPENDENCIES= dateutil
-
-REPLACE_PYTHON+=               *.py scripts/*.py syncthing_gtk/*.py
-
-SUBST_CLASSES+=                paths
-SUBST_STAGE.paths=     pre-build
-SUBST_MESSAGE.paths=   Fixing hard-coded paths
-SUBST_FILES.paths=     scripts/syncthing-gtk
-SUBST_FILES.paths+=    syncthing-gtk.desktop
-SUBST_FILES.paths+=    syncthing_gtk/app.py
-SUBST_FILES.paths+=    syncthing_gtk/uisettingsdialog.py
-SUBST_FILES.paths+=    syncthing_gtk/wizard.py
-SUBST_SED.paths=       -e 's|/usr/share/syncthing-gtk|${PREFIX}/share/syncthing-gtk|'
-
-.include "../../devel/py-gobject3/buildlink3.mk"
-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 "../../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/syncthing-gtk/PLIST b/syncthing-gtk/PLIST
deleted file mode 100644 (file)
index 1402918..0000000
--- a/syncthing-gtk/PLIST
+++ /dev/null
@@ -1,183 +0,0 @@
-@comment $NetBSD$
-bin/syncthing-gtk
-${PYSITELIB}/syncthing_gtk/__init__.py
-${PYSITELIB}/syncthing_gtk/__init__.pyc
-${PYSITELIB}/syncthing_gtk/__init__.pyo
-${PYSITELIB}/syncthing_gtk/aboutdialog.py
-${PYSITELIB}/syncthing_gtk/aboutdialog.pyc
-${PYSITELIB}/syncthing_gtk/aboutdialog.pyo
-${PYSITELIB}/syncthing_gtk/app.py
-${PYSITELIB}/syncthing_gtk/app.pyc
-${PYSITELIB}/syncthing_gtk/app.pyo
-${PYSITELIB}/syncthing_gtk/configuration.py
-${PYSITELIB}/syncthing_gtk/configuration.pyc
-${PYSITELIB}/syncthing_gtk/configuration.pyo
-${PYSITELIB}/syncthing_gtk/daemon.py
-${PYSITELIB}/syncthing_gtk/daemon.pyc
-${PYSITELIB}/syncthing_gtk/daemon.pyo
-${PYSITELIB}/syncthing_gtk/daemonoutputdialog.py
-${PYSITELIB}/syncthing_gtk/daemonoutputdialog.pyc
-${PYSITELIB}/syncthing_gtk/daemonoutputdialog.pyo
-${PYSITELIB}/syncthing_gtk/daemonprocess.py
-${PYSITELIB}/syncthing_gtk/daemonprocess.pyc
-${PYSITELIB}/syncthing_gtk/daemonprocess.pyo
-${PYSITELIB}/syncthing_gtk/daemonsettings.py
-${PYSITELIB}/syncthing_gtk/daemonsettings.pyc
-${PYSITELIB}/syncthing_gtk/daemonsettings.pyo
-${PYSITELIB}/syncthing_gtk/deviceeditor.py
-${PYSITELIB}/syncthing_gtk/deviceeditor.pyc
-${PYSITELIB}/syncthing_gtk/deviceeditor.pyo
-${PYSITELIB}/syncthing_gtk/editordialog.py
-${PYSITELIB}/syncthing_gtk/editordialog.pyc
-${PYSITELIB}/syncthing_gtk/editordialog.pyo
-${PYSITELIB}/syncthing_gtk/fakerevealer.py
-${PYSITELIB}/syncthing_gtk/fakerevealer.pyc
-${PYSITELIB}/syncthing_gtk/fakerevealer.pyo
-${PYSITELIB}/syncthing_gtk/finddaemondialog.py
-${PYSITELIB}/syncthing_gtk/finddaemondialog.pyc
-${PYSITELIB}/syncthing_gtk/finddaemondialog.pyo
-${PYSITELIB}/syncthing_gtk/foldereditor.py
-${PYSITELIB}/syncthing_gtk/foldereditor.pyc
-${PYSITELIB}/syncthing_gtk/foldereditor.pyo
-${PYSITELIB}/syncthing_gtk/iddialog.py
-${PYSITELIB}/syncthing_gtk/iddialog.pyc
-${PYSITELIB}/syncthing_gtk/iddialog.pyo
-${PYSITELIB}/syncthing_gtk/identicon.py
-${PYSITELIB}/syncthing_gtk/identicon.pyc
-${PYSITELIB}/syncthing_gtk/identicon.pyo
-${PYSITELIB}/syncthing_gtk/ignoreeditor.py
-${PYSITELIB}/syncthing_gtk/ignoreeditor.pyc
-${PYSITELIB}/syncthing_gtk/ignoreeditor.pyo
-${PYSITELIB}/syncthing_gtk/infobox.py
-${PYSITELIB}/syncthing_gtk/infobox.pyc
-${PYSITELIB}/syncthing_gtk/infobox.pyo
-${PYSITELIB}/syncthing_gtk/nautilusplugin.py
-${PYSITELIB}/syncthing_gtk/nautilusplugin.pyc
-${PYSITELIB}/syncthing_gtk/nautilusplugin.pyo
-${PYSITELIB}/syncthing_gtk/notifications.py
-${PYSITELIB}/syncthing_gtk/notifications.pyc
-${PYSITELIB}/syncthing_gtk/notifications.pyo
-${PYSITELIB}/syncthing_gtk/ribar.py
-${PYSITELIB}/syncthing_gtk/ribar.pyc
-${PYSITELIB}/syncthing_gtk/ribar.pyo
-${PYSITELIB}/syncthing_gtk/statusicon.py
-${PYSITELIB}/syncthing_gtk/statusicon.pyc
-${PYSITELIB}/syncthing_gtk/statusicon.pyo
-${PYSITELIB}/syncthing_gtk/stdownloader.py
-${PYSITELIB}/syncthing_gtk/stdownloader.pyc
-${PYSITELIB}/syncthing_gtk/stdownloader.pyo
-${PYSITELIB}/syncthing_gtk/timermanager.py
-${PYSITELIB}/syncthing_gtk/timermanager.pyc
-${PYSITELIB}/syncthing_gtk/timermanager.pyo
-${PYSITELIB}/syncthing_gtk/tools.py
-${PYSITELIB}/syncthing_gtk/tools.pyc
-${PYSITELIB}/syncthing_gtk/tools.pyo
-${PYSITELIB}/syncthing_gtk/uibuilder.py
-${PYSITELIB}/syncthing_gtk/uibuilder.pyc
-${PYSITELIB}/syncthing_gtk/uibuilder.pyo
-${PYSITELIB}/syncthing_gtk/uisettingsdialog.py
-${PYSITELIB}/syncthing_gtk/uisettingsdialog.pyc
-${PYSITELIB}/syncthing_gtk/uisettingsdialog.pyo
-${PYSITELIB}/syncthing_gtk/watcher.py
-${PYSITELIB}/syncthing_gtk/watcher.pyc
-${PYSITELIB}/syncthing_gtk/watcher.pyo
-${PYSITELIB}/syncthing_gtk/windows.py
-${PYSITELIB}/syncthing_gtk/windows.pyc
-${PYSITELIB}/syncthing_gtk/windows.pyo
-${PYSITELIB}/syncthing_gtk/wizard.py
-${PYSITELIB}/syncthing_gtk/wizard.pyc
-${PYSITELIB}/syncthing_gtk/wizard.pyo
-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/24x24/apps/syncthing-gtk.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/64x64/apps/syncthing-gtk-error.png
-share/icons/hicolor/64x64/apps/syncthing-gtk.png
-share/icons/hicolor/64x64/emblems/emblem-syncthing-active.png
-share/icons/hicolor/64x64/emblems/emblem-syncthing-error.png
-share/icons/hicolor/64x64/emblems/emblem-syncthing-offline.png
-share/icons/hicolor/64x64/emblems/emblem-syncthing.png
-share/pixmaps/syncthing-gtk.png
-share/syncthing-gtk/about.glade
-share/syncthing-gtk/app.glade
-share/syncthing-gtk/daemon-output.glade
-share/syncthing-gtk/daemon-settings.glade
-share/syncthing-gtk/device-edit.glade
-share/syncthing-gtk/device-id.glade
-share/syncthing-gtk/find-daemon.glade
-share/syncthing-gtk/folder-edit.glade
-share/syncthing-gtk/icons/add_node.svg
-share/syncthing-gtk/icons/add_repo.svg
-share/syncthing-gtk/icons/address.svg
-share/syncthing-gtk/icons/announce.svg
-share/syncthing-gtk/icons/clock.svg
-share/syncthing-gtk/icons/compress.svg
-share/syncthing-gtk/icons/cpu.svg
-share/syncthing-gtk/icons/dl_rate.svg
-share/syncthing-gtk/icons/eye.svg
-share/syncthing-gtk/icons/folder.svg
-share/syncthing-gtk/icons/global.svg
-share/syncthing-gtk/icons/home.svg
-share/syncthing-gtk/icons/ignore.svg
-share/syncthing-gtk/icons/lock.svg
-share/syncthing-gtk/icons/ram.svg
-share/syncthing-gtk/icons/rescan.svg
-share/syncthing-gtk/icons/restart.png
-share/syncthing-gtk/icons/settings.png
-share/syncthing-gtk/icons/shared.svg
-share/syncthing-gtk/icons/show_id.svg
-share/syncthing-gtk/icons/shutdown.png
-share/syncthing-gtk/icons/st-gtk-logo.png
-share/syncthing-gtk/icons/sync.svg
-share/syncthing-gtk/icons/thumb_up.svg
-share/syncthing-gtk/icons/up_rate.svg
-share/syncthing-gtk/icons/version.svg
-share/syncthing-gtk/ignore-editor.glade
-share/syncthing-gtk/syncthing-plugin-caja.py
-share/syncthing-gtk/syncthing-plugin-nautilus.py
-share/syncthing-gtk/syncthing-plugin-nemo.py
-share/syncthing-gtk/ui-settings.glade

diff --git a/syncthing-gtk/distinfo b/syncthing-gtk/distinfo
deleted file mode 100644 (file)
index c839674..0000000
--- a/syncthing-gtk/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2015/08/24 10:51:13 thomasklausner Exp $
-
-SHA1 (syncthing-gtk-0.7.5.1.tar.gz) = 655621e93c30960f3b2ae2a9259580756a183f8e
-RMD160 (syncthing-gtk-0.7.5.1.tar.gz) = c2799f219accc2180e46129505c338271ee85ef9
-Size (syncthing-gtk-0.7.5.1.tar.gz) = 486734 bytes
-SHA1 (patch-setup.py) = ff8903385570aa2b9b40b8cb41059b16e01370ed

diff --git a/syncthing-gtk/patches/patch-setup.py b/syncthing-gtk/patches/patch-setup.py
deleted file mode 100644 (file)
index b2f261a..0000000
--- a/syncthing-gtk/patches/patch-setup.py
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2015/02/27 22:48:37 tnn2 Exp $
-
-Avoid calling git.
-
---- setup.py.orig      2015-02-12 13:40:21.000000000 +0000
-+++ setup.py
-@@ -9,13 +9,6 @@ def get_version():
-       Returns current package version using git-describe or examining
-       path. If both methods fails, returns 'unknown'.
-       """
--      try:
--              p = Popen(['git', 'describe', '--tags', '--match', 'v*'], stdout=PIPE)
--              version = p.communicate()[0].strip("\n\r \t")
--              if p.returncode != 0:
--                      raise Exception("git-describe failed")
--              return version
--      except: pass
-       # Git-describe method failed, try to guess from working directory name
-       path = os.getcwd().split(os.path.sep)
-       version = 'unknown'

diff --git a/syncthing-inotify/Makefile b/syncthing-inotify/Makefile
index 2169335fd4396600a6c264977292444b58f6067b..822f78dcd5a87b1faab0499440686b3bb1f67c7e 100644 (file)
--- a/syncthing-inotify/Makefile
+++ b/syncthing-inotify/Makefile
@@ -12,7 +12,7 @@ LICENSE=      mpl-2.0
 
 BUILD_DEPENDS+=        go-[0-9]*:../../lang/go
 
-DEPENDS+=      syncthing>=0.11.0:../../wip/syncthing
+DEPENDS+=      syncthing>=0.11.0:../../net/syncthing
 
 MAKE_ENV+=     GOPATH=${PREFIX}/gopkg
 

diff --git a/syncthing/DESCR b/syncthing/DESCR
deleted file mode 100644 (file)
index afe367e..0000000
--- a/syncthing/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Syncthing replaces proprietary sync and cloud services with something open,
-trustworthy and decentralized.
-Features include:
-- web admin console
-- directory watcher
-- authentication with x509 certificates
-- node discovery
-- written in "go"

diff --git a/syncthing/Makefile b/syncthing/Makefile
deleted file mode 100644 (file)
index 8e237f3..0000000
--- a/syncthing/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2015/08/24 10:46:20 thomasklausner Exp $
-
-DISTNAME=      syncthing-0.11.25
-CATEGORIES=    net
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=syncthing/}
-GITHUB_TAG=    v${PKGVERSION_NOREV}
-
-MAINTAINER=    pkgsrc-users@NetBSD.org
-HOMEPAGE=      http://syncthing.net/
-COMMENT=       Keeps directories in sync across hosts
-LICENSE=       mpl-2.0
-
-BUILD_DEPENDS+=                go-[0-9]*:../../lang/go
-
-USE_LANGUAGES=         # go
-NO_CONFIGURE=          yes
-
-INSTALLATION_DIRS=     bin
-
-MAKE_ENV+=             GOPATH=${WRKDIR}/gopath
-INSTALL_UNSTRIPPED=    yes
-
-SUBST_CLASSES+=                version
-SUBST_STAGE.version=   pre-build
-SUBST_MESSAGE.version=  Fixing version string
-SUBST_FILES.version=   build.go
-SUBST_SED.version=     -e 's|runError("git", "describe", "--always", "--dirty")|runError("echo","v${PKGVERSION_NOREV}")|'
-SUBST_SED.version+=    -e 's|runError("git", "show", "-s", "--format=%ct")|runError("false")|'
-
-post-extract:
-       ${MKDIR} ${WRKDIR}/gopath/src/github.com/syncthing
-       ${LN} -s ${WRKSRC} ${WRKDIR}/gopath/src/github.com/syncthing/syncthing
-
-do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/go run build.go
-
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/bin/syncthing ${DESTDIR}/${PREFIX}/bin
-
-.include "../../mk/bsd.pkg.mk"

diff --git a/syncthing/PLIST b/syncthing/PLIST
deleted file mode 100644 (file)
index 9704de2..0000000
--- a/syncthing/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2015/02/27 22:45:18 tnn2 Exp $
-bin/syncthing

diff --git a/syncthing/distinfo b/syncthing/distinfo
deleted file mode 100644 (file)
index 60a7237..0000000
--- a/syncthing/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.8 2015/08/24 11:27:51 tnn2 Exp $
-
-SHA1 (syncthing-0.11.25.tar.gz) = 6387204c517327eb1d28cc83104b44145037f367
-RMD160 (syncthing-0.11.25.tar.gz) = 1751a81e0a7db6497ba2ae16a760f8d844beb926
-Size (syncthing-0.11.25.tar.gz) = 4202742 bytes
-SHA1 (patch-lib_config_config.go) = 3d4188721292e21106b16914f0a1ed75d8882638

diff --git a/syncthing/patches/patch-lib_config_config.go b/syncthing/patches/patch-lib_config_config.go
deleted file mode 100644 (file)
index 3d25934..0000000
--- a/syncthing/patches/patch-lib_config_config.go
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-lib_config_config.go,v 1.2 2015/08/24 11:27:51 tnn2 Exp $
-
-Disable auto upgrade mechanism. It would overwrite the binary in /usr/pkg/bin
-with something the user doesn't necessarily trust.
-
---- lib/config/config.go.orig  2015-08-16 13:29:48.000000000 +0000
-+++ lib/config/config.go
-@@ -229,7 +229,7 @@ type OptionsConfiguration struct {
-       URAccepted              int      `xml:"urAccepted" json:"urAccepted"` // Accepted usage reporting version; 0 for off (undecided), -1 for off (permanently)
-       URUniqueID              string   `xml:"urUniqueID" json:"urUniqueId"` // Unique ID for reporting purposes, regenerated when UR is turned on.
-       RestartOnWakeup         bool     `xml:"restartOnWakeup" json:"restartOnWakeup" default:"true"`
--      AutoUpgradeIntervalH    int      `xml:"autoUpgradeIntervalH" json:"autoUpgradeIntervalH" default:"12"` // 0 for off
-+      AutoUpgradeIntervalH    int      `xml:"autoUpgradeIntervalH" json:"autoUpgradeIntervalH" default:"0"` // 0 for off
-       KeepTemporariesH        int      `xml:"keepTemporariesH" json:"keepTemporariesH" default:"24"`         // 0 for off
-       CacheIgnoredFiles       bool     `xml:"cacheIgnoredFiles" json:"cacheIgnoredFiles" default:"true"`
-       ProgressUpdateIntervalS int      `xml:"progressUpdateIntervalS" json:"progressUpdateIntervalS" default:"5"`