Update to 0.16.

6 files changed, 40 insertions, 37 deletions

diff --git a/devel/py-xdg/Makefile b/devel/py-xdg/Makefile
index 0881a66492f9..c81176206c96 100644
--- a/devel/py-xdg/Makefile
+++ b/devel/py-xdg/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	xdg
-PORTVERSION=	0.15
-PORTREVISION=	3
+PORTVERSION=	0.16
 CATEGORIES=	devel python
 MASTER_SITES=	http://people.freedesktop.org/~lanius/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -23,8 +22,7 @@ PYDISTUTILS_PKGNAME=	pyxdg
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|/etc|${LOCALBASE}/etc|g ; s|%%LOCALBASE%%|${LOCALBASE}|g' \
-			${WRKSRC}/xdg/BaseDirectory.py \
-			${WRKSRC}/xdg/IconTheme.py
+		's|%%LOCALBASE%%|${LOCALBASE}|g' \
+			${WRKSRC}/xdg/BaseDirectory.py
 
 .include <bsd.port.mk>
diff --git a/devel/py-xdg/distinfo b/devel/py-xdg/distinfo
index 9118f9eda710..fd28d3d9013e 100644
--- a/devel/py-xdg/distinfo
+++ b/devel/py-xdg/distinfo
@@ -1,3 +1,3 @@
-MD5 (pyxdg-0.15.tar.gz) = 86a5441285fc908145414b63348d11a3
-SHA256 (pyxdg-0.15.tar.gz) = c2adf20955cb62af5c94622d0dd47fb82ee63da33c03d5a1f82337ba83044bb7
-SIZE (pyxdg-0.15.tar.gz) = 36465
+MD5 (pyxdg-0.16.tar.gz) = 55b71ec0df9509e05e562ac402b119f7
+SHA256 (pyxdg-0.16.tar.gz) = b7f91cec9b42404a680c780c40d37c825701d7e533c1043bbabf6a0551e86635
+SIZE (pyxdg-0.16.tar.gz) = 37284
diff --git a/devel/py-xdg/files/patch-xdg::BaseDirectory.py b/devel/py-xdg/files/patch-xdg::BaseDirectory.py
index 77f09b5289aa..a18c6b666689 100644
--- a/devel/py-xdg/files/patch-xdg::BaseDirectory.py
+++ b/devel/py-xdg/files/patch-xdg::BaseDirectory.py
@@ -1,11 +1,18 @@
---- xdg/BaseDirectory.py.orig	Wed Mar 23 00:08:43 2005
-+++ xdg/BaseDirectory.py	Wed Mar 23 00:09:35 2005
-@@ -33,7 +33,7 @@
- 			os.path.join(_home, '.local', 'share'))
+--- xdg/BaseDirectory.py.orig	2008-03-02 08:56:26.000000000 -0500
++++ xdg/BaseDirectory.py	2008-08-16 14:56:01.000000000 -0400
+@@ -33,13 +33,13 @@ xdg_data_home = os.environ.get('XDG_DATA
+             os.path.join(_home, '.local', 'share'))
  
  xdg_data_dirs = [xdg_data_home] + \
--	os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
-+	os.environ.get('XDG_DATA_DIRS', '%%LOCALBASE%%/share').split(':')
+-    os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
++    os.environ.get('XDG_DATA_DIRS', '%%LOCALBASE%%/share').split(':')
  
  xdg_config_home = os.environ.get('XDG_CONFIG_HOME',
- 			os.path.join(_home, '.config'))
+             os.path.join(_home, '.config'))
+ 
+ xdg_config_dirs = [xdg_config_home] + \
+-    os.environ.get('XDG_CONFIG_DIRS', '/etc/xdg').split(':')
++    os.environ.get('XDG_CONFIG_DIRS', '%%LOCALBASE%%/etc/xdg').split(':')
+ 
+ xdg_cache_home = os.environ.get('XDG_CACHE_HOME',
+             os.path.join(_home, '.cache'))
diff --git a/devel/py-xdg/files/patch-xdg::IconTheme.py b/devel/py-xdg/files/patch-xdg::IconTheme.py
deleted file mode 100644
index c7af80928c98..000000000000
--- a/devel/py-xdg/files/patch-xdg::IconTheme.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- xdg/IconTheme.py.orig	2007-09-10 00:33:42.000000000 -0500
-+++ xdg/IconTheme.py	2007-09-10 00:34:37.000000000 -0500
-@@ -215,7 +215,8 @@
- icondirs = []
- for basedir in xdg_data_dirs:
- 	icondirs.append(os.path.join(basedir, "icons"))
--icondirs.append("/usr/share/pixmaps")
-+icondirs.append("%%LOCALBASE%%/share/pixmaps")
-+icondirs.append("%%LOCALBASE%%/share/icons")
- icondirs.append(os.path.expanduser("~/.icons"))
- 
- # just cache variables, they give a 10x speed improvement
diff --git a/devel/py-xdg/files/patch-xdg_DesktopEntry.py b/devel/py-xdg/files/patch-xdg_DesktopEntry.py
new file mode 100644
index 000000000000..11f1ad423cbc
--- /dev/null
+++ b/devel/py-xdg/files/patch-xdg_DesktopEntry.py
@@ -0,0 +1,11 @@
+--- xdg/DesktopEntry.py.orig	2008-08-16 15:02:12.000000000 -0400
++++ xdg/DesktopEntry.py	2008-08-16 15:02:35.000000000 -0400
+@@ -181,7 +181,7 @@ class DesktopEntry(IniFile):
+         else:
+             #OnlyShowIn and NotShowIn
+             if self.content[group].has_key("OnlyShowIn") and self.content[group].has_key("NotShowIn"):
+-            self.errors.append("Group may either have OnlyShowIn or NotShowIn, but not both")
++                self.errors.append("Group may either have OnlyShowIn or NotShowIn, but not both")
+ 
+     def checkKey(self, key, value, group):
+         # standard keys     
diff --git a/devel/py-xdg/files/patch-xdg_Menu.py b/devel/py-xdg/files/patch-xdg_Menu.py
index 186fda59171f..8418657c6900 100644
--- a/devel/py-xdg/files/patch-xdg_Menu.py
+++ b/devel/py-xdg/files/patch-xdg_Menu.py
@@ -1,13 +1,12 @@
---- xdg/Menu.py.orig	Thu Aug 11 07:37:48 2005
-+++ xdg/Menu.py	Sat Sep  2 05:10:19 2006
-@@ -494,6 +494,10 @@
- 	if not filename:
- 		filename = __getFileName("applications.menu")
+--- xdg/Menu.py.orig	2008-06-02 05:29:42.000000000 -0400
++++ xdg/Menu.py	2008-08-16 14:59:55.000000000 -0400
+@@ -495,6 +495,9 @@ def parse(filename=None):
+         filename = __getFileName("applications.menu")
  
-+	# use gnome if no filename given
-+	if not filename:
-+		filename = __getFileName("gnome-applications.menu")
+     if not filename:
++	filename = __getFilename("gnome-applications.menu")
 +
- 	if not filename:
- 		raise ParsingError('File not found', "/etc/xdg/menus/applications.menu")
++    if not filename:
+         raise ParsingError('File not found', "/etc/xdg/menus/applications.menu")
  
+     # check if it is a .menu file