5 files changed, 145 insertions, 172 deletions

diff --git a/net/straw/Makefile b/net/straw/Makefile
index eb3a6fcfce6b..8a2f5f03f9fa 100644
--- a/net/straw/Makefile
+++ b/net/straw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	straw
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=sources/${PORTNAME}/${PORTVERSION}
@@ -25,10 +26,10 @@ USE_GNOME=	gnomehier libglade2 pygnome2 pygnomeextras
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	Straw
-PYDISTUTILS_EGGINFODIR=	${PREFIX}/share/gnome
+PYDISTUTILS_EGGINFODIR=	${PREFIX}/share
 PYDISTUTILS_INSTALLARGS=	-c -O1 --prefix=${PREFIX} \
-				--install-lib=${PREFIX}/share/gnome \
-				--with-desktop-file-dir=share/gnome/applications
+				--install-lib=${PREFIX}/share \
+				--with-desktop-file-dir=share/applications
 
 GCONF_SCHEMAS=	straw.schemas
 
diff --git a/net/straw/files/patch-constants.py.in b/net/straw/files/patch-constants.py.in
deleted file mode 100644
index a0b097fa5403..000000000000
--- a/net/straw/files/patch-constants.py.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 --git a/net/straw/files/patch-setup.py b/net/straw/files/patch-setup.py
index 0e4ca8d55714..a024cf1f0576 100644
--- a/net/straw/files/patch-setup.py
+++ b/net/straw/files/patch-setup.py
@@ -1,14 +1,5 @@
 --- 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 + misc)]
-+        ('share/gnome/straw', images + misc)]
-     return files
- 
- # Let distutils do the work
 @@ -146,7 +146,7 @@
        pot_file         = 'po/straw.pot',
        translations     = translations(),
diff --git a/net/straw/files/patch-src::straw b/net/straw/files/patch-src::straw
index cb965b2ce848..ec142ac7ee74 100644
--- a/net/straw/files/patch-src::straw
+++ b/net/straw/files/patch-src::straw
@@ -1,14 +1,5 @@
 --- 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])
-         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 = fp
 @@ -102,7 +102,7 @@
      if ENV_IN_SOURCE:
          from lib import Application, Config
diff --git a/net/straw/pkg-plist b/net/straw/pkg-plist
index 453d699a646e..4f0bdbb280e6 100644
--- a/net/straw/pkg-plist
+++ b/net/straw/pkg-plist
@@ -1,143 +1,143 @@
 bin/straw
