From 8137b2a9c979dfac8833602d3f87cd12104c6ec9 Mon Sep 17 00:00:00 2001 From: darcy Date: Wed, 11 Apr 2012 19:32:17 +0000 Subject: Forgot to add in the fixes to actually run it. --- net/gitso/Makefile | 21 +++++++++++++++++---- net/gitso/PLIST | 3 ++- net/gitso/distinfo | 6 +++++- net/gitso/patches/patch-ArgParser.py | 17 +++++++++++++++++ net/gitso/patches/patch-GitsoThread.py | 15 +++++++++++++++ net/gitso/patches/patch-Processes.py | 24 ++++++++++++++++++++++++ net/gitso/patches/patch-gitso | 18 ++++++++++++++++++ 7 files changed, 98 insertions(+), 6 deletions(-) create mode 100644 net/gitso/patches/patch-ArgParser.py create mode 100644 net/gitso/patches/patch-GitsoThread.py create mode 100644 net/gitso/patches/patch-Processes.py create mode 100644 net/gitso/patches/patch-gitso diff --git a/net/gitso/Makefile b/net/gitso/Makefile index 1acdec9e0b1..2ffcd250128 100644 --- a/net/gitso/Makefile +++ b/net/gitso/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2012/04/11 17:42:06 darcy Exp $ +# $NetBSD: Makefile,v 1.2 2012/04/11 19:32:17 darcy Exp $ DISTNAME= gitso-0.6 CATEGORIES= net x11 @@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/Gitso PY_PATCHPLIST= yes USE_TOOLS+= bash:run -REPLACE_BASH+= run-gitso.sh +REPLACE_BASH+= run-gitso.sh.local REPLACE_PYTHON+= bin/gitso REPLACE_PYTHON+= share/gitso/ArgsParser.py REPLACE_PYTHON+= share/gitso/ConnectionWindow.py @@ -31,6 +31,7 @@ PKG_DESTDIR_SUPPORT= user-destdir MAKE_JOBS_SAFE= no NO_BUILD= yes INSTALLATION_DIRS+= bin +INSTALLATION_DIRS+= share/gitso INSTALLATION_DIRS+= ${PYSITELIB}/gitso .include "../../mk/bsd.prefs.mk" @@ -38,10 +39,22 @@ INSTALLATION_DIRS+= ${PYSITELIB}/gitso DEPENDS+= vncviewer-[0-9]*:../../net/vncviewer DEPENDS+= x11vnc-[0-9]*:../../x11/x11vnc +SITEFILES = ${WRKSRC}/share/gitso/*.py \ + ${WRKSRC}/share/gitso/icon.* \ + ${WRKSRC}/share/gitso/icon.* \ + ${WRKSRC}/share/gitso/hosts.txt \ + ${WRKSRC}/share/doc/gitso/COPYING + +post-patch: + ${SED} -e 's|bin/gitso|${DESTDIR}${PREFIX}/bin/gitso|' \ + < ${WRKSRC}/run-gitso.sh \ + > ${WRKSRC}/run-gitso.sh.local + do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/run-gitso.sh.local \ + ${DESTDIR}${PREFIX}/bin/run-gitso.sh ${INSTALL_SCRIPT} ${WRKSRC}/bin/gitso ${DESTDIR}${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/run-gitso.sh ${DESTDIR}${PREFIX}/bin - for i in ${WRKSRC}/share/gitso/*; do \ + for i in ${SITEFILES}; do \ ${INSTALL_DATA} $$i ${DESTDIR}${PREFIX}/${PYSITELIB}/gitso; \ done diff --git a/net/gitso/PLIST b/net/gitso/PLIST index d1e70b47b44..6238fee00fa 100644 --- a/net/gitso/PLIST +++ b/net/gitso/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2012/04/11 17:42:06 darcy Exp $ +@comment $NetBSD: PLIST,v 1.2 2012/04/11 19:32:17 darcy Exp $ bin/gitso bin/run-gitso.sh ${PYSITELIB}/gitso/ConnectionWindow.py +${PYSITELIB}/gitso/COPYING ${PYSITELIB}/gitso/AboutWindow.py ${PYSITELIB}/gitso/ArgsParser.py ${PYSITELIB}/gitso/Gitso.py diff --git a/net/gitso/distinfo b/net/gitso/distinfo index c64749c2e27..14498712c31 100644 --- a/net/gitso/distinfo +++ b/net/gitso/distinfo @@ -1,5 +1,9 @@ -$NetBSD: distinfo,v 1.1 2012/04/11 17:42:06 darcy Exp $ +$NetBSD: distinfo,v 1.2 2012/04/11 19:32:17 darcy Exp $ SHA1 (gitso_0.6_linux_all.tar.gz) = 577edcb257aa2508a6ee9b5ea8a3de135e0abf6c RMD160 (gitso_0.6_linux_all.tar.gz) = 4428ecdbe73819a8251c3f9d05c61f62ae2e20df Size (gitso_0.6_linux_all.tar.gz) = 192753 bytes +SHA1 (patch-ArgParser.py) = 721c7082c5eef67de9709003d9b51499c948e81c +SHA1 (patch-GitsoThread.py) = 962343bd4f842df2cbf003f8cdc0707189238463 +SHA1 (patch-Processes.py) = 8260b888733d1a514ae15477bbd8a7a09140b787 +SHA1 (patch-gitso) = 000f3a3d6da58ef4cd942089be563e30ddfcb708 diff --git a/net/gitso/patches/patch-ArgParser.py b/net/gitso/patches/patch-ArgParser.py new file mode 100644 index 00000000000..2d97fcef405 --- /dev/null +++ b/net/gitso/patches/patch-ArgParser.py @@ -0,0 +1,17 @@ +$NetBSD: patch-ArgParser.py,v 1.1 2012/04/11 19:32:17 darcy Exp $ + +Set up BSD paths. + +--- share/gitso/ArgsParser.py.orig 2012-04-11 18:44:23.000000000 +0000 ++++ share/gitso/ArgsParser.py +@@ -46,6 +46,10 @@ class ArgsParser: + if sys.platform.find('linux') != -1: + self.paths['main'] = os.path.join(sys.path[0], '..', 'share', 'gitso') + self.paths['copyright'] = os.path.join(sys.path[0], '..', 'share', 'doc', 'gitso', 'COPYING') ++ if sys.platform.find('bsd') != -1: ++ import gitso ++ self.paths['main'] = gitso.__path__[0] ++ self.paths['copyright'] = os.path.join(gitso.__path__[0], 'COPYING') + elif sys.platform == "darwin": + self.paths['main'] = sys.path[0] + self.paths['copyright'] = os.path.join(sys.path[0], 'COPYING') diff --git a/net/gitso/patches/patch-GitsoThread.py b/net/gitso/patches/patch-GitsoThread.py new file mode 100644 index 00000000000..d5c7710d8cc --- /dev/null +++ b/net/gitso/patches/patch-GitsoThread.py @@ -0,0 +1,15 @@ +$NetBSD: patch-GitsoThread.py,v 1.1 2012/04/11 19:32:17 darcy Exp $ + +Test for BSD systems + +--- share/gitso/GitsoThread.py.orig 2010-02-22 02:48:04.000000000 +0000 ++++ share/gitso/GitsoThread.py +@@ -122,7 +122,7 @@ class GitsoThread(threading.Thread): + + connection = [] + listen = [] +- if sys.platform == 'darwin' or sys.platform.find('linux') != -1: ++ if sys.platform == 'darwin' or sys.platform.find('linux') != -1 or sys.platform.find('bsd'): + if self.host <> "": + connection = os.popen('LANG=C netstat -an | grep 5500 | grep ESTABLISHED').readlines() + else: diff --git a/net/gitso/patches/patch-Processes.py b/net/gitso/patches/patch-Processes.py new file mode 100644 index 00000000000..4050022795a --- /dev/null +++ b/net/gitso/patches/patch-Processes.py @@ -0,0 +1,24 @@ +$NetBSD: patch-Processes.py,v 1.1 2012/04/11 19:32:17 darcy Exp $ + +Test for BSD systems + +--- share/gitso/Processes.py.orig 2010-02-22 02:48:04.000000000 +0000 ++++ share/gitso/Processes.py +@@ -35,7 +35,7 @@ class Processes: + def getSupport(self, host): + if sys.platform == 'darwin': + self.returnPID = os.spawnl(os.P_NOWAIT, '%sOSXvnc/OSXvnc-server' % self.paths['resources'], '%sOSXvnc/OSXvnc-server' % self.paths['resources'], '-connectHost', '%s' % host) +- elif sys.platform.find('linux') != -1: ++ elif sys.platform.find('linux') != -1 or sys.platform.find('bsd'): + # We should include future versions with options for speed. + #self.returnPID = os.spawnlp(os.P_NOWAIT, 'x11vnc', 'x11vnc','-nopw','-ncache','20','-solid','black','-connect','%s' % host) + +@@ -59,7 +59,7 @@ class Processes: + if sys.platform == 'darwin': + vncviewer = '%scotvnc.app/Contents/MacOS/cotvnc' % self.paths['resources'] + self.returnPID = os.spawnlp(os.P_NOWAIT, vncviewer, vncviewer, '--listen') +- elif sys.platform.find('linux') != -1: ++ elif sys.platform.find('linux') != -1 or sys.platform.find('bsd'): + self.returnPID = os.spawnlp(os.P_NOWAIT, 'vncviewer', 'vncviewer', '-listen') + + # These are the options for low-res connections. diff --git a/net/gitso/patches/patch-gitso b/net/gitso/patches/patch-gitso new file mode 100644 index 00000000000..23b738732d4 --- /dev/null +++ b/net/gitso/patches/patch-gitso @@ -0,0 +1,18 @@ +$NetBSD: patch-gitso,v 1.1 2012/04/11 19:32:17 darcy Exp $ + +Fix up PYTHONPATH + +--- bin/gitso.orig 2010-02-22 02:48:04.000000000 +0000 ++++ bin/gitso +@@ -1,9 +1,9 @@ + #!/usr/bin/env python + + import sys, os, wx +-sys.path.append(os.path.join(sys.path[0], '..', 'share', 'gitso')) ++sys.path.append(os.path.join(sys.path[0], 'gitso')) + +-from Gitso import ConnectionWindow, ArgsParser ++from gitso import ConnectionWindow, ArgsParser + + if __name__ == "__main__": + app = wx.PySimpleApp() -- cgit v1.2.3