8 files changed, 42 insertions, 12 deletions

diff --git a/net/online-desktop/Makefile b/net/online-desktop/Makefile
index b76b34b1303d..c2475617b7b5 100644
--- a/net/online-desktop/Makefile
+++ b/net/online-desktop/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	online-desktop
-PORTVERSION=	0.2.29
-PORTREVISION=	5
+PORTVERSION=	0.3.2
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 
@@ -31,7 +30,7 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/desktop-data-engine:${PORTSDIR}/net/desktop-da
 		${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
 
 USE_BZIP2=	yes
-USE_GNOME=	glib20 gconf2
+USE_GNOME=	glib20 gconf2 pygnomedesktop
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
@@ -41,6 +40,7 @@ INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 
 post-patch:
+	@${FIND} ${WRKSRC} -type f -exec fgrep -l '%%PREFIX%%' {} \; |${XARGS} ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' -i .bak
 	@${FIND} ${WRKSRC} -type f -exec fgrep -l '%%LOCALBASE%%' {} \; |${XARGS} ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' -i .bak
 
 .include <bsd.port.mk>
diff --git a/net/online-desktop/distinfo b/net/online-desktop/distinfo
index 5e4189779bdf..c964ed239c82 100644
--- a/net/online-desktop/distinfo
+++ b/net/online-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (online-desktop-0.2.29.tar.bz2) = 98edefd68baae417a5a2d215099398f7
-SHA256 (online-desktop-0.2.29.tar.bz2) = 8499f02d0dc814c5f3519bf5e24c166df65c52633718c6c023158ddfafe49b95
-SIZE (online-desktop-0.2.29.tar.bz2) = 391365
+MD5 (online-desktop-0.3.2.tar.bz2) = 90f27f4229c0a62c79e167de956b2eae
+SHA256 (online-desktop-0.3.2.tar.bz2) = 99a68d2f00c53ee30f2be19bc1e96b6ba18bb3dbbbb0c12717a4f3ab77c04218
+SIZE (online-desktop-0.3.2.tar.bz2) = 411543
diff --git a/net/online-desktop/files/patch-gconf.path b/net/online-desktop/files/patch-gconf.path
index 2a0ab6a74cd8..c2a0bb5ffc3b 100644
--- a/net/online-desktop/files/patch-gconf.path
+++ b/net/online-desktop/files/patch-gconf.path
@@ -2,4 +2,4 @@
 +++ gconf.path	2008-05-28 21:24:34.000000000 +0530
 @@ -1 +1 @@
 -xml:readonly:/usr/share/online-desktop/gconf.xml.online-desktop
-+xml:readonly:%%LOCALBASE%%/share/online-desktop/gconf.xml.online-desktop
++xml:readonly:%%PREFIX%%/share/online-desktop/gconf.xml.online-desktop
diff --git a/net/online-desktop/files/patch-od-autostart b/net/online-desktop/files/patch-od-autostart
index f25e3430a410..17aae5c592fe 100644
--- a/net/online-desktop/files/patch-od-autostart
+++ b/net/online-desktop/files/patch-od-autostart
@@ -5,7 +5,7 @@
  	datadirs = datadir_env.split(':')
  else:
 -	datadirs = ['/usr/share/']
-+	datadirs = ['%%LOCALBASE%%/share/']
++	datadirs = ['%%PREFIX%%/share/']
  autostart_dirs = map(lambda x: os.path.join(x, 'online-desktop', 'autostart'), datadirs)
  for dir in autostart_dirs:
  	if os.access(dir, os.R_OK):
diff --git a/net/online-desktop/files/patch-od-session b/net/online-desktop/files/patch-od-session
index b06a9299f028..73e65284a5be 100644
--- a/net/online-desktop/files/patch-od-session
+++ b/net/online-desktop/files/patch-od-session
@@ -5,7 +5,7 @@
  # Configure GConf, in a very hackish way
  subprocess.call(['gconftool-2', '--shutdown'])
 -os.environ['ONLINE_DESKTOP_GCONF'] = '/usr/share/online-desktop/gconf.path'
-+os.environ['ONLINE_DESKTOP_GCONF'] = '%%LOCALBASE%%/share/online-desktop/gconf.path'
++os.environ['ONLINE_DESKTOP_GCONF'] = '%%PREFIX%%/share/online-desktop/gconf.path'
  
  reset_autostart_data = '''
  [Desktop Entry]
diff --git a/net/online-desktop/files/patch-po_Makefile.in.in b/net/online-desktop/files/patch-po_Makefile.in.in
new file mode 100644
index 000000000000..8c912069fac3
--- /dev/null
+++ b/net/online-desktop/files/patch-po_Makefile.in.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- po/Makefile.in.in.orig
++++ po/Makefile.in.in
+@@ -33,7 +33,7 @@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+-DATADIRNAME = @DATADIRNAME@
++DATADIRNAME = share
+ itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+ subdir = po
+ install_sh = @install_sh@
diff --git a/net/online-desktop/files/patch-pyonlinedesktop-fsutil.py b/net/online-desktop/files/patch-pyonlinedesktop-fsutil.py
index eca718b643bc..082736f8224c 100644
--- a/net/online-desktop/files/patch-pyonlinedesktop-fsutil.py
+++ b/net/online-desktop/files/patch-pyonlinedesktop-fsutil.py
@@ -5,7 +5,7 @@
      datadirs = datadir_env.split(':')
    else:
 -    datadirs = ['/usr/share/']
-+    datadirs = ['%%LOCALBASE%%/share/']
++    datadirs = ['%%PREFIX%%/share/']
    for dirname in datadirs:
      dirpath = os.path.join(dirname, name)
      if os.access(dirpath, os.R_OK):
diff --git a/net/online-desktop/pkg-plist b/net/online-desktop/pkg-plist
index 0ed39110b21b..d9009cca53e5 100644
--- a/net/online-desktop/pkg-plist
+++ b/net/online-desktop/pkg-plist
@@ -55,11 +55,27 @@ lib/pidgin/libdbus-api-plugin.so
 %%PYTHON_SITELIBDIR%%/pyonlinedesktop/widget.py
 %%PYTHON_SITELIBDIR%%/pyonlinedesktop/widget.pyc
 %%PYTHON_SITELIBDIR%%/pyonlinedesktop/widget.pyo
+%%PYTHON_SITELIBDIR%%/weblogindriver/__init__.py
+%%PYTHON_SITELIBDIR%%/weblogindriver/__init__.pyc
+%%PYTHON_SITELIBDIR%%/weblogindriver/__init__.pyo
+%%PYTHON_SITELIBDIR%%/weblogindriver/accounts_dialog.py
+%%PYTHON_SITELIBDIR%%/weblogindriver/accounts_dialog.pyc
+%%PYTHON_SITELIBDIR%%/weblogindriver/accounts_dialog.pyo
+%%PYTHON_SITELIBDIR%%/weblogindriver/ddm_util.py
+%%PYTHON_SITELIBDIR%%/weblogindriver/ddm_util.pyc
+%%PYTHON_SITELIBDIR%%/weblogindriver/ddm_util.pyo
+%%PYTHON_SITELIBDIR%%/weblogindriver/gutil.py
+%%PYTHON_SITELIBDIR%%/weblogindriver/gutil.pyc
+%%PYTHON_SITELIBDIR%%/weblogindriver/gutil.pyo
+%%PYTHON_SITELIBDIR%%/weblogindriver/keyring.py
+%%PYTHON_SITELIBDIR%%/weblogindriver/keyring.pyc
+%%PYTHON_SITELIBDIR%%/weblogindriver/keyring.pyo
 share/applications/flickr.desktop
 share/applications/gmail.desktop
 share/applications/google-calendar.desktop
 share/applications/google-docs.desktop
 share/applications/google-reader.desktop
+share/dbus-1/services/org.gnome.OnlineAccounts.service
 share/dbus-1/services/org.gnome.WebLoginDriver.service
 share/gnome/autostart/online-desktop-autostart.desktop
 share/gnome/autostart/online-prefs-sync.desktop
@@ -91,13 +107,13 @@ share/icons/hicolor/48x48/apps/yahoo-mail.png
 %%DATADIR%%/presession/panel-config.py
 share/online-prefs-sync/online-prefs-sync.synclist
 share/xsessions/online-desktop.desktop
-@dirrm share/xsessions
+@dirrmtry share/xsessions
 @dirrm share/online-prefs-sync
-@dirrm lib/locale
 @dirrm %%DATADIR%%/presession
 @dirrm %%DATADIR%%/gconf.xml.online-desktop
 @dirrm %%DATADIR%%/autostart
 @dirrm %%DATADIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/weblogindriver
 @dirrm %%PYTHON_SITELIBDIR%%/pyonlinedesktop
 @dirrm %%PYTHON_SITELIBDIR%%/ddm
 @dirrmtry %%PYTHON_SITELIBDIR%%