-share/gnome/applications/straw.desktop
-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/Event.py
-share/gnome/straw/Event.pyc
-share/gnome/straw/Event.pyo
-share/gnome/straw/Feed.py
-share/gnome/straw/Feed.pyc
-share/gnome/straw/Feed.pyo
-share/gnome/straw/FeedCategoryList.py
-share/gnome/straw/FeedCategoryList.pyc
-share/gnome/straw/FeedCategoryList.pyo
-share/gnome/straw/FeedDataRouter.py
-share/gnome/straw/FeedDataRouter.pyc
-share/gnome/straw/FeedDataRouter.pyo
-share/gnome/straw/FeedItems.py
-share/gnome/straw/FeedItems.pyc
-share/gnome/straw/FeedItems.pyo
-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/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/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
-share/gnome/straw/NetworkConstants.py
-share/gnome/straw/NetworkConstants.pyc
-share/gnome/straw/NetworkConstants.pyo
-share/gnome/straw/OPML.py
-share/gnome/straw/OPML.pyc
-share/gnome/straw/OPML.pyo
-share/gnome/straw/OPMLExport.py
-share/gnome/straw/OPMLExport.pyc
-share/gnome/straw/OPMLExport.pyo
-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
-share/gnome/straw/PollManager.py
-share/gnome/straw/PollManager.pyc
-share/gnome/straw/PollManager.pyo
-share/gnome/straw/PreferencesDialog.py
-share/gnome/straw/PreferencesDialog.pyc
-share/gnome/straw/PreferencesDialog.pyo
-share/gnome/straw/QueueDict.py
-share/gnome/straw/QueueDict.pyc
-share/gnome/straw/QueueDict.pyo
-share/gnome/straw/SummaryItem.py
-share/gnome/straw/SummaryItem.pyc
-share/gnome/straw/SummaryItem.pyo
-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
-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
-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
-share/gnome/straw/httplib_async.py
-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/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/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/applications/straw.desktop
+share/straw/Application.py
+share/straw/Application.pyc
+share/straw/Application.pyo
+share/straw/CategorySelector.py
+share/straw/CategorySelector.pyc
+share/straw/CategorySelector.pyo
+share/straw/Config.py
+share/straw/Config.pyc
+share/straw/Config.pyo
+share/straw/Event.py
+share/straw/Event.pyc
+share/straw/Event.pyo
+share/straw/Feed.py
+share/straw/Feed.pyc
+share/straw/Feed.pyo
+share/straw/FeedCategoryList.py
+share/straw/FeedCategoryList.pyc
+share/straw/FeedCategoryList.pyo
+share/straw/FeedDataRouter.py
+share/straw/FeedDataRouter.pyc
+share/straw/FeedDataRouter.pyo
+share/straw/FeedItems.py
+share/straw/FeedItems.pyc
+share/straw/FeedItems.pyo
+share/straw/FeedList.py
+share/straw/FeedList.pyc
+share/straw/FeedList.pyo
+share/straw/FeedListView.py
+share/straw/FeedListView.pyc
+share/straw/FeedListView.pyo
+share/straw/FeedPropertiesDialog.py
+share/straw/FeedPropertiesDialog.pyc
+share/straw/FeedPropertiesDialog.pyo
+share/straw/Find.py
+share/straw/Find.pyc
+share/straw/Find.pyo
+share/straw/ImageCache.py
+share/straw/ImageCache.pyc
+share/straw/ImageCache.pyo
+share/straw/ItemList.py
+share/straw/ItemList.pyc
+share/straw/ItemList.pyo
+share/straw/ItemStore.py
+share/straw/ItemStore.pyc
+share/straw/ItemStore.pyo
+share/straw/ItemView.py
+share/straw/ItemView.pyc
+share/straw/ItemView.pyo
+share/straw/LookupManager.py
+share/straw/LookupManager.pyc
+share/straw/LookupManager.pyo
+share/straw/MVP.py
+share/straw/MVP.pyc
+share/straw/MVP.pyo
+share/straw/MainloopManager.py
+share/straw/MainloopManager.pyc
+share/straw/MainloopManager.pyo
+share/straw/MessageManager.py
+share/straw/MessageManager.pyc
+share/straw/MessageManager.pyo
+share/straw/NetworkConstants.py
+share/straw/NetworkConstants.pyc
+share/straw/NetworkConstants.pyo
+share/straw/OPML.py
+share/straw/OPML.pyc
+share/straw/OPML.pyo
+share/straw/OPMLExport.py
+share/straw/OPMLExport.pyc
+share/straw/OPMLExport.pyo
+share/straw/OPMLImport.py
+share/straw/OPMLImport.pyc
+share/straw/OPMLImport.pyo
+share/straw/OfflineToggle.py
+share/straw/OfflineToggle.pyc
+share/straw/OfflineToggle.pyo
+share/straw/ParsedSummary.py
+share/straw/ParsedSummary.pyc
+share/straw/ParsedSummary.pyo
+share/straw/PollManager.py
+share/straw/PollManager.pyc
+share/straw/PollManager.pyo
+share/straw/PreferencesDialog.py
+share/straw/PreferencesDialog.pyc
+share/straw/PreferencesDialog.pyo
+share/straw/QueueDict.py
+share/straw/QueueDict.pyc
+share/straw/QueueDict.pyo
+share/straw/SummaryItem.py
+share/straw/SummaryItem.pyc
+share/straw/SummaryItem.pyo
+share/straw/SummaryParser.py
+share/straw/SummaryParser.pyc
+share/straw/SummaryParser.pyo
+share/straw/Tray.py
+share/straw/Tray.pyc
+share/straw/Tray.pyo
+share/straw/URLFetch.py
+share/straw/URLFetch.pyc
+share/straw/URLFetch.pyo
+share/straw/ValueMonitor.py
+share/straw/ValueMonitor.pyc
+share/straw/ValueMonitor.pyo
+share/straw/__init__.py
+share/straw/__init__.pyc
+share/straw/__init__.pyo
+share/straw/constants.py
+share/straw/constants.pyc
+share/straw/constants.pyo
+share/straw/default_subscriptions.opml
+share/straw/dialogs.py
+share/straw/dialogs.pyc
+share/straw/dialogs.pyo
+share/straw/error.py
+share/straw/error.pyc
+share/straw/error.pyo
+share/straw/feedfinder.py
+share/straw/feedfinder.pyc
+share/straw/feedfinder.pyo
+share/straw/feedparser.py
+share/straw/feedparser.pyc
+share/straw/feedparser.pyo
+share/straw/httplib_async.py
+share/straw/httplib_async.pyc
+share/straw/httplib_async.pyo
+share/straw/image-broken.png
+share/straw/image-waiting.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/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
@@ -167,4 +167,5 @@ 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
+@dirrm share/straw
+@dirrmtry share/applications