ports/70807: [Update] net/straw: Update straw to 0.25.1

Sun Aug 22 00:10:08 UTC 2004

>Number:         70807
>Category:       ports
>Synopsis:       [Update] net/straw: Update straw to 0.25.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 22 00:10:07 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Tom McLaughlin
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:


System: FreeBSD 5.2-CURRENT #0: Wed Aug  4 09:08:18 EDT 2004
    root@:/usr/obj/usr/src/sys/COMPASS



>Description:


Attached patch updated straw to 0.25.1, the latest stable version.


>How-To-Repeat:





>Fix:

--- straw-0.25.1.diff begins here ---
? straw/files/patch-src::lib::utils.py
Index: straw/Makefile
===================================================================
RCS file: /ncvs/ports/net/straw/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- straw/Makefile	11 Jul 2004 03:32:27 -0000	1.10
+++ straw/Makefile	21 Aug 2004 23:56:48 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	straw
-PORTVERSION=	0.23
+PORTVERSION=	0.25.1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +14,6 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A GNOME 2 desktop weblog aggregator written in Python
 
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
Index: straw/distinfo
===================================================================
RCS file: /ncvs/ports/net/straw/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- straw/distinfo	27 May 2004 21:18:58 -0000	1.5
+++ straw/distinfo	21 Aug 2004 23:56:48 -0000
@@ -1,2 +1,2 @@
-MD5 (straw-0.23.tar.bz2) = 8dbdb3bbb7a20554a069bca11712d8c3
-SIZE (straw-0.23.tar.bz2) = 158777
+MD5 (straw-0.25.1.tar.gz) = 058a58e945e37cc264c562f5ca4ff781
+SIZE (straw-0.25.1.tar.gz) = 238215
Index: straw/pkg-plist
===================================================================
RCS file: /ncvs/ports/net/straw/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- straw/pkg-plist	25 Jun 2004 19:52:33 -0000	1.6
+++ straw/pkg-plist	21 Aug 2004 23:56:48 -0000
@@ -1,7 +1,4 @@
 bin/straw
- at unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/straw.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/straw.schemas
- at exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/straw.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/straw.desktop
 share/gnome/pixmaps/straw.png
 share/gnome/straw/Config.py
@@ -43,12 +40,18 @@
 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
 share/gnome/straw/MessageManager.py
 share/gnome/straw/MessageManager.pyc
 share/gnome/straw/MessageManager.pyo
@@ -76,9 +79,6 @@
 share/gnome/straw/QueueDict.py
 share/gnome/straw/QueueDict.pyc
 share/gnome/straw/QueueDict.pyo
-share/gnome/straw/StrawURLOpener.py
-share/gnome/straw/StrawURLOpener.pyc
-share/gnome/straw/StrawURLOpener.pyo
 share/gnome/straw/SubscribeDialog.py
 share/gnome/straw/SubscribeDialog.pyc
 share/gnome/straw/SubscribeDialog.pyo
@@ -88,9 +88,15 @@
 share/gnome/straw/SummaryParser.py
 share/gnome/straw/SummaryParser.pyc
 share/gnome/straw/SummaryParser.pyo
+share/gnome/straw/Tray.py
+share/gnome/straw/Tray.pyc
+share/gnome/straw/Tray.pyo
 share/gnome/straw/URLFetch.py
 share/gnome/straw/URLFetch.pyc
 share/gnome/straw/URLFetch.pyo
+share/gnome/straw/ValueMonitor.py
+share/gnome/straw/ValueMonitor.pyc
+share/gnome/straw/ValueMonitor.pyo
 share/gnome/straw/__init__.py
 share/gnome/straw/__init__.pyc
 share/gnome/straw/__init__.pyo
@@ -101,6 +107,9 @@
 share/gnome/straw/error.py
 share/gnome/straw/error.pyc
 share/gnome/straw/error.pyo
+share/gnome/straw/feedfinder.py
+share/gnome/straw/feedfinder.pyc
+share/gnome/straw/feedfinder.pyo
 share/gnome/straw/feedparser.py
 share/gnome/straw/feedparser.pyc
 share/gnome/straw/feedparser.pyo
@@ -117,9 +126,8 @@
 share/gnome/straw/image-waiting.png
 share/gnome/straw/offline.png
 share/gnome/straw/online.png
-share/gnome/straw/rssfinder.py
-share/gnome/straw/rssfinder.pyc
-share/gnome/straw/rssfinder.pyo
+share/gnome/straw/pytrayicon.so
+share/gnome/straw/straw.css
 share/gnome/straw/straw.glade
 share/gnome/straw/straw.png
 share/gnome/straw/utils.py
