On Fri, Jan 9, 2009 at 12:12 PM, Stuart Henderson <[email protected]> wrote: > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/net/emesene/Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 Makefile > --- Makefile 10 Jul 2008 13:22:41 -0000 1.1.1.1 > +++ Makefile 9 Jan 2009 14:09:40 -0000 > @@ -2,7 +2,7 @@ > > COMMENT = client for the Windows Live Messenger chat network > > -MODPY_EGG_VERSION = 1.0 > +MODPY_EGG_VERSION = 1.0.1 > DISTNAME = emesene-${MODPY_EGG_VERSION} > CATEGORIES = net > > @@ -20,7 +20,6 @@ RUN_DEPENDS = ::x11/py-gtk2 \ > ::multimedia/gstreamer-0.10/py-gstreamer \ > :dbus-python-*:x11/dbus-python \ > ::devel/py-notify > -WRKDIST = ${WRKDIR}/emesene > > SUBST_VARS = MODPY_SITEPKG > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/net/emesene/distinfo,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 distinfo > --- distinfo 10 Jul 2008 13:22:41 -0000 1.1.1.1 > +++ distinfo 9 Jan 2009 14:09:40 -0000 > @@ -1,5 +1,5 @@ > -MD5 (emesene-1.0.tar.gz) = BqCTkxPt44oahvo6jd5k9Q== > -RMD160 (emesene-1.0.tar.gz) = qmJKrFDUw0pNyVHo4/v1FnC/OGo= > -SHA1 (emesene-1.0.tar.gz) = ukhakPJWLfr3BvJdX7JkZ9bWjuQ= > -SHA256 (emesene-1.0.tar.gz) = QNzWRk8ee4kV/jJi5WIJSkqkWTnDHFMzzaTk8Xfd6pY= > -SIZE (emesene-1.0.tar.gz) = 1309751 > +MD5 (emesene-1.0.1.tar.gz) = Sfd+GQuMmRwyoHrAfPiNEw== > +RMD160 (emesene-1.0.1.tar.gz) = vvGbLG2zdQ9dXs2g5unAkx08vT8= > +SHA1 (emesene-1.0.1.tar.gz) = X+AZ+1RlS1YCEaqJzBS3AF+ikdI= > +SHA256 (emesene-1.0.1.tar.gz) = DQAAM4Rd6nWKgZUYWuyPjKgzca7k4xoSGVKtYoCSp5k= > +SIZE (emesene-1.0.1.tar.gz) = 1885706 > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/net/emesene/pkg/PLIST,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 PLIST > --- pkg/PLIST 10 Jul 2008 13:22:41 -0000 1.1.1.1 > +++ pkg/PLIST 9 Jan 2009 14:09:40 -0000 > @@ -1,11 +1,13 @@ > @comment $OpenBSD: PLIST,v 1.1.1.1 2008/07/10 13:22:41 wcmaier Exp $ > bin/emesene > lib/python${MODPY_VERSION}/site-packages/emesene/ > -lib/python${MODPY_VERSION}/site-packages/emesene-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info > +lib/python${MODPY_VERSION}/site-packages/emesene-1.0-py${MODPY_VERSION}.egg-info > lib/python${MODPY_VERSION}/site-packages/emesene/Avatar.py > lib/python${MODPY_VERSION}/site-packages/emesene/Avatar.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/Config.py > lib/python${MODPY_VERSION}/site-packages/emesene/Config.pyc > +lib/python${MODPY_VERSION}/site-packages/emesene/ConfigDialog.py > +lib/python${MODPY_VERSION}/site-packages/emesene/ConfigDialog.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/ContactList.py > lib/python${MODPY_VERSION}/site-packages/emesene/ContactList.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/ContactManager.py > @@ -40,6 +42,10 @@ lib/python${MODPY_VERSION}/site-packages > lib/python${MODPY_VERSION}/site-packages/emesene/GroupMenu.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/ImageAreaSelector.py > lib/python${MODPY_VERSION}/site-packages/emesene/ImageAreaSelector.pyc > +lib/python${MODPY_VERSION}/site-packages/emesene/InkDraw.py > +lib/python${MODPY_VERSION}/site-packages/emesene/InkDraw.pyc > +lib/python${MODPY_VERSION}/site-packages/emesene/InkDrawDemo.py > +lib/python${MODPY_VERSION}/site-packages/emesene/InkDrawDemo.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/LogViewer.py > lib/python${MODPY_VERSION}/site-packages/emesene/LogViewer.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/Login.py > @@ -48,6 +54,8 @@ lib/python${MODPY_VERSION}/site-packages > lib/python${MODPY_VERSION}/site-packages/emesene/MainMenu.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/MainWindow.py > lib/python${MODPY_VERSION}/site-packages/emesene/MainWindow.pyc > +lib/python${MODPY_VERSION}/site-packages/emesene/Menu.py > +lib/python${MODPY_VERSION}/site-packages/emesene/Menu.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/Parser.py > lib/python${MODPY_VERSION}/site-packages/emesene/Parser.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/PluginManager.py > @@ -81,12 +89,26 @@ lib/python${MODPY_VERSION}/site-packages > lib/python${MODPY_VERSION}/site-packages/emesene/__init__.py > lib/python${MODPY_VERSION}/site-packages/emesene/__init__.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/abstract/ > +lib/python${MODPY_VERSION}/site-packages/emesene/abstract/ConfigDialog.py > +lib/python${MODPY_VERSION}/site-packages/emesene/abstract/ConfigDialog.pyc > +lib/python${MODPY_VERSION}/site-packages/emesene/abstract/ContactList.py > +lib/python${MODPY_VERSION}/site-packages/emesene/abstract/ContactList.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/abstract/ContactManager.py > lib/python${MODPY_VERSION}/site-packages/emesene/abstract/ContactManager.pyc > +lib/python${MODPY_VERSION}/site-packages/emesene/abstract/ContactMenu.py > +lib/python${MODPY_VERSION}/site-packages/emesene/abstract/ContactMenu.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/abstract/GroupManager.py > lib/python${MODPY_VERSION}/site-packages/emesene/abstract/GroupManager.pyc > +lib/python${MODPY_VERSION}/site-packages/emesene/abstract/GroupMenu.py > +lib/python${MODPY_VERSION}/site-packages/emesene/abstract/GroupMenu.pyc > +lib/python${MODPY_VERSION}/site-packages/emesene/abstract/MainMenu.py > +lib/python${MODPY_VERSION}/site-packages/emesene/abstract/MainMenu.pyc > +lib/python${MODPY_VERSION}/site-packages/emesene/abstract/Menu.py > +lib/python${MODPY_VERSION}/site-packages/emesene/abstract/Menu.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/abstract/Object.py > lib/python${MODPY_VERSION}/site-packages/emesene/abstract/Object.pyc > +lib/python${MODPY_VERSION}/site-packages/emesene/abstract/Session.py > +lib/python${MODPY_VERSION}/site-packages/emesene/abstract/Session.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/abstract/__init__.py > lib/python${MODPY_VERSION}/site-packages/emesene/abstract/__init__.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/abstract/dialog.py > @@ -188,6 +210,7 @@ lib/python${MODPY_VERSION}/site-packages > lib/python${MODPY_VERSION}/site-packages/emesene/plugins_base/Youtube.py > lib/python${MODPY_VERSION}/site-packages/emesene/plugins_base/Youtube.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/plugins_base/__init__.py > +...@comment > lib/python${MODPY_VERSION}/site-packages/emesene/plugins_base/__init__.py.orig > lib/python${MODPY_VERSION}/site-packages/emesene/plugins_base/__init__.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/plugins_base/currentSong/ > > lib/python${MODPY_VERSION}/site-packages/emesene/plugins_base/currentSong/Amarok.py > @@ -216,6 +239,8 @@ lib/python${MODPY_VERSION}/site-packages > > lib/python${MODPY_VERSION}/site-packages/emesene/plugins_base/currentSong/__init__.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/plugins_base/lastfm.py > lib/python${MODPY_VERSION}/site-packages/emesene/plugins_base/lastfm.pyc > +lib/python${MODPY_VERSION}/site-packages/emesene/setup.py > +lib/python${MODPY_VERSION}/site-packages/emesene/setup.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/status.py > lib/python${MODPY_VERSION}/site-packages/emesene/status.pyc > lib/python${MODPY_VERSION}/site-packages/emesene/stock.py > @@ -241,10 +266,22 @@ share/emesene/po/ca/ > share/emesene/po/ca/LC_MESSAGES/ > share/emesene/po/ca/LC_MESSAGES/emesene.mo > share/emesene/po/ca/LC_MESSAGES/emesene.po > +share/emesene/po/da/ > +share/emesene/po/da/LC_MESSAGES/ > +share/emesene/po/da/LC_MESSAGES/emesene.mo > +share/emesene/po/da/LC_MESSAGES/emesene.po > share/emesene/po/de/ > share/emesene/po/de/LC_MESSAGES/ > share/emesene/po/de/LC_MESSAGES/emesene.mo > share/emesene/po/de/LC_MESSAGES/emesene.po > +share/emesene/po/el/ > +share/emesene/po/el/LC_MESSAGES/ > +share/emesene/po/el/LC_MESSAGES/emesene.mo > +share/emesene/po/el/LC_MESSAGES/emesene.po > +share/emesene/po/en_GB/ > +share/emesene/po/en_GB/LC_MESSAGES/ > +share/emesene/po/en_GB/LC_MESSAGES/emesene.mo > +share/emesene/po/en_GB/LC_MESSAGES/emesene.po > share/emesene/po/es/ > share/emesene/po/es/LC_MESSAGES/ > share/emesene/po/es/LC_MESSAGES/emesene.mo > @@ -253,6 +290,10 @@ share/emesene/po/et/ > share/emesene/po/et/LC_MESSAGES/ > share/emesene/po/et/LC_MESSAGES/emesene.mo > share/emesene/po/et/LC_MESSAGES/emesene.po > +share/emesene/po/eu/ > +share/emesene/po/eu/LC_MESSAGES/ > +share/emesene/po/eu/LC_MESSAGES/emesene.mo > +share/emesene/po/eu/LC_MESSAGES/emesene.po > share/emesene/po/fi/ > share/emesene/po/fi/LC_MESSAGES/ > share/emesene/po/fi/LC_MESSAGES/emesene.mo > @@ -261,22 +302,62 @@ share/emesene/po/fr/ > share/emesene/po/fr/LC_MESSAGES/ > share/emesene/po/fr/LC_MESSAGES/emesene.mo > share/emesene/po/fr/LC_MESSAGES/emesene.po > +share/emesene/po/ga/ > +share/emesene/po/ga/LC_MESSAGES/ > +share/emesene/po/ga/LC_MESSAGES/emesene.mo > +share/emesene/po/ga/LC_MESSAGES/emesene.po > +share/emesene/po/gl/ > +share/emesene/po/gl/LC_MESSAGES/ > +share/emesene/po/gl/LC_MESSAGES/emesene.mo > +share/emesene/po/gl/LC_MESSAGES/emesene.po > +share/emesene/po/he/ > +share/emesene/po/he/LC_MESSAGES/ > +share/emesene/po/he/LC_MESSAGES/emesene.mo > +share/emesene/po/he/LC_MESSAGES/emesene.po > +share/emesene/po/hr/ > +share/emesene/po/hr/LC_MESSAGES/ > +share/emesene/po/hr/LC_MESSAGES/emesene.mo > +share/emesene/po/hr/LC_MESSAGES/emesene.po > share/emesene/po/hu/ > share/emesene/po/hu/LC_MESSAGES/ > share/emesene/po/hu/LC_MESSAGES/emesene.mo > share/emesene/po/hu/LC_MESSAGES/emesene.po > +share/emesene/po/is/ > +share/emesene/po/is/LC_MESSAGES/ > +share/emesene/po/is/LC_MESSAGES/emesene.mo > +share/emesene/po/is/LC_MESSAGES/emesene.po > share/emesene/po/it/ > share/emesene/po/it/LC_MESSAGES/ > share/emesene/po/it/LC_MESSAGES/emesene.mo > share/emesene/po/it/LC_MESSAGES/emesene.po > +share/emesene/po/ja/ > +share/emesene/po/ja/LC_MESSAGES/ > +share/emesene/po/ja/LC_MESSAGES/emesene.mo > +share/emesene/po/ja/LC_MESSAGES/emesene.po > +share/emesene/po/lv/ > +share/emesene/po/lv/LC_MESSAGES/ > +share/emesene/po/lv/LC_MESSAGES/emesene.mo > +share/emesene/po/lv/LC_MESSAGES/emesene.po > +share/emesene/po/nb/ > +share/emesene/po/nb/LC_MESSAGES/ > +share/emesene/po/nb/LC_MESSAGES/emesene.mo > +share/emesene/po/nb/LC_MESSAGES/emesene.po > share/emesene/po/nb_NO/ > share/emesene/po/nb_NO/LC_MESSAGES/ > share/emesene/po/nb_NO/LC_MESSAGES/emesene.mo > share/emesene/po/nb_NO/LC_MESSAGES/emesene.po > +share/emesene/po/nds/ > +share/emesene/po/nds/LC_MESSAGES/ > +share/emesene/po/nds/LC_MESSAGES/emesene.mo > +share/emesene/po/nds/LC_MESSAGES/emesene.po > share/emesene/po/nl/ > share/emesene/po/nl/LC_MESSAGES/ > share/emesene/po/nl/LC_MESSAGES/emesene.mo > share/emesene/po/nl/LC_MESSAGES/emesene.po > +share/emesene/po/nn/ > +share/emesene/po/nn/LC_MESSAGES/ > +share/emesene/po/nn/LC_MESSAGES/emesene.mo > +share/emesene/po/nn/LC_MESSAGES/emesene.po > share/emesene/po/pt/ > share/emesene/po/pt/LC_MESSAGES/ > share/emesene/po/pt/LC_MESSAGES/emesene.mo > @@ -285,10 +366,26 @@ share/emesene/po/pt_BR/ > share/emesene/po/pt_BR/LC_MESSAGES/ > share/emesene/po/pt_BR/LC_MESSAGES/emesene.mo > share/emesene/po/pt_BR/LC_MESSAGES/emesene.po > +share/emesene/po/sl/ > +share/emesene/po/sl/LC_MESSAGES/ > +share/emesene/po/sl/LC_MESSAGES/emesene.mo > +share/emesene/po/sl/LC_MESSAGES/emesene.po > +share/emesene/po/sq/ > +share/emesene/po/sq/LC_MESSAGES/ > +share/emesene/po/sq/LC_MESSAGES/emesene.mo > +share/emesene/po/sq/LC_MESSAGES/emesene.po > +share/emesene/po/sr/ > +share/emesene/po/sr/LC_MESSAGES/ > +share/emesene/po/sr/LC_MESSAGES/emesene.mo > +share/emesene/po/sr/LC_MESSAGES/emesene.po > share/emesene/po/sv/ > share/emesene/po/sv/LC_MESSAGES/ > share/emesene/po/sv/LC_MESSAGES/emesene.mo > share/emesene/po/sv/LC_MESSAGES/emesene.po > +share/emesene/po/th/ > +share/emesene/po/th/LC_MESSAGES/ > +share/emesene/po/th/LC_MESSAGES/emesene.mo > +share/emesene/po/th/LC_MESSAGES/emesene.po > share/emesene/po/tr/ > share/emesene/po/tr/LC_MESSAGES/ > share/emesene/po/tr/LC_MESSAGES/emesene.mo
Output of patch: Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: Makefile |=================================================================== |RCS file: /cvs/ports/net/emesene/Makefile,v |retrieving revision 1.1.1.1 |diff -u -p -r1.1.1.1 Makefile |--- Makefile 10 Jul 2008 13:22:41 -0000 1.1.1.1 |+++ Makefile 9 Jan 2009 14:09:40 -0000 -------------------------- Patching file Makefile using Plan A... Hunk #1 failed at 2. Hunk #2 failed at 20. 2 out of 2 hunks failed--saving rejects to Makefile.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: distinfo |=================================================================== |RCS file: /cvs/ports/net/emesene/distinfo,v |retrieving revision 1.1.1.1 |diff -u -p -r1.1.1.1 distinfo |--- distinfo 10 Jul 2008 13:22:41 -0000 1.1.1.1 |+++ distinfo 9 Jan 2009 14:09:40 -0000 -------------------------- Patching file distinfo using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: pkg/PLIST |=================================================================== |RCS file: /cvs/ports/net/emesene/pkg/PLIST,v |retrieving revision 1.1.1.1 |diff -u -p -r1.1.1.1 PLIST |--- pkg/PLIST 10 Jul 2008 13:22:41 -0000 1.1.1.1 |+++ pkg/PLIST 9 Jan 2009 14:09:40 -0000 -------------------------- Patching file pkg/PLIST using Plan A... Hunk #1 succeeded at 1. Hunk #2 succeeded at 42. Hunk #3 succeeded at 54. Hunk #4 succeeded at 89. Hunk #5 succeeded at 210. Hunk #6 succeeded at 239. Hunk #7 succeeded at 266. Hunk #8 succeeded at 290. Hunk #9 succeeded at 302. Hunk #10 succeeded at 366. done I had to modify Makefile by hand, exactly as the diff described. Worked great, now emesene does show my contacts. Thanks a lot, man! PS: Please consider getting this into tree for 4.5, emesene is an excelent client.
