5 files changed, 32 insertions, 15 deletions

diff --git a/net/straw/Makefile b/net/straw/Makefile
index 877957d812f5..7f77c7efee8a 100644
--- a/net/straw/Makefile
+++ b/net/straw/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	straw
-PORTVERSION=	0.26
-PORTREVISION=	1
+PORTVERSION=	0.27
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=sources/${PORTNAME}/${PORTVERSION}
@@ -20,6 +19,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb \
 		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
 
 USE_GMAKE=	yes
+USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_GNOME=	gnomehier libglade2 pygnome2 pygnomeextras
 USE_PYTHON=	2.4+
diff --git a/net/straw/distinfo b/net/straw/distinfo
index 7d101e9faa2d..4f57a657d431 100644
--- a/net/straw/distinfo
+++ b/net/straw/distinfo
@@ -1,3 +1,3 @@
-MD5 (straw-0.26.tar.gz) = 934d2ba4b0219120218ce83a36976f47
-SHA256 (straw-0.26.tar.gz) = 7dd1ae7108629874c3fb198747f788440ee3f3699b16f07f70860b11f6439a18
-SIZE (straw-0.26.tar.gz) = 318208
+MD5 (straw-0.27.tar.bz2) = d21249c82b14570fe2c61e114d1d2ea7
+SHA256 (straw-0.27.tar.bz2) = ed773c67dd3a367f08e7a2833b9517e2499d15c3977e6f1fd2131edf0eec7340
+SIZE (straw-0.27.tar.bz2) = 246922
diff --git a/net/straw/files/patch-src-lib_LookupManager.py b/net/straw/files/patch-src-lib_LookupManager.py
new file mode 100644
index 000000000000..ac5a8689ba72
--- /dev/null
+++ b/net/straw/files/patch-src-lib_LookupManager.py
@@ -0,0 +1,11 @@
+--- src/lib/LookupManager.py	Sat Feb 18 16:11:38 2006
++++ src/lib/LookupManager.py	Sun May 20 09:51:00 2007
+@@ -26,7 +26,7 @@
+ import Config
+ try:
+     import adns, ADNS
+-    _have_adns = True
++    _have_adns = False
+ except ImportError:
+     error.log("No ADNS library found, using synchronous name lookups.")
+     _have_adns = False
diff --git a/net/straw/files/patch-src::straw b/net/straw/files/patch-src::straw
index a23d571d8500..cb965b2ce848 100644
--- a/net/straw/files/patch-src::straw
+++ b/net/straw/files/patch-src::straw
@@ -1,5 +1,5 @@
---- src/straw	Thu Jan 26 15:11:29 2006
-+++ src/straw	Wed Jan  3 23:44:51 2007
+--- src/straw	Sat Oct 21 07:53:23 2006
++++ src/straw	Sun May 20 09:49:06 2007
 @@ -49,7 +49,7 @@
      if not sdir:
          h, t = os.path.split(os.path.split(os.path.abspath(sys.argv[0]))[0])
@@ -8,4 +8,13 @@
 +            libdir = os.path.join(h, 'share', 'gnome')
              fp = os.path.join(libdir, 'straw')
              if os.path.isdir(fp):
-                 sdir = libdir
+                 sdir = fp
+@@ -102,7 +102,7 @@
+     if ENV_IN_SOURCE:
+         from lib import Application, Config
+     else:
+-        from straw import Application, Config
++        import Application, Config
+ 
+     # set offline to false if offline. Previous releases just rely on the
+     # previous state of the 'offline' config. So if the user specifies
diff --git a/net/straw/pkg-plist b/net/straw/pkg-plist
index 84e59be44351..453d699a646e 100644
--- a/net/straw/pkg-plist
+++ b/net/straw/pkg-plist
@@ -1,6 +1,5 @@
 bin/straw
 share/gnome/applications/straw.desktop
-share/pixmaps/straw.png
 share/gnome/straw/Application.py
 share/gnome/straw/Application.pyc
 share/gnome/straw/Application.pyo
@@ -127,26 +126,23 @@ share/gnome/straw/httplib_async.pyc
 share/gnome/straw/httplib_async.pyo
 share/gnome/straw/image-broken.png
 share/gnome/straw/image-waiting.png
-share/gnome/straw/offline.png
-share/gnome/straw/online.png
 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/ar/LC_MESSAGES/straw.mo
 share/locale/bg/LC_MESSAGES/straw.mo
 share/locale/cs/LC_MESSAGES/straw.mo
 share/locale/de/LC_MESSAGES/straw.mo
+share/locale/dz/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
@@ -156,9 +152,9 @@ 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/nb/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
@@ -170,4 +166,5 @@ 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/pixmaps/straw.png
 @dirrm share/gnome/straw