Re: remove x11/wxglade
Hi Theo, >> Can I remove x11/wxglade? > > Sure, unless MAINTAINER speaks up very soon. Maintainer here: I think its best to remove it for now. After we have a newer wxPython in the tree I will look at updating to a newer version. Cheers, Daniel
Re: Maintainer-Update x11/wxglade 0.7.0->0.9.5
>>>> here is an long overdue update to bring wxglade to the latest version >>>> 0.9.5. Tested on amd64 mostly with python and C++ code generation. > patch: malformed patch at line 41: OB MODPY_ADJ_FILES= ./*.py > test/*.py test/casefiles/*.py > > Checkout "Fix dos line-endings in files needing patches" in > infrastructure/templates/Makefile.template to fix the issue. Thanks Rafael! Re-generated patch below, this should hopefully apply correctly... Index: x11/wxglade//Makefile === RCS file: /cvs/ports/x11/wxglade/Makefile,v retrieving revision 1.3 diff -u -p -u -p -r1.3 Makefile --- x11/wxglade//Makefile 12 Jul 2019 20:51:25 - 1.3 +++ x11/wxglade//Makefile 4 Apr 2020 15:53:09 - @@ -2,10 +2,10 @@ COMMENT= GUI designer for wxWidgets/wxPython user interfaces -MODPY_EGG_VERSION= 0.7.0 +MODPY_EGG_VERSION= 0.9.5 DISTNAME= wxGlade-${MODPY_EGG_VERSION} PKGNAME= wxglade-${MODPY_EGG_VERSION} -REVISION= 0 +EXTRACT_SUFX= .zip MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxglade/} @@ -18,6 +18,7 @@ MAINTAINER= Daniel Winters Index: x11/wxglade//distinfo === RCS file: /cvs/ports/x11/wxglade/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 distinfo --- x11/wxglade//distinfo 13 Oct 2015 16:58:07 - 1.1.1.1 +++ x11/wxglade//distinfo 4 Apr 2020 15:53:09 - @@ -1,2 +1,2 @@ -SHA256 (wxGlade-0.7.0.tar.gz) = Dn+NxIvA2mBtrV1cZRiLYrkHAumAe5iP8CO0YMX6L5k= -SIZE (wxGlade-0.7.0.tar.gz) = 1863564 +SHA256 (wxGlade-0.9.5.zip) = /MGlT83bYROlA1ZBtEYrclMIMtQJExidKIg+JdU5V50= +SIZE (wxGlade-0.9.5.zip) = 4755933 Index: x11/wxglade//patches/patch-common_py === RCS file: x11/wxglade//patches/patch-common_py diff -N x11/wxglade//patches/patch-common_py --- x11/wxglade//patches/patch-common_py13 Oct 2015 16:58:07 - 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,28 +0,0 @@ -$OpenBSD: patch-common_py,v 1.1.1.1 2015/10/13 16:58:07 jca Exp $ - -Backport upstream fix for missing ~/.wxglade/ directory. - - https://bitbucket.org/agriggio/wxglade/commits/4c3c49e4cf61a1d8127a74a396016ffa4fbaa97b?at=default - common.py.orig Fri Oct 9 16:03:04 2015 -+++ common.py Fri Oct 9 16:06:20 2015 -@@ -8,6 +8,7 @@ Global variables - - import ConfigParser - import logging -+import os - import os.path - import sys - import zipfile -@@ -1229,6 +1230,11 @@ def init_paths(): - config.log_file = os.path.join( - config.appdata_path, 'wxglade.log' - ) -+ -+# create missing application data directory, otherwise log initialisation -+# will failed with an IOError "No such file or directory" -+if not os.path.isdir(config.appdata_path): -+os.makedirs(config.appdata_path, 0700) - - - def init_preferences(): Index: x11/wxglade//patches/patch-wxGlade_desktop === RCS file: /cvs/ports/x11/wxglade/patches/patch-wxGlade_desktop,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-wxGlade_desktop --- x11/wxglade//patches/patch-wxGlade_desktop 13 Oct 2015 16:58:07 - 1.1.1.1 +++ x11/wxglade//patches/patch-wxGlade_desktop 4 Apr 2020 15:53:09 - @@ -2,14 +2,15 @@ $OpenBSD: patch-wxGlade_desktop,v 1.1.1. Fix executable script name/path. wxGlade.desktop.orig Tue Oct 21 07:17:59 2014 -+++ wxGlade.desktopFri Oct 9 13:37:12 2015 -@@ -3,7 +3,7 @@ Version=0.7.0 +Index: wxGlade.desktop +--- wxGlade.desktop.orig wxGlade.desktop +@@ -3,7 +3,7 @@ Version=0.9.5 Encoding=UTF-8 Name=wxGlade Comment=A GUI designer written in Python with the popular GUI toolkit wxPython --Exec=wxGlade -+Exec=/usr/local/bin/wxglade +-Exec=wxglade %f ++Exec=/usr/local/bin/wxglade %f Terminal=false - Icon=mondrian.ico + Icon=wxglade.xpm Type=Application Index: x11/wxglade//patches/patch-wxglade === RCS file: /cvs/ports/x11/wxglade/patches/patch-wxglade,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-wxglade --- x11/wxglade//patches/patch-wxglade 13 Oct 2015 16:58:07 - 1.1.1.1 +++ x11/wxglade//patches/patch-wxglade 4 Apr 2020 15:53:09 - @@ -2,52 +2,88 @@ $OpenBSD: patch-wxglade,v 1.1.1.1 2015/1 Fix path to the wxglade python package. wxglade.orig Fri Oct 9 16:12:29 2015 -+++ wxgladeFri Oct 9 16:16:43 2015 -@@ -6,14 +6,8 @@ - # Copyright 2011-2013 Carsten Grohmann +Index: wxglade +--- wxglade.orig wxglade +@@ -7,79 +7,12 @@ # # Shell script to start wxGlade --# + # -# The wxGlade main script is called wxglade.py. It will be searched at -# three places: -# 1. parallel to
Re: Maintainer-Update x11/wxglade 0.7.0->0.9.5
> > here is an long overdue update to bring wxglade to the latest version > > 0.9.5. Tested on amd64 mostly with python and C++ code generation. > > > > I was looking into updating this to py3 but our wxPython port only > > supports Python 2. Upgrading wxPython from 3.0.2 to 4.0.5 is a larger > > undertaking, so wanted to get this in first. > > > > Please test and comment! Ping. It would be great if somebody could look at this, thanks! Daniel Index: x11/wxglade//Makefile === RCS file: /cvs/ports/x11/wxglade/Makefile,v retrieving revision 1.3 diff -u -p -u -p -r1.3 Makefile --- x11/wxglade//Makefile 12 Jul 2019 20:51:25 - 1.3 +++ x11/wxglade//Makefile 26 Mar 2020 20:51:38 - @@ -2,10 +2,10 @@ COMMENT= GUI designer for wxWidgets/wxPython user interfaces -MODPY_EGG_VERSION= 0.7.0 +MODPY_EGG_VERSION= 0.9.5 DISTNAME= wxGlade-${MODPY_EGG_VERSION} PKGNAME= wxglade-${MODPY_EGG_VERSION} -REVISION= 0 +EXTRACT_SUFX= .zip MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxglade/} @@ -18,6 +18,7 @@ MAINTAINER= Daniel Winters Index: x11/wxglade//distinfo === RCS file: /cvs/ports/x11/wxglade/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 distinfo --- x11/wxglade//distinfo 13 Oct 2015 16:58:07 - 1.1.1.1 +++ x11/wxglade//distinfo 26 Mar 2020 20:51:38 - @@ -1,2 +1,2 @@ -SHA256 (wxGlade-0.7.0.tar.gz) = Dn+NxIvA2mBtrV1cZRiLYrkHAumAe5iP8CO0YMX6L5k= -SIZE (wxGlade-0.7.0.tar.gz) = 1863564 +SHA256 (wxGlade-0.9.5.zip) = /MGlT83bYROlA1ZBtEYrclMIMtQJExidKIg+JdU5V50= +SIZE (wxGlade-0.9.5.zip) = 4755933 Index: x11/wxglade//patches/patch-common_py === RCS file: x11/wxglade//patches/patch-common_py diff -N x11/wxglade//patches/patch-common_py --- x11/wxglade//patches/patch-common_py13 Oct 2015 16:58:07 - 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,28 +0,0 @@ -$OpenBSD: patch-common_py,v 1.1.1.1 2015/10/13 16:58:07 jca Exp $ - -Backport upstream fix for missing ~/.wxglade/ directory. - - https://bitbucket.org/agriggio/wxglade/commits/4c3c49e4cf61a1d8127a74a396016ffa4fbaa97b?at=default - common.py.orig Fri Oct 9 16:03:04 2015 -+++ common.py Fri Oct 9 16:06:20 2015 -@@ -8,6 +8,7 @@ Global variables - - import ConfigParser - import logging -+import os - import os.path - import sys - import zipfile -@@ -1229,6 +1230,11 @@ def init_paths(): - config.log_file = os.path.join( - config.appdata_path, 'wxglade.log' - ) -+ -+# create missing application data directory, otherwise log initialisation -+# will failed with an IOError "No such file or directory" -+if not os.path.isdir(config.appdata_path): -+os.makedirs(config.appdata_path, 0700) - - - def init_preferences(): Index: x11/wxglade//patches/patch-wxGlade_desktop === RCS file: /cvs/ports/x11/wxglade/patches/patch-wxGlade_desktop,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-wxGlade_desktop --- x11/wxglade//patches/patch-wxGlade_desktop 13 Oct 2015 16:58:07 - 1.1.1.1 +++ x11/wxglade//patches/patch-wxGlade_desktop 26 Mar 2020 20:51:38 - @@ -2,14 +2,15 @@ $OpenBSD: patch-wxGlade_desktop,v 1.1.1. Fix executable script name/path. wxGlade.desktop.orig Tue Oct 21 07:17:59 2014 -+++ wxGlade.desktopFri Oct 9 13:37:12 2015 -@@ -3,7 +3,7 @@ Version=0.7.0 +Index: wxGlade.desktop +--- wxGlade.desktop.orig wxGlade.desktop +@@ -3,7 +3,7 @@ Version=0.9.5 Encoding=UTF-8 Name=wxGlade Comment=A GUI designer written in Python with the popular GUI toolkit wxPython --Exec=wxGlade -+Exec=/usr/local/bin/wxglade +-Exec=wxglade %f ++Exec=/usr/local/bin/wxglade %f Terminal=false - Icon=mondrian.ico + Icon=wxglade.xpm Type=Application Index: x11/wxglade//patches/patch-wxglade === RCS file: /cvs/ports/x11/wxglade/patches/patch-wxglade,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-wxglade --- x11/wxglade//patches/patch-wxglade 13 Oct 2015 16:58:07 - 1.1.1.1 +++ x11/wxglade//patches/patch-wxglade 26 Mar 2020 20:51:38 - @@ -2,52 +2,88 @@ $OpenBSD: patch-wxglade,v 1.1.1.1 2015/1 Fix path to the wxglade python package. wxglade.orig Fri Oct 9 16:12:29 2015 -+++ wxgladeFri Oct 9 16:16:43 2015 -@@ -6,14 +6,8 @@ - # Copyright 2011-2013 Carsten Grohmann +Index: wxglade +--- wxglade.orig wxglade +@@ -7,79 +7,12 @@ # # Shell script to start wxGlade --# + # -# The wxGlade main script is called wxglade.py. It will be searched at -# three places: -# 1. parallel to this script -
Re: Maintainer update & move py-twitter to py3
> > > the diff below updates py-twitter to the latest version and moves it > > > to py3-only. Tested on amd64. > > > > > Thank you for this diff! I did not test it so far but I did notice two > > things: > > > > 1. Instead of commenting out the IRC functionality you could opt for > >another solution: There is a fork of python-irclib that adds Python 3 > >support. Actually py-twitter refers to this fork [0]. Of course this > >means that net/py-irclib will need some additional love; > > 2. You need to add a @pkgpath- and @conflict-marker to PLIST > > Bjorn sent me a diff for updating py-irclib to the fork that supports > python3 - thanks!. > > I will see if it works with py-twitter and come back with a revised > diff... Updated diff including suggestions from bket@ and using the updated py-irclib port that I just sent. Cheers, Daniel Index: Makefile === RCS file: /cvs/ports/net/py-twitter/Makefile,v retrieving revision 1.14 diff -u -p -u -p -r1.14 Makefile --- Makefile12 Jul 2019 20:48:46 - 1.14 +++ Makefile31 Mar 2020 13:18:12 - @@ -2,10 +2,9 @@ COMMENT= twitter python module -MODPY_EGG_VERSION= 1.17.1 +MODPY_EGG_VERSION= 1.18.0 DISTNAME= twitter-${MODPY_EGG_VERSION} PKGNAME= py-twitter-${MODPY_EGG_VERSION} -REVISION= 0 CATEGORIES=net www @@ -15,11 +14,13 @@ MAINTAINER= Daniel Winters
update: py-irclib + move to py3
Move py-irclib to a fork that supports python3 and switch to python3 only. The only consumer is py-twitter for which I will send a separate diff shortly. Joint work with bket@, tested on amd64. Cheers, Daniel Index: Makefile === RCS file: /cvs/ports/net/py-irclib/Makefile,v retrieving revision 1.14 diff -u -p -u -p -r1.14 Makefile --- Makefile12 Jul 2019 20:48:45 - 1.14 +++ Makefile31 Mar 2020 13:15:24 - @@ -2,19 +2,21 @@ COMMENT= Internet Relay Chat (IRC) protocol client library for Python -DISTNAME= python-irclib-0.4.6 -PKGNAME= ${DISTNAME:S/python/py/g} -REVISION = 4 -CATEGORIES=net +GH_ACCOUNT=sixohsix +GH_PROJECT=python-irclib +GH_COMMIT= acd5aa66f431550bd142e90590b64ff6840e6648 +DISTNAME= py-irclib-0.4.8.20110306 -HOMEPAGE= http://python-irclib.sourceforge.net/ +CATEGORIES=net -# LGPL +# LGPLv2.1 PERMIT_PACKAGE=Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=python-irclib/} +MODULES= lang/python +MODPY_SETUPTOOLS= Yes -MODULES= lang/python +FLAVORS= python3 +FLAVOR=python3 NO_TEST= Yes Index: distinfo === RCS file: /cvs/ports/net/py-irclib/distinfo,v retrieving revision 1.6 diff -u -p -u -p -r1.6 distinfo --- distinfo18 Jan 2015 03:14:51 - 1.6 +++ distinfo31 Mar 2020 13:15:24 - @@ -1,2 +1,2 @@ -SHA256 (python-irclib-0.4.6.tar.gz) = 8fRyppiWawNQhXsg/H9t2G5KH4OHDt++MOs2VStEloA= -SIZE (python-irclib-0.4.6.tar.gz) = 33922 +SHA256 (py-irclib-0.4.8.20110306-acd5aa66.tar.gz) = kXO31zUdYjx3Uxw9d/x1cN3CpgwQqMUGYTYBulBwrbo= +SIZE (py-irclib-0.4.8.20110306-acd5aa66.tar.gz) = 34462 Index: patches/patch-ircbot_py === RCS file: patches/patch-ircbot_py diff -N patches/patch-ircbot_py --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-ircbot_py 31 Mar 2020 13:15:24 - @@ -0,0 +1,52 @@ +$OpenBSD$ + +Remove unneeded imports that don't work in python3, avoid an infinite +recursion in __contains__, remove unneeded method using a deprecated +function, fix variable error + +Index: ircbot.py +--- ircbot.py.orig ircbot.py +@@ -25,10 +25,9 @@ write simpler bots. + """ + + import sys +-from UserDict import UserDict + + from irclib import SimpleIRCClient +-from irclib import nm_to_n, irc_lower, all_events ++from irclib import nm_to_n, irc_lower + from irclib import parse_channel_modes, is_channel + from irclib import ServerConnectionError + +@@ -263,11 +262,6 @@ class IRCDict: + self.update(dict) + def __repr__(self): + return repr(self.data) +-def __cmp__(self, dict): +-if isinstance(dict, IRCDict): +-return cmp(self.data, dict.data) +-else: +-return cmp(self.data, dict) + def __len__(self): + return len(self.data) + def __getitem__(self, key): +@@ -284,7 +278,8 @@ class IRCDict: + def __iter__(self): + return iter(self.data) + def __contains__(self, key): +-return key in self ++return True if key in self.keys() else False ++ + def clear(self): + self.data.clear() + self.canon_keys.clear() +@@ -424,7 +419,7 @@ class Channel: + + def limit(self): + if self.has_limit(): +-return self.modes[l] ++return self.modes["l"] + else: + return None + Index: pkg/PLIST === RCS file: /cvs/ports/net/py-irclib/pkg/PLIST,v retrieving revision 1.4 diff -u -p -u -p -r1.4 PLIST --- pkg/PLIST 20 Sep 2006 12:41:46 - 1.4 +++ pkg/PLIST 31 Mar 2020 13:15:24 - @@ -1,8 +1,15 @@ @comment $OpenBSD: PLIST,v 1.4 2006/09/20 12:41:46 xsa Exp $ +@conflict py-irclib-* +@pkgpath net/py-irclib +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ircbot.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}irclib.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/ircbot.py -lib/python${MODPY_VERSION}/site-packages/ircbot.pyc lib/python${MODPY_VERSION}/site-packages/irclib.py -lib/python${MODPY_VERSION}/site-packages/irclib.pyc +lib/python${MODPY_VERSION}/site-packages/python_irclib-0.4.8-py${MODPY_VERSION}.egg-info/ +lib/python${MODPY_VERSION}/site-packages/python_irclib-0.4.8-py${MODPY_VERSION}.egg-info/PKG-INFO +lib/python${MODPY_VERSION}/site-packages/python_irclib-0.4.8-py${MODPY_VERSION}.egg-info/SOURCES.txt +lib/python${MODPY_VERSION}/site-packages/python_irclib-0.4.8-py${MODPY_VERSION}.egg-info/dependency_links.txt +lib/python${MODPY_VERSION}/site-packages/python_irclib-0.4.8-py${MODPY_VERSION}.egg-info/top_level.txt share/examples/py-irclib/ share/examples/py-irclib/dccreceive share/examples/py-irclib/dccsend
Re: Maintainer-Update x11/wxglade 0.7.0->0.9.5
> here is an long overdue update to bring wxglade to the latest version > 0.9.5. Tested on amd64 mostly with python and C++ code generation. > > I was looking into updating this to py3 but our wxPython port only > supports Python 2. Upgrading wxPython from 3.0.2 to 4.0.5 is a larger > undertaking, so wanted to get this in first. > > Please test and comment! My apologies, I forgot to cvs rm a now unneeded patch, better diff below: Index: x11/wxglade//Makefile === RCS file: /cvs/ports/x11/wxglade/Makefile,v retrieving revision 1.3 diff -u -p -u -p -r1.3 Makefile --- x11/wxglade//Makefile 12 Jul 2019 20:51:25 - 1.3 +++ x11/wxglade//Makefile 26 Mar 2020 20:51:38 - @@ -2,10 +2,10 @@ COMMENT= GUI designer for wxWidgets/wxPython user interfaces -MODPY_EGG_VERSION= 0.7.0 +MODPY_EGG_VERSION= 0.9.5 DISTNAME= wxGlade-${MODPY_EGG_VERSION} PKGNAME= wxglade-${MODPY_EGG_VERSION} -REVISION= 0 +EXTRACT_SUFX= .zip MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxglade/} @@ -18,6 +18,7 @@ MAINTAINER= Daniel Winters Index: x11/wxglade//distinfo === RCS file: /cvs/ports/x11/wxglade/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 distinfo --- x11/wxglade//distinfo 13 Oct 2015 16:58:07 - 1.1.1.1 +++ x11/wxglade//distinfo 26 Mar 2020 20:51:38 - @@ -1,2 +1,2 @@ -SHA256 (wxGlade-0.7.0.tar.gz) = Dn+NxIvA2mBtrV1cZRiLYrkHAumAe5iP8CO0YMX6L5k= -SIZE (wxGlade-0.7.0.tar.gz) = 1863564 +SHA256 (wxGlade-0.9.5.zip) = /MGlT83bYROlA1ZBtEYrclMIMtQJExidKIg+JdU5V50= +SIZE (wxGlade-0.9.5.zip) = 4755933 Index: x11/wxglade//patches/patch-common_py === RCS file: x11/wxglade//patches/patch-common_py diff -N x11/wxglade//patches/patch-common_py --- x11/wxglade//patches/patch-common_py13 Oct 2015 16:58:07 - 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,28 +0,0 @@ -$OpenBSD: patch-common_py,v 1.1.1.1 2015/10/13 16:58:07 jca Exp $ - -Backport upstream fix for missing ~/.wxglade/ directory. - - https://bitbucket.org/agriggio/wxglade/commits/4c3c49e4cf61a1d8127a74a396016ffa4fbaa97b?at=default - common.py.orig Fri Oct 9 16:03:04 2015 -+++ common.py Fri Oct 9 16:06:20 2015 -@@ -8,6 +8,7 @@ Global variables - - import ConfigParser - import logging -+import os - import os.path - import sys - import zipfile -@@ -1229,6 +1230,11 @@ def init_paths(): - config.log_file = os.path.join( - config.appdata_path, 'wxglade.log' - ) -+ -+# create missing application data directory, otherwise log initialisation -+# will failed with an IOError "No such file or directory" -+if not os.path.isdir(config.appdata_path): -+os.makedirs(config.appdata_path, 0700) - - - def init_preferences(): Index: x11/wxglade//patches/patch-wxGlade_desktop === RCS file: /cvs/ports/x11/wxglade/patches/patch-wxGlade_desktop,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-wxGlade_desktop --- x11/wxglade//patches/patch-wxGlade_desktop 13 Oct 2015 16:58:07 - 1.1.1.1 +++ x11/wxglade//patches/patch-wxGlade_desktop 26 Mar 2020 20:51:38 - @@ -2,14 +2,15 @@ $OpenBSD: patch-wxGlade_desktop,v 1.1.1. Fix executable script name/path. wxGlade.desktop.orig Tue Oct 21 07:17:59 2014 -+++ wxGlade.desktopFri Oct 9 13:37:12 2015 -@@ -3,7 +3,7 @@ Version=0.7.0 +Index: wxGlade.desktop +--- wxGlade.desktop.orig wxGlade.desktop +@@ -3,7 +3,7 @@ Version=0.9.5 Encoding=UTF-8 Name=wxGlade Comment=A GUI designer written in Python with the popular GUI toolkit wxPython --Exec=wxGlade -+Exec=/usr/local/bin/wxglade +-Exec=wxglade %f ++Exec=/usr/local/bin/wxglade %f Terminal=false - Icon=mondrian.ico + Icon=wxglade.xpm Type=Application Index: x11/wxglade//patches/patch-wxglade === RCS file: /cvs/ports/x11/wxglade/patches/patch-wxglade,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-wxglade --- x11/wxglade//patches/patch-wxglade 13 Oct 2015 16:58:07 - 1.1.1.1 +++ x11/wxglade//patches/patch-wxglade 26 Mar 2020 20:51:38 - @@ -2,52 +2,88 @@ $OpenBSD: patch-wxglade,v 1.1.1.1 2015/1 Fix path to the wxglade python package. wxglade.orig Fri Oct 9 16:12:29 2015 -+++ wxgladeFri Oct 9 16:16:43 2015 -@@ -6,14 +6,8 @@ - # Copyright 2011-2013 Carsten Grohmann +Index: wxglade +--- wxglade.orig wxglade +@@ -7,79 +7,12 @@ # # Shell script to start wxGlade --# + # -# The wxGlade main script is called wxglade.py. It will be searched at -# three places: -# 1. parallel to this script -# 2. in the module dire
Maintainer-Update x11/wxglade 0.7.0->0.9.5
Hi, here is an long overdue update to bring wxglade to the latest version 0.9.5. Tested on amd64 mostly with python and C++ code generation. I was looking into updating this to py3 but our wxPython port only supports Python 2. Upgrading wxPython from 3.0.2 to 4.0.5 is a larger undertaking, so wanted to get this in first. Please test and comment! Thanks, Daniel Index: x11/wxglade//Makefile === RCS file: /cvs/ports/x11/wxglade/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- x11/wxglade//Makefile 12 Jul 2019 20:51:25 - 1.3 +++ x11/wxglade//Makefile 26 Mar 2020 20:32:25 - @@ -2,10 +2,10 @@ COMMENT= GUI designer for wxWidgets/wxPython user interfaces -MODPY_EGG_VERSION= 0.7.0 +MODPY_EGG_VERSION= 0.9.5 DISTNAME= wxGlade-${MODPY_EGG_VERSION} PKGNAME= wxglade-${MODPY_EGG_VERSION} -REVISION= 0 +EXTRACT_SUFX= .zip MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxglade/} @@ -18,6 +18,7 @@ MAINTAINER= Daniel Winters Index: x11/wxglade//distinfo === RCS file: /cvs/ports/x11/wxglade/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- x11/wxglade//distinfo 13 Oct 2015 16:58:07 - 1.1.1.1 +++ x11/wxglade//distinfo 26 Mar 2020 20:32:25 - @@ -1,2 +1,2 @@ -SHA256 (wxGlade-0.7.0.tar.gz) = Dn+NxIvA2mBtrV1cZRiLYrkHAumAe5iP8CO0YMX6L5k= -SIZE (wxGlade-0.7.0.tar.gz) = 1863564 +SHA256 (wxGlade-0.9.5.zip) = /MGlT83bYROlA1ZBtEYrclMIMtQJExidKIg+JdU5V50= +SIZE (wxGlade-0.9.5.zip) = 4755933 Index: x11/wxglade//patches/patch-wxGlade_desktop === RCS file: /cvs/ports/x11/wxglade/patches/patch-wxGlade_desktop,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-wxGlade_desktop --- x11/wxglade//patches/patch-wxGlade_desktop 13 Oct 2015 16:58:07 - 1.1.1.1 +++ x11/wxglade//patches/patch-wxGlade_desktop 26 Mar 2020 20:32:25 - @@ -2,14 +2,15 @@ $OpenBSD: patch-wxGlade_desktop,v 1.1.1. Fix executable script name/path. wxGlade.desktop.orig Tue Oct 21 07:17:59 2014 -+++ wxGlade.desktopFri Oct 9 13:37:12 2015 -@@ -3,7 +3,7 @@ Version=0.7.0 +Index: wxGlade.desktop +--- wxGlade.desktop.orig wxGlade.desktop +@@ -3,7 +3,7 @@ Version=0.9.5 Encoding=UTF-8 Name=wxGlade Comment=A GUI designer written in Python with the popular GUI toolkit wxPython --Exec=wxGlade -+Exec=/usr/local/bin/wxglade +-Exec=wxglade %f ++Exec=/usr/local/bin/wxglade %f Terminal=false - Icon=mondrian.ico + Icon=wxglade.xpm Type=Application Index: x11/wxglade//patches/patch-wxglade === RCS file: /cvs/ports/x11/wxglade/patches/patch-wxglade,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-wxglade --- x11/wxglade//patches/patch-wxglade 13 Oct 2015 16:58:07 - 1.1.1.1 +++ x11/wxglade//patches/patch-wxglade 26 Mar 2020 20:32:25 - @@ -2,52 +2,88 @@ $OpenBSD: patch-wxglade,v 1.1.1.1 2015/1 Fix path to the wxglade python package. wxglade.orig Fri Oct 9 16:12:29 2015 -+++ wxgladeFri Oct 9 16:16:43 2015 -@@ -6,14 +6,8 @@ - # Copyright 2011-2013 Carsten Grohmann +Index: wxglade +--- wxglade.orig wxglade +@@ -7,79 +7,12 @@ # # Shell script to start wxGlade --# + # -# The wxGlade main script is called wxglade.py. It will be searched at -# three places: -# 1. parallel to this script -# 2. in the module directory of the current Python -# 3. in a parallel Python module directory --PYTHON_BIN=${PYTHON_BIN:=python2} -+PYTHON_BIN=${MODPY_BIN} - - ${PYTHON_BIN} --version > /dev/null 2>&1 - if [ $? -ne 0 ]; then -@@ -21,29 +15,7 @@ if [ $? -ne 0 ]; then - exit 1 - fi + # Keep this up to date with version.py and sphinx/conf.py + WXG_VERSION="0.9.5" --# determined current python version --PY_VERSION=$(${PYTHON_BIN} -c 'import sys; print sys.version[:3]') +-# search order for Python interpreter +-INTERPRETER_LIST="python3 python2 \ +- python2.7 python27 \ +- python" - --# determined prefix of the Python module directory structure --if [ -e /etc/debian_version ]; then -- WXGLADE_MODULE_PATH="/usr/lib/pymodules/python${PY_VERSION}/wxglade" --else -- WXGLADE_MODULE_PATH="/usr/lib/python${PY_VERSION}/wxglade" +-# Use the binary from PYTHON_BIN, if this environment variable is set +-if [ "$PYTHON_BIN" ]; then +- INTERPRETER_LIST="$PYTHON_BIN" -fi - --CURR_DIR=$(dirname $0) +-for INTERPRETER in $INTERPRETER_LIST; do +- ${INTERPRETER} -V >/dev/null 2>&1 +- if [ $? -ne 0 ]; then +-continue +- fi +- +- # Python interpreter found +- PYTHON_BIN=$INTERPRETER +- +- # determined current python version +- PY_VERSION=$(${PYTHON_BIN
Re: Maintainer update & move py-twitter to py3
Hi, > > the diff below updates py-twitter to the latest version and moves it > > to py3-only. Tested on amd64. > > > Thank you for this diff! I did not test it so far but I did notice two > things: > > 1. Instead of commenting out the IRC functionality you could opt for >another solution: There is a fork of python-irclib that adds Python 3 >support. Actually py-twitter refers to this fork [0]. Of course this >means that net/py-irclib will need some additional love; > 2. You need to add a @pkgpath- and @conflict-marker to PLIST Bjorn sent me a diff for updating py-irclib to the fork that supports python3 - thanks!. I will see if it works with py-twitter and come back with a revised diff... Daniel
Maintainer update & move py-twitter to py3
Dear all, the diff below updates py-twitter to the latest version and moves it to py3-only. Tested on amd64. This is mostly interesting for the commandline tools and is has no consumers. I commented out the IRC functionality as the py-irclib library that is imported does not support python3 and has not been updated in more than 10 years. I doubt the IRC functionality will be missed. This will need a quirks entry which is not in the patch yet. Any comment or feedback is very welcome! Daniel Index: Makefile === RCS file: /cvs/ports/net/py-twitter/Makefile,v retrieving revision 1.14 diff -u -p -u -r1.14 Makefile --- Makefile12 Jul 2019 20:48:46 - 1.14 +++ Makefile20 Mar 2020 22:46:26 - @@ -2,10 +2,9 @@ COMMENT= twitter python module -MODPY_EGG_VERSION= 1.17.1 +MODPY_EGG_VERSION= 1.18.0 DISTNAME= twitter-${MODPY_EGG_VERSION} PKGNAME= py-twitter-${MODPY_EGG_VERSION} -REVISION= 0 CATEGORIES=net www @@ -15,13 +14,14 @@ MAINTAINER= Daniel Winters
Re: Maintainer UPDATE: py-twitter 0.17.1 -> 0.18.0
>> I have not enabled the py3 version as this port installs some scripts >> in /usr/local/bin that would conflict if both versions are installed. >> Would people prefer to update this to py3 and drop py2? > > See www/py-gunicorn/Makefile > post-install: >for i in ${PREFIX}/bin/*; do \ >mv $${i} $${i}${MODPY_BIN_SUFFIX} ;\ >done > > For now it's probably easier to have a flavor and provide both py2 and > py3. Yes, that makes sense, thanks for the pointers! Will look at updating the dependency py-irclib to py3 and will report back. Cheers, Daniel
Maintainer UPDATE: py-twitter 0.17.1 -> 0.18.0
Hi, Here is a trivial update to the latest version of py-twitter. Tested on amd64. I have not enabled the py3 version as this port installs some scripts in /usr/local/bin that would conflict if both versions are installed. Would people prefer to update this to py3 and drop py2? Please test, thanks! Index: Makefile === RCS file: /cvs/ports/net/py-twitter/Makefile,v retrieving revision 1.14 diff -u -b -B -w -p -r1.14 Makefile --- Makefile12 Jul 2019 20:48:46 - 1.14 +++ Makefile24 Aug 2019 21:04:46 - @@ -2,10 +2,9 @@ COMMENT=twitter python module -MODPY_EGG_VERSION= 1.17.1 +MODPY_EGG_VERSION= 1.18.0 DISTNAME= twitter-${MODPY_EGG_VERSION} PKGNAME=py-twitter-${MODPY_EGG_VERSION} -REVISION= 0 CATEGORIES= net www Index: distinfo === RCS file: /cvs/ports/net/py-twitter/distinfo,v retrieving revision 1.6 diff -u -b -B -w -p -r1.6 distinfo --- distinfo8 Sep 2015 11:38:04 - 1.6 +++ distinfo24 Aug 2019 21:04:46 - @@ -1,2 +1,2 @@ -SHA256 (twitter-1.17.1.tar.gz) = npmNzogWFdXGJXlGKtftl1HdrtiAcvJo7fnA5Y9tcAs= -SIZE (twitter-1.17.1.tar.gz) = 44023 +SHA256 (twitter-1.18.0.tar.gz) = rNyF5b7qdSlnu2TGO96LkVxJoxoB2xsv7Mz58sHVxE0= +SIZE (twitter-1.18.0.tar.gz) = 47695
Re: devel/py-serial update 2.7 to 3.4
Hi Kurt, > I noticed the deletion of the homepage. There *is* a homepage on > Github. It's linked from the pypi page. > > Here's a version that does away with all the weird do-test manipulations > also and just uses MODPY_PYTEST. I added a patch to disable a few tests > as they would just hang. The updated patch works fine here as well on amd64, thanks! Daniel > Index: Makefile > === > RCS file: /cvs/ports/devel/py-serial/Makefile,v > retrieving revision 1.10 > diff -u -p -r1.10 Makefile > --- Makefile 28 Apr 2019 20:51:36 - 1.10 > +++ Makefile 4 May 2019 17:20:14 - > @@ -2,14 +2,13 @@ > > COMMENT = serial interface class for Python > > -MODPY_EGG_VERSION = 2.7 > +MODPY_EGG_VERSION = 3.4 > DISTNAME =pyserial-${MODPY_EGG_VERSION} > PKGNAME = ${DISTNAME:S/py/py-/} > -REVISION = 1 > > CATEGORIES = devel > > -HOMEPAGE = http://pyserial.sourceforge.net/ > +HOMEPAGE = https://github.com/pyserial/pyserial > > MAINTAINER = Daniel Winters > > @@ -18,6 +17,8 @@ PERMIT_PACKAGE_CDROM = Yes > > MODULES = lang/python > MODPY_PI =Yes > +MODPY_SETUPTOOLS = Yes > +MODPY_PYTEST = Yes > > FLAVORS = python3 > FLAVOR ?= > @@ -28,20 +29,9 @@ EXAMPLESDIR = ${PREFIX}/share/examples/ > post-install: > cd ${PREFIX}/bin/ && mv miniterm.py miniterm-${MODPY_VERSION}.py > ${INSTALL_DATA_DIR} ${DOCSDIR} > - ${INSTALL_DATA} ${WRKSRC}/README.txt ${WRKSRC}/LICENSE.txt ${DOCSDIR} > + ${INSTALL_DATA} ${WRKSRC}/README.rst ${WRKSRC}/LICENSE.txt ${DOCSDIR} > ${INSTALL_DATA} ${WRKSRC}/documentation/*.rst ${DOCSDIR} > ${INSTALL_DATA_DIR} ${EXAMPLESDIR} > ${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR} > - > -# NOTE: tests require a serial setup; see ${WRKSRC}/examples/test.py > -# for more information > -do-test: > - cd ${WRKSRC} && \ > - for _test in ${WRKSRC}/examples/test*; do \ > - PYTHONPATH=. ${MODPY_BIN} $${_test}; \ > - done > -.for _test in ${WRKSRC}/examples/test* > - cd ${WRKSRC} && ${MODPY_BIN} ${_test} > -.endfor > > .include > Index: distinfo > === > RCS file: /cvs/ports/devel/py-serial/distinfo,v > retrieving revision 1.3 > diff -u -p -r1.3 distinfo > --- distinfo 20 Jul 2015 00:33:13 - 1.3 > +++ distinfo 4 May 2019 17:20:14 - > @@ -1,2 +1,2 @@ > -SHA256 (pyserial-2.7.tar.gz) = NULsCDh5PmHWIk4n/wXozkulpcXMTsXGo+jUkkeYVHc= > -SIZE (pyserial-2.7.tar.gz) = 122081 > +SHA256 (pyserial-3.4.tar.gz) = bi1AH97g6rmWz3NOZ3c6AUO5MncsqLQkUUQM/tlCxic= > +SIZE (pyserial-3.4.tar.gz) = 151657 > Index: patches/patch-test_test_pty_py > === > RCS file: patches/patch-test_test_pty_py > diff -N patches/patch-test_test_pty_py > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-test_test_pty_py4 May 2019 17:20:14 - > @@ -0,0 +1,43 @@ > +$OpenBSD$ > + > +Some pty tests hang > + > +Index: test/test_pty.py > +--- test/test_pty.py.orig > test/test_pty.py > +@@ -32,21 +32,21 @@ class Test_Pty_Serial_Open(unittest.TestCase): > + with serial.Serial(os.ttyname(self.slave), timeout=1) as slave: > + pass # OK > + > +-def test_pty_serial_write(self): > +-with serial.Serial(os.ttyname(self.slave), timeout=1) as slave: > +-with os.fdopen(self.master, "wb") as fd: > +-fd.write(DATA) > +-fd.flush() > +-out = slave.read(len(DATA)) > +-self.assertEqual(DATA, out) > ++# ~def test_pty_serial_write(self): > ++# ~with serial.Serial(os.ttyname(self.slave), timeout=1) as slave: > ++# ~with os.fdopen(self.master, "wb") as fd: > ++# ~fd.write(DATA) > ++# ~fd.flush() > ++# ~out = slave.read(len(DATA)) > ++# ~self.assertEqual(DATA, out) > + > +-def test_pty_serial_read(self): > +-with serial.Serial(os.ttyname(self.slave), timeout=1) as slave: > +-with os.fdopen(self.master, "rb") as fd: > +-slave.write(DATA) > +-slave.flush() > +-out = fd.read(len(DATA)) > +-self.assertEqual(DATA, out) > ++# ~def test_pty_serial_read(self): > ++# ~with serial.Serial(os.ttyname(self.slave), timeout=1) as
Re: devel/py-serial update 2.7 to 3.4
As discussed with Olivier, this looks fine to me - ok maintainer. Thanks to Olivier for the work! Daniel > On May 3, 2019, at 10:52, Olivier Taïbi wrote: > > Here is an update for devel/py-serial, after dicussing with maintainer > Daniel Winters dan...@tydirium.org. Both py2 and py3 flavors build fine, > and I very briefly tested the py3 flavor with mpfshell with an ESP-01, > and it appears to work as expected. > > > Index: Makefile > === > RCS file: /cvs/ports/devel/py-serial/Makefile,v > retrieving revision 1.10 > diff -u -p -u -p -r1.10 Makefile > --- Makefile 28 Apr 2019 20:51:36 - 1.10 > +++ Makefile 1 May 2019 15:44:02 - > @@ -2,15 +2,12 @@ > > COMMENT = serial interface class for Python > > -MODPY_EGG_VERSION = 2.7 > +MODPY_EGG_VERSION = 3.4 > DISTNAME =pyserial-${MODPY_EGG_VERSION} > PKGNAME = ${DISTNAME:S/py/py-/} > -REVISION = 1 > > CATEGORIES = devel > > -HOMEPAGE = http://pyserial.sourceforge.net/ > - > MAINTAINER = Daniel Winters > > # Python license > @@ -18,6 +15,7 @@ PERMIT_PACKAGE_CDROM = Yes > > MODULES = lang/python > MODPY_PI =Yes > +MODPY_SETUPTOOLS = Yes > > FLAVORS = python3 > FLAVOR ?= > @@ -28,7 +26,7 @@ EXAMPLESDIR = ${PREFIX}/share/examples/ > post-install: > cd ${PREFIX}/bin/ && mv miniterm.py miniterm-${MODPY_VERSION}.py > ${INSTALL_DATA_DIR} ${DOCSDIR} > - ${INSTALL_DATA} ${WRKSRC}/README.txt ${WRKSRC}/LICENSE.txt ${DOCSDIR} > + ${INSTALL_DATA} ${WRKSRC}/README.rst ${WRKSRC}/LICENSE.txt ${DOCSDIR} > ${INSTALL_DATA} ${WRKSRC}/documentation/*.rst ${DOCSDIR} > ${INSTALL_DATA_DIR} ${EXAMPLESDIR} > ${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR} > Index: distinfo > === > RCS file: /cvs/ports/devel/py-serial/distinfo,v > retrieving revision 1.3 > diff -u -p -u -p -r1.3 distinfo > --- distinfo 20 Jul 2015 00:33:13 - 1.3 > +++ distinfo 1 May 2019 15:44:02 - > @@ -1,2 +1,2 @@ > -SHA256 (pyserial-2.7.tar.gz) = NULsCDh5PmHWIk4n/wXozkulpcXMTsXGo+jUkkeYVHc= > -SIZE (pyserial-2.7.tar.gz) = 122081 > +SHA256 (pyserial-3.4.tar.gz) = bi1AH97g6rmWz3NOZ3c6AUO5MncsqLQkUUQM/tlCxic= > +SIZE (pyserial-3.4.tar.gz) = 151657 > Index: pkg/DESCR > === > RCS file: /cvs/ports/devel/py-serial/pkg/DESCR,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 DESCR > --- pkg/DESCR 14 Mar 2011 09:17:27 - 1.2 > +++ pkg/DESCR 1 May 2019 15:44:02 - > @@ -3,4 +3,4 @@ standard Python running on Windows, Linu > compliant system), Jython and IronPython. The module named "serial" > automatically selects the appropriate backend. > > -For usage instructions see ${PREFIX}/share/doc/py-serial/README.txt > +For usage instructions see ${PREFIX}/share/doc/py-serial/README.rst > Index: pkg/PLIST > === > RCS file: /cvs/ports/devel/py-serial/pkg/PLIST,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 PLIST > --- pkg/PLIST 20 Jul 2015 00:33:13 - 1.2 > +++ pkg/PLIST 1 May 2019 15:44:02 - > @@ -1,36 +1,48 @@ > -@comment $OpenBSD: PLIST,v 1.2 2015/07/20 00:33:13 jca Exp $ > +@comment $OpenBSD: PLIST,v$ > bin/miniterm-${MODPY_VERSION}.py > -lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info > +lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ > +lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO > +lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt > +lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt > +lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt > lib/python${MODPY_VERSION}/site-packages/serial/ > lib/python${MODPY_VERSION}/site-packages/serial/__init__.py > -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}/ > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE} > lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/serial/${MODPY_PYCACHE}rfc2217.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/serial/${MODP
Re: editors/emacs gtk3 flavor is unusable
Matthieu Herrb writes: > On Tue, Mar 29, 2016 at 07:50:52PM +0200, Jeremie Courreges-Anglas wrote: >> Solène Rapennewrites: >> >> > Hello, >> > >> > I have the package emacs-24.5p2-gtk3 installed and emacs is unusable >> > when started in graphical mode. >> > >> >> I can reproduce it here after installing the gtk3 flavor - I use no_x11. >> Are there emacs-gtk3 users here that can reproduce this issue? >> > > Yes same problem here. Since I upgraded after the last libc bump. So > the list of packages updated is huge, and it hard to find a list of > possible guilty candidates... One more data point: same here after updating from approximately 10 day old current amd64 packages to the latest ones on Saturday. The gtk2 flavor works. Thanks, Daniel
Re: NEW: devel/wxglade
Hi ports@, > Hi Jérémie, > > thanks for looking into this! > >>> attached is a tarball for a new port for wxGlade, a wxwidgets interface >>> designer: >>> >>> wxGlade is a GUI designer written in Python with the popular GUI >>> toolkit wxPython, that helps you create wxWidgets/wxPython user >>> interfaces. At the moment it can generate Python, C++, Perl, Lisp and >>> XRC (wxWidgets' XML resources) code. >> >> Looks fine to me, tested a bit with python code. >> >> Some nits: >> >> - I'd probably import it in x11 instead of devel. >> ("devel/ is too crowded".) > > Makes sense. > >> - the wxglade script should probably use ${SUBST_CMD} + ${MODPY_BIN} >> (absolute path) instead of hardcoding python2.7. Actually this shell >> script contains lots of stuff that don't make sense in a system-wide >> install, looking for code to execute in nearby directories. Upstream, >> it should probably be handled by setuptools entry_points/gui_scripts. >> >> We could strip it down to: >> #!/bin/sh >> exec ${MODPY_BIN} -m wxglade.wxglade "$@" > > You are absolutely right, I changed the script to the short version > above, however python2.7 dumps core on my machine when I run this - it > seems to be related with py-gtk2 in sys.path. I did not have time to > investigate, so for now I changed it to call wxglade.py in site-packages > directly, which is a bit ugly but works. > >> - in DESCR: >> >> It is not (and will never be) a full featured IDE, but simply a >> "designer": the generated code does nothing apart from displaying the >> created widgets. If you are looking for a complete IDE, maybe Boa >> Constructor, PythonCard or Spe (which includes wxGlade itself, BTW...) >> is the right tool. >> >> I understand that this comes from upstream, but those projects look >> pretty dead and aren't included in the ports tree. What about killing >> the last sentence? > > Fully agreed. > >> The tarball attached installs the manpage in the right place, adjusts >> python shebangs and partially enables tests (some need X11). > > I added TEST_IS_INTERACTIVE=X11 so all test run out of the box, is this > a recommended practice? > > Attached is an updated tarball with the above changes on top of the one > you already made, the same is also on openbsd-wip. Now with correct tarball thanks to a heads-up from jca@; sorry for the confusion! I also removed TEST_IS_INTERACTIVE=X11 as advised by jca@. Daniel wxglade.tgz Description: Binary data
Re: NEW: devel/wxglade
Hi Jérémie, thanks for looking into this! >> attached is a tarball for a new port for wxGlade, a wxwidgets interface >> designer: >> >> wxGlade is a GUI designer written in Python with the popular GUI >> toolkit wxPython, that helps you create wxWidgets/wxPython user >> interfaces. At the moment it can generate Python, C++, Perl, Lisp and >> XRC (wxWidgets' XML resources) code. > > Looks fine to me, tested a bit with python code. > > Some nits: > > - I'd probably import it in x11 instead of devel. > ("devel/ is too crowded".) Makes sense. > - the wxglade script should probably use ${SUBST_CMD} + ${MODPY_BIN} > (absolute path) instead of hardcoding python2.7. Actually this shell > script contains lots of stuff that don't make sense in a system-wide > install, looking for code to execute in nearby directories. Upstream, > it should probably be handled by setuptools entry_points/gui_scripts. > > We could strip it down to: > #!/bin/sh > exec ${MODPY_BIN} -m wxglade.wxglade "$@" You are absolutely right, I changed the script to the short version above, however python2.7 dumps core on my machine when I run this - it seems to be related with py-gtk2 in sys.path. I did not have time to investigate, so for now I changed it to call wxglade.py in site-packages directly, which is a bit ugly but works. > - in DESCR: > > It is not (and will never be) a full featured IDE, but simply a > "designer": the generated code does nothing apart from displaying the > created widgets. If you are looking for a complete IDE, maybe Boa > Constructor, PythonCard or Spe (which includes wxGlade itself, BTW...) > is the right tool. > > I understand that this comes from upstream, but those projects look > pretty dead and aren't included in the ports tree. What about killing > the last sentence? Fully agreed. > The tarball attached installs the manpage in the right place, adjusts > python shebangs and partially enables tests (some need X11). I added TEST_IS_INTERACTIVE=X11 so all test run out of the box, is this a recommended practice? Attached is an updated tarball with the above changes on top of the one you already made, the same is also on openbsd-wip. Cheers, Daniel wxglade.tgz Description: Binary data
NEW: devel/wxglade
Hi ports@, attached is a tarball for a new port for wxGlade, a wxwidgets interface designer: wxGlade is a GUI designer written in Python with the popular GUI toolkit wxPython, that helps you create wxWidgets/wxPython user interfaces. At the moment it can generate Python, C++, Perl, Lisp and XRC (wxWidgets' XML resources) code. As you can guess by the name, its model is Glade, the famous GTK+/GNOME GUI builder, with which wxGlade shares the philosophy and the look & feel (but not a line of code). It is not (and will never be) a full featured IDE, but simply a "designer": the generated code does nothing apart from displaying the created widgets. If you are looking for a complete IDE, maybe Boa Constructor, PythonCard or Spe (which includes wxGlade itself, BTW...) is the right tool. Cheers, Daniel wxglade.tar.gz Description: Binary data
Re: [update] mail/mu 0.9.12 -> 0.9.13
FWIW, tested on amd64 without any regressions. Unfortunately I have no i386 system at hand. Cheers, Daniel Aaron Bieber writes: > Hola, > > This is a trivial diff to bring mail/mu to the latest version. Which > includes the OpenBSD fixes[1,2] from Sean Levy <att...@stalphonsos.com>! > > Tested on amd64 so far (i386 is where the issues were) > > [1] https://github.com/djcb/mu/pull/595 > [2] https://github.com/djcb/mu/pull/634 > > Tests on i386 would be appreciated! > > Cheers, > Aaron > > Index: Makefile > === > RCS file: /cvs/ports/mail/mu/Makefile,v > retrieving revision 1.2 > diff -u -p -r1.2 Makefile > --- Makefile 3 Jul 2015 01:36:48 - 1.2 > +++ Makefile 22 Sep 2015 22:10:06 - > @@ -2,7 +2,7 @@ > > COMMENT= maildir indexer and searcher with emacs frontend > > -GH_TAGNAME= v0.9.12 > +GH_TAGNAME= v0.9.13 > GH_ACCOUNT= djcb > GH_PROJECT= mu > DISTNAME=mu-${GH_TAGNAME:S/v//} > Index: distinfo > === > RCS file: /cvs/ports/mail/mu/distinfo,v > retrieving revision 1.2 > diff -u -p -r1.2 distinfo > --- distinfo 3 Jul 2015 01:36:48 - 1.2 > +++ distinfo 22 Sep 2015 22:10:06 - > @@ -1,2 +1,2 @@ > -SHA256 (mu-0.9.12.tar.gz) = uHEST8d3SiWTgV+JKGZxqPMdckO7iYqMpFRoVZnyua8= > -SIZE (mu-0.9.12.tar.gz) = 2196977 > +SHA256 (mu-0.9.13.tar.gz) = ociO/Tv+2pbgbX93qHVixHLm14fzzKmE3fJ1pOodQ3I= > +SIZE (mu-0.9.13.tar.gz) = 2201181 > Index: patches/patch-lib_mu-msg-iter_cc > === > RCS file: patches/patch-lib_mu-msg-iter_cc > diff -N patches/patch-lib_mu-msg-iter_cc > --- patches/patch-lib_mu-msg-iter_cc 3 Jul 2015 01:36:48 - 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 - > @@ -1,14 +0,0 @@ > -$OpenBSD: patch-lib_mu-msg-iter_cc,v 1.1 2015/07/03 01:36:48 abieber Exp $ > lib/mu-msg-iter.cc.orig Wed Jul 1 19:10:13 2015 > -+++ lib/mu-msg-iter.cc Wed Jul 1 19:10:35 2015 > -@@ -366,9 +366,7 @@ mu_msg_iter_get_msgid (MuMsgIter *iter) > - g_return_val_if_fail (!mu_msg_iter_is_done(iter), NULL); > - > - try { > --const char *msgid (iter->msgid().c_str()); -- Daniel Winters <dan...@tydirium.org>
Re: py-twitter 1.7.2 - 1.17.0
Anyone? The version we have in ports is currently broken, this update makes py-twitter useable for upcoming 5.8. I can also take maintainer. Cheers, Daniel trivial update to py-twitter, the version currently in ports is broken because twitter changed their Web API. No python3 flavor since this port installs several scripts in $PREFIX/bin that would create a collision. Works fine for basic usage on amd64. I did not test the IRC connection parts. Index: Makefile === RCS file: /cvs/ports/net/py-twitter/Makefile,v retrieving revision 1.9 diff -u -b -B -w -p -r1.9 Makefile --- Makefile2 Apr 2015 14:21:16 - 1.9 +++ Makefile19 Jul 2015 20:27:26 - @@ -2,10 +2,9 @@ COMMENT= twitter python module -MODPY_EGG_VERSION= 1.7.2 +MODPY_EGG_VERSION= 1.17.0 DISTNAME= twitter-${MODPY_EGG_VERSION} PKGNAME= py-twitter-${MODPY_EGG_VERSION} -REVISION = 0 CATEGORIES=net www Index: distinfo === RCS file: /cvs/ports/net/py-twitter/distinfo,v retrieving revision 1.4 diff -u -b -B -w -p -r1.4 distinfo --- distinfo18 Jan 2015 03:14:51 - 1.4 +++ distinfo19 Jul 2015 20:27:26 - @@ -1,2 +1,2 @@ -SHA256 (twitter-1.7.2.tar.gz) = p/S4EDrJS38Wq5D0e8Gprv3yROGhbs+q0HWFYjiIkbY= -SIZE (twitter-1.7.2.tar.gz) = 20959 +SHA256 (twitter-1.17.0.tar.gz) = hTlsTDO5shPz0tgFyq9rOGueJ3r5EX61Hlp4L3clc3Y= +SIZE (twitter-1.17.0.tar.gz) = 42869 Index: pkg/PLIST === RCS file: /cvs/ports/net/py-twitter/pkg/PLIST,v retrieving revision 1.2 diff -u -b -B -w -p -r1.2 PLIST --- pkg/PLIST 27 Jun 2011 21:13:23 - 1.2 +++ pkg/PLIST 19 Jul 2015 20:27:26 - @@ -1,5 +1,7 @@ @comment $OpenBSD: PLIST,v 1.2 2011/06/27 21:13:23 jasper Exp $ bin/twitter +bin/twitter-archiver +bin/twitter-follow bin/twitter-log bin/twitter-stream-example bin/twitterbot @@ -17,22 +19,32 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/twitter/ansi.pyc lib/python${MODPY_VERSION}/site-packages/twitter/api.py lib/python${MODPY_VERSION}/site-packages/twitter/api.pyc +lib/python${MODPY_VERSION}/site-packages/twitter/archiver.py +lib/python${MODPY_VERSION}/site-packages/twitter/archiver.pyc lib/python${MODPY_VERSION}/site-packages/twitter/auth.py lib/python${MODPY_VERSION}/site-packages/twitter/auth.pyc lib/python${MODPY_VERSION}/site-packages/twitter/cmdline.py lib/python${MODPY_VERSION}/site-packages/twitter/cmdline.pyc +lib/python${MODPY_VERSION}/site-packages/twitter/corrupt.py +lib/python${MODPY_VERSION}/site-packages/twitter/corrupt.pyc +lib/python${MODPY_VERSION}/site-packages/twitter/follow.py +lib/python${MODPY_VERSION}/site-packages/twitter/follow.pyc lib/python${MODPY_VERSION}/site-packages/twitter/ircbot.py lib/python${MODPY_VERSION}/site-packages/twitter/ircbot.pyc lib/python${MODPY_VERSION}/site-packages/twitter/logger.py lib/python${MODPY_VERSION}/site-packages/twitter/logger.pyc lib/python${MODPY_VERSION}/site-packages/twitter/oauth.py lib/python${MODPY_VERSION}/site-packages/twitter/oauth.pyc +lib/python${MODPY_VERSION}/site-packages/twitter/oauth2.py +lib/python${MODPY_VERSION}/site-packages/twitter/oauth2.pyc lib/python${MODPY_VERSION}/site-packages/twitter/oauth_dance.py lib/python${MODPY_VERSION}/site-packages/twitter/oauth_dance.pyc lib/python${MODPY_VERSION}/site-packages/twitter/stream.py lib/python${MODPY_VERSION}/site-packages/twitter/stream.pyc lib/python${MODPY_VERSION}/site-packages/twitter/stream_example.py lib/python${MODPY_VERSION}/site-packages/twitter/stream_example.pyc +lib/python${MODPY_VERSION}/site-packages/twitter/timezones.py +lib/python${MODPY_VERSION}/site-packages/twitter/timezones.pyc lib/python${MODPY_VERSION}/site-packages/twitter/twitter_globals.py lib/python${MODPY_VERSION}/site-packages/twitter/twitter_globals.pyc lib/python${MODPY_VERSION}/site-packages/twitter/util.py
py-twitter 1.7.2 - 1.17.0
Hi, trivial update to py-twitter, the version currently in ports is broken because twitter changed their Web API. No python3 flavor since this port installs several scripts in $PREFIX/bin that would create a collision. Works fine for basic usage on amd64. I did not test the IRC connection parts. Cheers, Daniel Index: Makefile === RCS file: /cvs/ports/net/py-twitter/Makefile,v retrieving revision 1.9 diff -u -b -B -w -p -r1.9 Makefile --- Makefile2 Apr 2015 14:21:16 - 1.9 +++ Makefile19 Jul 2015 20:27:26 - @@ -2,10 +2,9 @@ COMMENT= twitter python module -MODPY_EGG_VERSION= 1.7.2 +MODPY_EGG_VERSION= 1.17.0 DISTNAME= twitter-${MODPY_EGG_VERSION} PKGNAME= py-twitter-${MODPY_EGG_VERSION} -REVISION = 0 CATEGORIES=net www Index: distinfo === RCS file: /cvs/ports/net/py-twitter/distinfo,v retrieving revision 1.4 diff -u -b -B -w -p -r1.4 distinfo --- distinfo18 Jan 2015 03:14:51 - 1.4 +++ distinfo19 Jul 2015 20:27:26 - @@ -1,2 +1,2 @@ -SHA256 (twitter-1.7.2.tar.gz) = p/S4EDrJS38Wq5D0e8Gprv3yROGhbs+q0HWFYjiIkbY= -SIZE (twitter-1.7.2.tar.gz) = 20959 +SHA256 (twitter-1.17.0.tar.gz) = hTlsTDO5shPz0tgFyq9rOGueJ3r5EX61Hlp4L3clc3Y= +SIZE (twitter-1.17.0.tar.gz) = 42869 Index: pkg/PLIST === RCS file: /cvs/ports/net/py-twitter/pkg/PLIST,v retrieving revision 1.2 diff -u -b -B -w -p -r1.2 PLIST --- pkg/PLIST 27 Jun 2011 21:13:23 - 1.2 +++ pkg/PLIST 19 Jul 2015 20:27:26 - @@ -1,5 +1,7 @@ @comment $OpenBSD: PLIST,v 1.2 2011/06/27 21:13:23 jasper Exp $ bin/twitter +bin/twitter-archiver +bin/twitter-follow bin/twitter-log bin/twitter-stream-example bin/twitterbot @@ -17,22 +19,32 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/twitter/ansi.pyc lib/python${MODPY_VERSION}/site-packages/twitter/api.py lib/python${MODPY_VERSION}/site-packages/twitter/api.pyc +lib/python${MODPY_VERSION}/site-packages/twitter/archiver.py +lib/python${MODPY_VERSION}/site-packages/twitter/archiver.pyc lib/python${MODPY_VERSION}/site-packages/twitter/auth.py lib/python${MODPY_VERSION}/site-packages/twitter/auth.pyc lib/python${MODPY_VERSION}/site-packages/twitter/cmdline.py lib/python${MODPY_VERSION}/site-packages/twitter/cmdline.pyc +lib/python${MODPY_VERSION}/site-packages/twitter/corrupt.py +lib/python${MODPY_VERSION}/site-packages/twitter/corrupt.pyc +lib/python${MODPY_VERSION}/site-packages/twitter/follow.py +lib/python${MODPY_VERSION}/site-packages/twitter/follow.pyc lib/python${MODPY_VERSION}/site-packages/twitter/ircbot.py lib/python${MODPY_VERSION}/site-packages/twitter/ircbot.pyc lib/python${MODPY_VERSION}/site-packages/twitter/logger.py lib/python${MODPY_VERSION}/site-packages/twitter/logger.pyc lib/python${MODPY_VERSION}/site-packages/twitter/oauth.py lib/python${MODPY_VERSION}/site-packages/twitter/oauth.pyc +lib/python${MODPY_VERSION}/site-packages/twitter/oauth2.py +lib/python${MODPY_VERSION}/site-packages/twitter/oauth2.pyc lib/python${MODPY_VERSION}/site-packages/twitter/oauth_dance.py lib/python${MODPY_VERSION}/site-packages/twitter/oauth_dance.pyc lib/python${MODPY_VERSION}/site-packages/twitter/stream.py lib/python${MODPY_VERSION}/site-packages/twitter/stream.pyc lib/python${MODPY_VERSION}/site-packages/twitter/stream_example.py lib/python${MODPY_VERSION}/site-packages/twitter/stream_example.pyc +lib/python${MODPY_VERSION}/site-packages/twitter/timezones.py +lib/python${MODPY_VERSION}/site-packages/twitter/timezones.pyc lib/python${MODPY_VERSION}/site-packages/twitter/twitter_globals.py lib/python${MODPY_VERSION}/site-packages/twitter/twitter_globals.pyc lib/python${MODPY_VERSION}/site-packages/twitter/util.py
Re: UPDATE: devel/py-serial 2.4 = 2.7 (+ python3 support)
Hi, Thanks for the pointers. Yes that's better diff - it's working fine with my arduino on amd64 - will test on i386 with a different serial device. Also tested on i386. Fred and Jérémie, thanks for working on this! Here is a slightly tweaked diff with the following changes: - fix $DOCSDIR and $EXAMPLESDIR to not get a directory named py--serial - do not install miniterm.py in $PREFIX/bin, I do not think it is that useful - install a bit more documentation - update my contact details Tested on amd64 with both py2 and py3 without issues. Cheers, Daniel Index: Makefile === RCS file: /cvs/ports/devel/py-serial/Makefile,v retrieving revision 1.7 diff -u -b -B -w -p -r1.7 Makefile --- Makefile11 Mar 2013 10:50:26 - 1.7 +++ Makefile19 Jul 2015 19:42:24 - @@ -2,31 +2,32 @@ COMMENT = serial interface class for Python -MODPY_EGG_VERSION =2.4 +MODPY_EGG_VERSION =2.7 DISTNAME = pyserial-${MODPY_EGG_VERSION} PKGNAME = ${DISTNAME:S/py/py-/} -REVISION = 4 CATEGORIES = devel -HOMEPAGE = http://pyserial.wiki.sourceforge.net/pySerial +HOMEPAGE = http://pyserial.sourceforge.net/ -MAINTAINER = Daniel Gruber dan...@tydirium.org +MAINTAINER = Daniel Winters dan...@tydirium.org # Python license PERMIT_PACKAGE_CDROM = Yes -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=pyserial/} - MODULES = lang/python -MODPY_SETUPTOOLS = Yes +MODPY_PI = Yes + +FLAVORS = python3 +FLAVOR ?= -DOCSDIR = ${PREFIX}/share/doc/py-serial -EXAMPLESDIR = ${PREFIX}/share/examples/py-serial +DOCSDIR = ${PREFIX}/share/doc/${MODPY_PY_PREFIX}serial +EXAMPLESDIR = ${PREFIX}/share/examples/${MODPY_PY_PREFIX}serial post-install: ${INSTALL_DATA_DIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.txt ${WRKSRC}/LICENSE.txt ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/documentation/*.rst ${DOCSDIR} ${INSTALL_DATA_DIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR} Index: distinfo === RCS file: /cvs/ports/devel/py-serial/distinfo,v retrieving revision 1.2 diff -u -b -B -w -p -r1.2 distinfo --- distinfo18 Jan 2015 03:13:43 - 1.2 +++ distinfo19 Jul 2015 19:42:24 - @@ -1,2 +1,2 @@ -SHA256 (pyserial-2.4.tar.gz) = a2qePS/Vl4ySyEPgEJkYpLysSB7srjFiVEgcDg9+c8g= -SIZE (pyserial-2.4.tar.gz) = 44723 +SHA256 (pyserial-2.7.tar.gz) = NULsCDh5PmHWIk4n/wXozkulpcXMTsXGo+jUkkeYVHc= +SIZE (pyserial-2.7.tar.gz) = 122081 Index: patches/patch-serialposix_py === RCS file: /cvs/ports/devel/py-serial/patches/patch-serialposix_py,v retrieving revision 1.2 diff -u -b -B -w -p -r1.2 patch-serialposix_py --- patches/patch-serialposix_py20 Jul 2011 15:50:13 - 1.2 +++ patches/patch-serialposix_py19 Jul 2015 19:42:24 - @@ -1,19 +0,0 @@ -$OpenBSD: patch-serialposix_py,v 1.2 2011/07/20 15:50:13 sthen Exp $ serial/serialposix.py.orig Sat Jun 21 23:08:43 2008 -+++ serial/serialposix.py Wed Jul 20 16:48:47 2011 -@@ -35,13 +35,12 @@ elif plat == 'cygwin': #cywin/win32 (confirmed) - def device(port): - return '/dev/com%d' % (port + 1) - --elif plat == 'openbsd3': #BSD (confirmed) -+elif plat[:7] == 'openbsd': - def device(port): --return '/dev/ttyp%d' % port -+return '/dev/cua%02d' % port - - elif plat[:3] == 'bsd' or \ - plat[:7] == 'freebsd' or \ -- plat[:7] == 'openbsd' or \ - plat[:6] == 'darwin': #BSD (confirmed for freebsd4: cuaa%d) - def device(port): - return '/dev/cuad%d' % port Index: pkg/PLIST === RCS file: /cvs/ports/devel/py-serial/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -b -B -w -p -r1.1.1.1 PLIST --- pkg/PLIST 5 Jun 2009 04:29:22 - 1.1.1.1 +++ pkg/PLIST 19 Jul 2015 19:42:24 - @@ -1,37 +1,74 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2009/06/05 04:29:22 wcmaier Exp $ -lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ -lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO -lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt -lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt -lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt +bin/miniterm.py +lib/python${MODPY_VERSION}/site-packages/pyserial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info lib/python${MODPY_VERSION}/site-packages/serial