@@ -127,12 +135,14 @@
 share/gnome/straw/utils.pyo
 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/fi/LC_MESSAGES/straw.mo
 share/locale/fr/LC_MESSAGES/straw.mo
 share/locale/nl/LC_MESSAGES/straw.mo
 share/locale/no/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/sr/LC_MESSAGES/straw.mo
Index: straw/files/patch-setup.py
===================================================================
RCS file: /ncvs/ports/net/straw/files/patch-setup.py,v
retrieving revision 1.3
diff -u -r1.3 patch-setup.py
--- straw/files/patch-setup.py	27 May 2004 21:18:59 -0000	1.3
+++ straw/files/patch-setup.py	21 Aug 2004 23:56:48 -0000
@@ -1,24 +1,25 @@
---- setup.py.orig	Mon Apr 26 12:17:31 2004
-+++ setup.py	Thu May 20 13:41:56 2004
-@@ -97,8 +97,8 @@
+--- setup.py.orig	Thu Jul 15 15:15:58 2004
++++ setup.py	Mon Aug 16 22:15:09 2004
+@@ -108,8 +108,8 @@
      '''Build list of data files to be installed'''
      images = glob.glob('images/*.png')
      files = [
 -        ('share/pixmaps', ['images/straw.png']),
--        ('share/straw', images + ['data/default_subscriptions.opml', 'glade/straw.glade'])]
+-        ('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', 'glade/straw.glade'])]
++        ('share/gnome/straw', images + ['data/default_subscriptions.opml', 'data/straw.css', 'glade/straw.glade'])]
      return files
  
  long_desc = '''\
-@@ -121,9 +121,8 @@
-       config_files     = [('gconf/schemas',['data/straw.schemas'],
-                            'with-gconf-schema-file-dir')],
+@@ -137,10 +137,9 @@
+       #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'},
 -      msg_sources      = translation_files(),
 +      msg_sources      = ['glade/strings.c'] + glob.glob('src/lib/*.py'),
-       desktop_file     = ['straw.desktop.in'])
- 
+       desktop_file     = ['straw.desktop.in'],
+       ext_modules      = [TemplateExtension(name='trayicon',
+                                             pkc_name='pygtk-2.0 gtk+-2.0',
Index: straw/files/patch-src::lib::LookupManager.py
===================================================================
RCS file: /ncvs/ports/net/straw/files/patch-src::lib::LookupManager.py,v
retrieving revision 1.1
diff -u -r1.1 patch-src::lib::LookupManager.py
--- straw/files/patch-src::lib::LookupManager.py	14 Nov 2003 19:25:02 -0000	1.1
+++ straw/files/patch-src::lib::LookupManager.py	21 Aug 2004 23:56:48 -0000
@@ -1,14 +1,14 @@
---- src/lib/LookupManager.py.orig	Thu Nov 13 23:37:03 2003
-+++ src/lib/LookupManager.py	Thu Nov 13 23:38:28 2003
-@@ -6,9 +6,9 @@
- from error import log
+--- src/lib/LookupManager.py.orig	Thu Jul 15 15:15:58 2004
++++ src/lib/LookupManager.py	Mon Aug 16 22:20:25 2004
+@@ -5,9 +5,9 @@
+ import Config
  try:
      import adns, ADNS
 -    _have_adns = True
 +    _have_adns = False
  except ImportError:
--    log("No ADNS library found, using synchronous name lookups.")
-+    #log("No ADNS library found, using synchronous name lookups.")
+-    error.log("No ADNS library found, using synchronous name lookups.")
++#    error.log("No ADNS library found, using synchronous name lookups.")
      _have_adns = False
  
  MAX_TIMES = 3
Index: straw/files/patch-src::lib::Main.py
===================================================================
RCS file: straw/files/patch-src::lib::Main.py
diff -N straw/files/patch-src::lib::Main.py
--- straw/files/patch-src::lib::Main.py	27 May 2004 21:18:59 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
---- src/lib/Main.py.orig	Mon Apr 26 12:17:31 2004
-+++ src/lib/Main.py	Sun May  2 15:30:14 2004
-@@ -417,7 +417,7 @@
-         gtk.main()
- 
-     def quit(self):
--        gtk.mainquit()
-+        gtk.main_quit()
-         self._itemstore.stop()
-         return
- 
-@@ -480,7 +480,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')
--- straw-0.25.1.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:

