diff options
author | miwi <miwi@FreeBSD.org> | 2007-03-07 17:49:33 +0800 |
---|---|---|
committer | miwi <miwi@FreeBSD.org> | 2007-03-07 17:49:33 +0800 |
commit | 3c68f29ff6f5b82a6593063e49002d7d0b512b45 (patch) | |
tree | 7dffb905f165e92c72c64f98a4c94aeb1d7e8a90 /net | |
parent | a538df1ca94bb17a2cd19a8dbe2c2f52838a7735 (diff) | |
download | freebsd-ports-gnome-3c68f29ff6f5b82a6593063e49002d7d0b512b45.tar.gz freebsd-ports-gnome-3c68f29ff6f5b82a6593063e49002d7d0b512b45.tar.zst freebsd-ports-gnome-3c68f29ff6f5b82a6593063e49002d7d0b512b45.zip |
- Update to 0.26
- Update MASTER_SITES
- Remove BROKEN and DEPRECATED
- Remove python < 2.4 stuff, cause straw is now requires 2.4
- Change port description
- Fix pkg-list
- Pass maintainership to submitter
PR: 109840
Submitted by: R.Mahmatkhanov <R.Mahmatkhanov@SKYLINK.ru>
Diffstat (limited to 'net')
-rw-r--r-- | net/straw/Makefile | 26 | ||||
-rw-r--r-- | net/straw/distinfo | 6 | ||||
-rw-r--r-- | net/straw/files/patch-constants.py.in | 11 | ||||
-rw-r--r-- | net/straw/files/patch-setup.cfg | 8 | ||||
-rw-r--r-- | net/straw/files/patch-setup.py | 34 | ||||
-rw-r--r-- | net/straw/files/patch-src::lib::Config.py | 11 | ||||
-rw-r--r-- | net/straw/files/patch-src::lib::LookupManager.py | 14 | ||||
-rw-r--r-- | net/straw/files/patch-src::lib::utils.py | 11 | ||||
-rw-r--r-- | net/straw/files/patch-src::straw | 29 | ||||
-rw-r--r-- | net/straw/pkg-descr | 6 | ||||
-rw-r--r-- | net/straw/pkg-plist | 84 |
11 files changed, 103 insertions, 137 deletions
diff --git a/net/straw/Makefile b/net/straw/Makefile index 3862fc771c93..0a7dfe08d77d 100644 --- a/net/straw/Makefile +++ b/net/straw/Makefile @@ -6,23 +6,22 @@ # 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/${PORTNAME}/${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= R.Mahmatkhanov@SKYLINK.RU COMMENT= A GNOME 2 desktop weblog aggregator written in Python -BROKEN= Does not work with the newer GTK/GNOME python bindings -DEPRECATED= ${BROKEN} -EXPIRATION_DATE=2007-04-10 +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb \ + ${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus 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 \ @@ -32,15 +31,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' \ ${WRKSRC}/src/straw diff --git a/net/straw/distinfo b/net/straw/distinfo index 9051364a479e..7d101e9faa2d 100644 --- a/net/straw/distinfo +++ b/net/straw/distinfo @@ -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 --git a/net/straw/files/patch-constants.py.in b/net/straw/files/patch-constants.py.in new file mode 100644 index 000000000000..a0b097fa5403 --- /dev/null +++ b/net/straw/files/patch-constants.py.in @@ -0,0 +1,11 @@ +--- 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.cfg b/net/straw/files/patch-setup.cfg new file mode 100644 index 000000000000..fcb58d974d72 --- /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 index 29e044a51ea8..0e4ca8d55714 100644 --- a/net/straw/files/patch-setup.py +++ b/net/straw/files/patch-setup.py @@ -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') +--- 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 --git a/net/straw/files/patch-src::lib::Config.py b/net/straw/files/patch-src::lib::Config.py deleted file mode 100644 index a5c3debd01c3..000000000000 --- a/net/straw/files/patch-src::lib::Config.py +++ /dev/null @@ -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 --git a/net/straw/files/patch-src::lib::LookupManager.py b/net/straw/files/patch-src::lib::LookupManager.py deleted file mode 100644 index abcb576da64b..000000000000 --- a/net/straw/files/patch-src::lib::LookupManager.py +++ /dev/null @@ -1,14 +0,0 @@ ---- 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: -- 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 diff --git a/net/straw/files/patch-src::lib::utils.py b/net/straw/files/patch-src::lib::utils.py deleted file mode 100644 index b3eb80979c25..000000000000 --- a/net/straw/files/patch-src::lib::utils.py +++ /dev/null @@ -1,11 +0,0 @@ ---- 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') diff --git a/net/straw/files/patch-src::straw b/net/straw/files/patch-src::straw index 4c08834656f4..a23d571d8500 100644 --- a/net/straw/files/patch-src::straw +++ b/net/straw/files/patch-src::straw @@ -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 - +--- src/straw Thu Jan 26 15:11:29 2006 ++++ src/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 --git a/net/straw/pkg-descr b/net/straw/pkg-descr index bdfd05c7d1ed..3e7f789324b5 100644 --- a/net/straw/pkg-descr +++ b/net/straw/pkg-descr @@ -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 --git a/net/straw/pkg-plist b/net/straw/pkg-plist index 21b0117293db..84e59be44351 100644 --- a/net/straw/pkg-plist +++ b/net/straw/pkg-plist @@ -1,12 +1,15 @@ bin/straw share/gnome/applications/straw.desktop -share/gnome/pixmaps/straw.png +share/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/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/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/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 @@ -79,9 +88,6 @@ share/gnome/straw/PreferencesDialog.pyo 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/ValueMonitor.pyo 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/feedfinder.pyo 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,45 @@ 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/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 @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 |