Sync w/ FreeBSD ports.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8951 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 51 insertions, 13 deletions

diff --git a/net/straw/Makefile b/net/straw/Makefile
index 12ef29229..29fe7e61c 100644
--- a/net/straw/Makefile
+++ b/net/straw/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	straw
-PORTVERSION=	0.26
-PORTREVISION=	2
+PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=sources/${PORTNAME}/${PORTVERSION}
@@ -20,6 +20,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+
@@ -35,7 +36,6 @@ GCONF_SCHEMAS=	straw.schemas
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g' \
 		${WRKSRC}/src/straw
-	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' ${WRKSRC}/setup.cfg
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/net/straw/distinfo b/net/straw/distinfo
index 7d101e9fa..4f57a657d 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-setup.cfg b/net/straw/files/patch-setup.cfg
new file mode 100644
index 000000000..fcb58d974
--- /dev/null
+++ b/net/straw/files/patch-setup.cfg
@@ -0,0 +1,8 @@
+--- 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 --git a/net/straw/files/patch-setup.py b/net/straw/files/patch-setup.py
new file mode 100644
index 000000000..a024cf1f0
--- /dev/null
+++ b/net/straw/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py	Sat Feb 18 16:22:43 2006
++++ setup.py	Wed Jan  3 23:38:53 2007
+@@ -146,7 +146,7 @@
+       pot_file         = 'po/straw.pot',
+       translations     = translations(),
+       modules_check    = modules_check,
+-      msg_sources      = translation_files(),
++      msg_sources      = ['glade/strings.c'] + glob.glob('src/lib/*.py'),
+       desktop_file     = ['straw.desktop.in'],
+       constants        = [('constants.py.in', strawenv)],
+       scripts          = ['src/straw'],
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 000000000..ac5a8689b
--- /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
new file mode 100644
index 000000000..ec142ac7e
--- /dev/null
+++ b/net/straw/files/patch-src::straw
@@ -0,0 +1,11 @@
+--- src/straw	Sat Oct 21 07:53:23 2006
++++ src/straw	Sun May 20 09:49:06 2007
+@@ -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 ff75f356b..5f3f5ba36 100644
--- a/net/straw/pkg-plist
+++ b/net/straw/pkg-plist
@@ -1,6 +1,5 @@
 bin/straw
 share/applications/straw.desktop
-share/pixmaps/straw.png
 share/straw/Application.py
 share/straw/Application.pyc
 share/straw/Application.pyo
@@ -127,26 +126,23 @@ share/straw/httplib_async.pyc
 share/straw/httplib_async.pyo
 share/straw/image-broken.png
 share/straw/image-waiting.png
-share/straw/offline.png
-share/straw/online.png
 share/straw/straw.css
 share/straw/straw.glade
 share/straw/straw.png
 share/straw/strawdbus.py
 share/straw/strawdbus.pyc
 share/straw/strawdbus.pyo
-share/straw/strawtypes.py
-share/straw/strawtypes.pyc
-share/straw/strawtypes.pyo
 share/straw/subscribe.py
 share/straw/subscribe.pyc
 share/straw/subscribe.pyo
 share/straw/utils.py
 share/straw/utils.pyc
 share/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/straw