Date: Wed, 3 Jan 2007 21:59:23 GMT From: "R.Mahmatkhanov"<R.Mahmatkhanov@REMOVE_THIS.SKYLINK.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/107497: [PATCH] net/straw update, unbreak, want take mainteinership Message-ID: <200701032159.l03LxNpW061525@www.freebsd.org> Resent-Message-ID: <200701032200.l03M0Wjp026052@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 107497
>Category: ports
>Synopsis: [PATCH] net/straw update, unbreak, want take mainteinership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 03 22:00:32 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: R.Mahmatkhanov
>Release: 6.2
>Organization:
SkyLink
>Environment:
FreeBSD 6.2-PRERELEASE i386
>Description:
net/straw was broken and not updating a long time. This patch fix build and update this port to actual state. Can i take mainteinership of this port?
>How-To-Repeat:
Try to install the port
>Fix:
Patch attached with submission follows:
diff -urN /usr/ports/net/straw/Makefile net_straw/Makefile
--- /usr/ports/net/straw/Makefile Sat Oct 14 08:54:26 2006
+++ net_straw/Makefile Thu Jan 4 00:53:04 2007
@@ -6,21 +6,21 @@
#
PORTNAME= straw
-PORTVERSION= 0.25.1
-PORTREVISION= 6
+PORTVERSION= 0.26
CATEGORIES= net gnome
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/straw/0.26
+DISTNAME= straw-0.26
MAINTAINER= ports@FreeBSD.org
COMMENT= A GNOME 2 desktop weblog aggregator written in Python
-
-BROKEN= Does not work with the newer GTK/GNOME python bindings
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb
USE_GMAKE= yes
USE_XLIB= yes
USE_GNOME= gnomehier libglade2 pygnome2 pygnomeextras
-USE_PYTHON= yes
+USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes
PYDISTUTILS_INSTALLARGS= -c -O1 --prefix=${PREFIX} \
--install-lib=${PREFIX}/share/gnome \
@@ -29,15 +29,6 @@
GCONF_SCHEMAS= straw.schemas
.include <bsd.port.pre.mk>
-
-# pybsddb ships with python 2.3
-.if ${PYTHON_REL} < 230
-BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb3
-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb3
-.else
-BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb
-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb
-.endif
post-patch:
@${REINPLACE_CMD} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g' \
diff -urN /usr/ports/net/straw/distinfo net_straw/distinfo
--- /usr/ports/net/straw/distinfo Fri Nov 25 16:48:26 2005
+++ net_straw/distinfo Wed Jan 3 15:31:55 2007
@@ -1,3 +1,3 @@
-MD5 (straw-0.25.1.tar.gz) = 058a58e945e37cc264c562f5ca4ff781
-SHA256 (straw-0.25.1.tar.gz) = b4274ced139388c577d88c2b3175915bee203e14bca99b065a7f3b1bebae5998
-SIZE (straw-0.25.1.tar.gz) = 238215
+MD5 (straw-0.26.tar.gz) = 934d2ba4b0219120218ce83a36976f47
+SHA256 (straw-0.26.tar.gz) = 7dd1ae7108629874c3fb198747f788440ee3f3699b16f07f70860b11f6439a18
+SIZE (straw-0.26.tar.gz) = 318208
diff -urN /usr/ports/net/straw/files/patch-constants.py.in net_straw/files/patch-constants.py.in
--- /usr/ports/net/straw/files/patch-constants.py.in Thu Jan 1 00:00:00 1970
+++ net_straw/files/patch-constants.py.in Wed Jan 3 23:43:18 2007
@@ -0,0 +1,11 @@
+--- /usr/ports/net/straw/work/straw-0.26/constants.py.in Sat Feb 4 14:24:37 2006
++++ constants.py.in Wed Jan 3 23:42:34 2007
+@@ -11,7 +11,7 @@
+ STRAW_REF_URL = "%sstraw-ref.html" % STRAW_URL
+ libdir = os.path.normpath('$libdir')
+ localedir = os.path.normpath(os.path.join('$datadir','locale'))
+-datadir = os.path.normpath(os.path.join('$datadir','straw'))
++datadir = os.path.normpath(os.path.join('$datadir','gnome','straw'))
+
+ # if STRAW_IN_SOURCE_DIR, this will be the glade/ and images/ in source
+ # which is different from datadir (data/), whereas on default installations,
diff -urN /usr/ports/net/straw/files/patch-setup.cfg net_straw/files/patch-setup.cfg
--- /usr/ports/net/straw/files/patch-setup.cfg Thu Jan 1 00:00:00 1970
+++ net_straw/files/patch-setup.cfg Wed Jan 3 23:34:39 2007
@@ -0,0 +1,8 @@
+--- /usr/ports/net/straw/work/straw-0.26/setup.cfg Thu Jan 26 15:11:29 2006
++++ setup.cfg Wed Jan 3 23:25:15 2007
+@@ -9,4 +9,4 @@
+ force-manifest = 1
+ [install]
+ prefix=/usr/local
+-sysconfdir=/etc
++sysconfdir=/usr/local/etc
diff -urN /usr/ports/net/straw/files/patch-setup.py net_straw/files/patch-setup.py
--- /usr/ports/net/straw/files/patch-setup.py Mon Dec 20 04:35:39 2004
+++ net_straw/files/patch-setup.py Wed Jan 3 23:39:14 2007
@@ -1,30 +1,20 @@
---- setup.py.orig Thu Jul 15 15:15:58 2004
-+++ setup.py Sun Dec 19 23:29:18 2004
-@@ -108,8 +108,8 @@
- '''Build list of data files to be installed'''
- images = glob.glob('images/*.png')
+--- /usr/ports/net/straw/work/straw-0.26/setup.py Sat Feb 18 16:22:43 2006
++++ setup.py Wed Jan 3 23:38:53 2007
+@@ -127,7 +127,7 @@
+ ]
files = [
-- ('share/pixmaps', ['images/straw.png']),
-- ('share/straw', images + ['data/default_subscriptions.opml', 'data/straw.css', 'glade/straw.glade'])]
-+ ('share/gnome/pixmaps', ['images/straw.png']),
-+ ('share/gnome/straw', images + ['data/default_subscriptions.opml', 'data/straw.css', 'glade/straw.glade'])]
+ ('share/pixmaps', ['images/straw.png']),
+- ('share/straw', images + misc)]
++ ('share/gnome/straw', images + misc)]
return files
- long_desc = '''\
-@@ -134,13 +134,12 @@
- data_files = data_files(),
+ # Let distutils do the work
+@@ -146,7 +146,7 @@
pot_file = 'po/straw.pot',
translations = translations(),
-- #config_files = [('gconf/schemas',['data/straw.schemas'],
-- # 'with-gconf-schema-file-dir')],
-+ config_files = [('gconf/schemas',['data/straw.schemas'],
-+ 'with-gconf-schema-file-dir')],
- scripts = ['src/straw'],
-- modules_check = modules_check,
- packages = ['straw'],
- package_dir = {'straw' : 'src/lib'},
+ modules_check = modules_check,
- msg_sources = translation_files(),
+ msg_sources = ['glade/strings.c'] + glob.glob('src/lib/*.py'),
desktop_file = ['straw.desktop.in'],
- ext_modules = [TemplateExtension(name='trayicon',
- pkc_name='pygtk-2.0 gtk+-2.0',
+ constants = [('constants.py.in', strawenv)],
+ scripts = ['src/straw'],
diff -urN /usr/ports/net/straw/files/patch-src::lib::Config.py net_straw/files/patch-src::lib::Config.py
--- /usr/ports/net/straw/files/patch-src::lib::Config.py Tue Aug 24 07:34:13 2004
+++ net_straw/files/patch-src::lib::Config.py Thu Jan 1 00:00:00 1970
@@ -1,11 +0,0 @@
---- src/lib/Config.py.orig Tue Aug 24 02:19:12 2004
-+++ src/lib/Config.py Tue Aug 24 02:20:06 2004
-@@ -369,6 +369,8 @@
- last_poll = property(get_last_poll, set_last_poll, doc="Last polled")
-
- def get_number_of_items_stored(self):
-+ if self._items_stored == 0:
-+ return 30
- return self._items_stored
-
- def set_number_of_items_stored(self, num=30):
diff -urN /usr/ports/net/straw/files/patch-src::lib::utils.py net_straw/files/patch-src::lib::utils.py
--- /usr/ports/net/straw/files/patch-src::lib::utils.py Tue Aug 24 07:34:13 2004
+++ net_straw/files/patch-src::lib::utils.py Wed Jan 3 23:41:15 2007
@@ -1,11 +1,11 @@
---- src/lib/utils.py.orig Thu Jul 15 15:15:58 2004
-+++ src/lib/utils.py Mon Aug 16 22:26:08 2004
-@@ -162,7 +162,7 @@
- return os.environ["STRAW_DATA"]
- h, t = os.path.split(os.path.split(os.path.abspath(sys.argv[0]))[0])
- if t == 'bin':
-- fp = os.path.join(h, 'share', 'straw')
-+ fp = os.path.join(h, 'share', 'gnome', 'straw')
- if os.path.isdir(fp):
- return fp
- fp = os.path.join(h, 'lib', 'straw')
+--- /usr/ports/net/straw/work/straw-0.26/src/lib/utils.py Sun Jan 22 17:06:51 2006
++++ utils.py Wed Jan 3 23:40:36 2007
+@@ -170,7 +170,7 @@
+ import Config
+ def url_show(url):
+ config = Config.get_instance()
+- if config.browser_cmd:
++ if config.browser_cmd <> '""':
+ cmdbin, args = string.splitfields(str(config.browser_cmd), maxsplit=1)
+ link = args % url
+ pid = subprocess.Popen([cmdbin, link]).pid
diff -urN /usr/ports/net/straw/files/patch-src::straw net_straw/files/patch-src::straw
--- /usr/ports/net/straw/files/patch-src::straw Wed Feb 18 20:25:10 2004
+++ net_straw/files/patch-src::straw Wed Jan 3 23:45:35 2007
@@ -1,18 +1,11 @@
---- src/straw.orig Tue Feb 17 13:37:00 2004
-+++ src/straw Tue Feb 17 13:37:50 2004
-@@ -20,13 +20,14 @@
- return sd
- h, t = os.path.split(os.path.split(os.path.abspath(sys.argv[0]))[0])
- if t == 'bin':
-- libdir = os.path.join(h, 'lib')
-+ libdir = os.path.join(h, 'share', 'gnome')
- fp = os.path.join(libdir, 'straw')
- if os.path.isdir(fp):
- return libdir
- raise "FileNotFoundError", "couldn't find straw library dir"
-
- sys.path.insert(0, find_straw_lib())
-+sys.path.insert(0, '%%PYTHON_SITELIBDIR%%')
-
- import straw
-
+--- /usr/ports/net/straw/work/straw-0.26/src/straw Thu Jan 26 15:11:29 2006
++++ straw Wed Jan 3 23:44:51 2007
+@@ -49,7 +49,7 @@
+ if not sdir:
+ h, t = os.path.split(os.path.split(os.path.abspath(sys.argv[0]))[0])
+ if t == 'bin':
+- libdir = os.path.join(h, 'lib')
++ libdir = os.path.join(h, 'share', 'gnome')
+ fp = os.path.join(libdir, 'straw')
+ if os.path.isdir(fp):
+ sdir = libdir
diff -urN /usr/ports/net/straw/pkg-descr net_straw/pkg-descr
--- /usr/ports/net/straw/pkg-descr Fri Nov 14 19:25:01 2003
+++ net_straw/pkg-descr Thu Jan 4 00:27:41 2007
@@ -1,5 +1,3 @@
-Straw is a desktop news aggregator for the GNOME environment. Its aim is to be a
-faster, easier and more accessible way to read news and blogs than the
-traditional browser.
+A feed aggregator for open source desktops
-WWW: http://www.nongnu.org/straw/
+WWW: http://www.gnome.org/projects/straw/
diff -urN /usr/ports/net/straw/pkg-plist net_straw/pkg-plist
--- /usr/ports/net/straw/pkg-plist Sat Oct 14 08:54:26 2006
+++ net_straw/pkg-plist Wed Jan 3 20:47:33 2007
@@ -1,12 +1,15 @@
bin/straw
share/gnome/applications/straw.desktop
share/gnome/pixmaps/straw.png
+share/gnome/straw/Application.py
+share/gnome/straw/Application.pyc
+share/gnome/straw/Application.pyo
+share/gnome/straw/CategorySelector.py
+share/gnome/straw/CategorySelector.pyc
+share/gnome/straw/CategorySelector.pyo
share/gnome/straw/Config.py
share/gnome/straw/Config.pyc
share/gnome/straw/Config.pyo
-share/gnome/straw/DashboardFrontend.py
-share/gnome/straw/DashboardFrontend.pyc
-share/gnome/straw/DashboardFrontend.pyo
share/gnome/straw/Event.py
share/gnome/straw/Event.pyc
share/gnome/straw/Event.pyo
@@ -25,30 +28,33 @@
share/gnome/straw/FeedList.py
share/gnome/straw/FeedList.pyc
share/gnome/straw/FeedList.pyo
+share/gnome/straw/FeedListView.py
+share/gnome/straw/FeedListView.pyc
+share/gnome/straw/FeedListView.pyo
share/gnome/straw/FeedPropertiesDialog.py
share/gnome/straw/FeedPropertiesDialog.pyc
share/gnome/straw/FeedPropertiesDialog.pyo
-share/gnome/straw/FindDialog.py
-share/gnome/straw/FindDialog.pyc
-share/gnome/straw/FindDialog.pyo
+share/gnome/straw/Find.py
+share/gnome/straw/Find.pyc
+share/gnome/straw/Find.pyo
share/gnome/straw/ImageCache.py
share/gnome/straw/ImageCache.pyc
share/gnome/straw/ImageCache.pyo
+share/gnome/straw/ItemList.py
+share/gnome/straw/ItemList.pyc
+share/gnome/straw/ItemList.pyo
share/gnome/straw/ItemStore.py
share/gnome/straw/ItemStore.pyc
share/gnome/straw/ItemStore.pyo
+share/gnome/straw/ItemView.py
+share/gnome/straw/ItemView.pyc
+share/gnome/straw/ItemView.pyo
share/gnome/straw/LookupManager.py
share/gnome/straw/LookupManager.pyc
share/gnome/straw/LookupManager.pyo
share/gnome/straw/MVP.py
share/gnome/straw/MVP.pyc
share/gnome/straw/MVP.pyo
-share/gnome/straw/Main.py
-share/gnome/straw/Main.pyc
-share/gnome/straw/Main.pyo
-share/gnome/straw/MainWindow.py
-share/gnome/straw/MainWindow.pyc
-share/gnome/straw/MainWindow.pyo
share/gnome/straw/MainloopManager.py
share/gnome/straw/MainloopManager.pyc
share/gnome/straw/MainloopManager.pyo
@@ -67,6 +73,9 @@
share/gnome/straw/OPMLImport.py
share/gnome/straw/OPMLImport.pyc
share/gnome/straw/OPMLImport.pyo
+share/gnome/straw/OfflineToggle.py
+share/gnome/straw/OfflineToggle.pyc
+share/gnome/straw/OfflineToggle.pyo
share/gnome/straw/ParsedSummary.py
share/gnome/straw/ParsedSummary.pyc
share/gnome/straw/ParsedSummary.pyo
@@ -79,9 +88,6 @@
share/gnome/straw/QueueDict.py
share/gnome/straw/QueueDict.pyc
share/gnome/straw/QueueDict.pyo
-share/gnome/straw/SubscribeDialog.py
-share/gnome/straw/SubscribeDialog.pyc
-share/gnome/straw/SubscribeDialog.pyo
share/gnome/straw/SummaryItem.py
share/gnome/straw/SummaryItem.pyc
share/gnome/straw/SummaryItem.pyo
@@ -100,10 +106,13 @@
share/gnome/straw/__init__.py
share/gnome/straw/__init__.pyc
share/gnome/straw/__init__.pyo
-share/gnome/straw/dashboard.py
-share/gnome/straw/dashboard.pyc
-share/gnome/straw/dashboard.pyo
+share/gnome/straw/constants.py
+share/gnome/straw/constants.pyc
+share/gnome/straw/constants.pyo
share/gnome/straw/default_subscriptions.opml
+share/gnome/straw/dialogs.py
+share/gnome/straw/dialogs.pyc
+share/gnome/straw/dialogs.pyo
share/gnome/straw/error.py
share/gnome/straw/error.pyc
share/gnome/straw/error.pyo
@@ -113,12 +122,6 @@
share/gnome/straw/feedparser.py
share/gnome/straw/feedparser.pyc
share/gnome/straw/feedparser.pyo
-share/gnome/straw/file_selector.py
-share/gnome/straw/file_selector.pyc
-share/gnome/straw/file_selector.pyo
-share/gnome/straw/hig_alert.py
-share/gnome/straw/hig_alert.pyc
-share/gnome/straw/hig_alert.pyo
share/gnome/straw/httplib_async.py
share/gnome/straw/httplib_async.pyc
share/gnome/straw/httplib_async.pyo
@@ -126,36 +129,47 @@
share/gnome/straw/image-waiting.png
share/gnome/straw/offline.png
share/gnome/straw/online.png
-share/gnome/straw/pytrayicon.so
share/gnome/straw/straw.css
share/gnome/straw/straw.glade
share/gnome/straw/straw.png
+share/gnome/straw/strawdbus.py
+share/gnome/straw/strawdbus.pyc
+share/gnome/straw/strawdbus.pyo
+share/gnome/straw/strawtypes.py
+share/gnome/straw/strawtypes.pyc
+share/gnome/straw/strawtypes.pyo
+share/gnome/straw/subscribe.py
+share/gnome/straw/subscribe.pyc
+share/gnome/straw/subscribe.pyo
share/gnome/straw/utils.py
share/gnome/straw/utils.pyc
share/gnome/straw/utils.pyo
+share/locale/bg/LC_MESSAGES/straw.mo
share/locale/cs/LC_MESSAGES/straw.mo
share/locale/de/LC_MESSAGES/straw.mo
share/locale/en_CA/LC_MESSAGES/straw.mo
share/locale/en_GB/LC_MESSAGES/straw.mo
share/locale/es/LC_MESSAGES/straw.mo
+share/locale/eu/LC_MESSAGES/straw.mo
share/locale/fi/LC_MESSAGES/straw.mo
share/locale/fr/LC_MESSAGES/straw.mo
+share/locale/it/LC_MESSAGES/straw.mo
+share/locale/ja/LC_MESSAGES/straw.mo
+share/locale/lt/LC_MESSAGES/straw.mo
+share/locale/ne/LC_MESSAGES/straw.mo
share/locale/nl/LC_MESSAGES/straw.mo
share/locale/no/LC_MESSAGES/straw.mo
+share/locale/pa/LC_MESSAGES/straw.mo
share/locale/pt/LC_MESSAGES/straw.mo
share/locale/pt_BR/LC_MESSAGES/straw.mo
share/locale/ru/LC_MESSAGES/straw.mo
+share/locale/rw/LC_MESSAGES/straw.mo
share/locale/sr/LC_MESSAGES/straw.mo
share/locale/sr@Latn/LC_MESSAGES/straw.mo
share/locale/sv/LC_MESSAGES/straw.mo
+share/locale/uk/LC_MESSAGES/straw.mo
+share/locale/vi/LC_MESSAGES/straw.mo
+share/locale/zh_CN/LC_MESSAGES/straw.mo
+share/nls/POSIX
+share/nls/en_US.US-ASCII
@dirrm share/gnome/straw
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200701032159.l03LxNpW061525>