diff --git a/devel/py-xdg/Makefile b/devel/py-xdg/Makefile index cfbe2a3990f..42e77b9ffb3 100644 --- a/devel/py-xdg/Makefile +++ b/devel/py-xdg/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.2 2008/04/17 16:54:52 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.3 2008/10/30 14:19:24 ajacoutot Exp $ COMMENT= python library to access freedesktop.org standards -MODPY_EGG_VERSION= 0.15 +MODPY_EGG_VERSION= 0.16 DISTNAME= pyxdg-${MODPY_EGG_VERSION} -PKGNAME= py-xdg-${MODPY_EGG_VERSION}p0 +PKGNAME= py-xdg-${MODPY_EGG_VERSION} CATEGORIES= devel @@ -24,7 +24,6 @@ MODULES= lang/python NO_REGRESS= Yes pre-configure: - @perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g;' \ - -e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g' ${WRKSRC}/xdg/*.py + ${SUBST_CMD} ${WRKSRC}/xdg/BaseDirectory.py .include diff --git a/devel/py-xdg/distinfo b/devel/py-xdg/distinfo index fc56bea7683..06bb0225e66 100644 --- a/devel/py-xdg/distinfo +++ b/devel/py-xdg/distinfo @@ -1,5 +1,5 @@ -MD5 (pyxdg-0.15.tar.gz) = hqVEEoX8kIFFQUtjNI0Row== -RMD160 (pyxdg-0.15.tar.gz) = DwBMVHgsSUPhmWjpx6OzXPcCwRA= -SHA1 (pyxdg-0.15.tar.gz) = 6FYqwWILtEe0DJEaHhutj5shAXs= -SHA256 (pyxdg-0.15.tar.gz) = wq3yCVXLYq9clGItDdR/uC7mPaM8A9Wh+CM3uoMES7c= -SIZE (pyxdg-0.15.tar.gz) = 36465 +MD5 (pyxdg-0.16.tar.gz) = VbcewN+VCeBeVirEArEZ9w== +RMD160 (pyxdg-0.16.tar.gz) = ak/R6+eg9Qyd3rT4ofZ4nRuoJO4= +SHA1 (pyxdg-0.16.tar.gz) = Ml27LPsS9Zh3MHAi9qqAPn8IGfA= +SHA256 (pyxdg-0.16.tar.gz) = t/kc7JtCQEpoDHgMQNN8glcB1+UzwQQ7ur9qBVHoZjU= +SIZE (pyxdg-0.16.tar.gz) = 37284 diff --git a/devel/py-xdg/patches/patch-xdg_BaseDirectory_py b/devel/py-xdg/patches/patch-xdg_BaseDirectory_py index 55cc6125477..ff1c03bd543 100644 --- a/devel/py-xdg/patches/patch-xdg_BaseDirectory_py +++ b/devel/py-xdg/patches/patch-xdg_BaseDirectory_py @@ -1,19 +1,19 @@ -$OpenBSD: patch-xdg_BaseDirectory_py,v 1.2 2008/04/17 16:54:52 ajacoutot Exp $ ---- xdg/BaseDirectory.py.orig Thu May 26 23:46:05 2005 -+++ xdg/BaseDirectory.py Thu Apr 17 17:17:39 2008 +$OpenBSD: patch-xdg_BaseDirectory_py,v 1.3 2008/10/30 14:19:24 ajacoutot Exp $ +--- xdg/BaseDirectory.py.orig Thu Oct 30 15:11:27 2008 ++++ xdg/BaseDirectory.py Thu Oct 30 15:11:58 2008 @@ -33,13 +33,13 @@ xdg_data_home = os.environ.get('XDG_DATA_HOME', - os.path.join(_home, '.local', 'share')) + 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:/usr/share').split(':') +- os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':') ++ os.environ.get('XDG_DATA_DIRS', '${LOCALBASE}/share:/usr/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', '!!SYSCONFDIR!!/xdg').split(':') +- os.environ.get('XDG_CONFIG_DIRS', '/etc/xdg').split(':') ++ os.environ.get('XDG_CONFIG_DIRS', '${SYSCONFDIR}/xdg').split(':') xdg_cache_home = os.environ.get('XDG_CACHE_HOME', - os.path.join(_home, '.cache')) + os.path.join(_home, '.cache')) diff --git a/devel/py-xdg/patches/patch-xdg_IconTheme_py b/devel/py-xdg/patches/patch-xdg_IconTheme_py deleted file mode 100644 index acec336fb7b..00000000000 --- a/devel/py-xdg/patches/patch-xdg_IconTheme_py +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-xdg_IconTheme_py,v 1.1.1.1 2008/04/16 12:05:28 jasper Exp $ ---- xdg/IconTheme.py.orig Thu Aug 4 11:12:30 2005 -+++ xdg/IconTheme.py Tue Apr 15 16:04:40 2008 -@@ -215,7 +215,7 @@ class IconData(IniFile): - 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(os.path.expanduser("~/.icons")) - - # just cache variables, they give a 10x speed improvement diff --git a/devel/py-xdg/patches/patch-xdg_Menu_py b/devel/py-xdg/patches/patch-xdg_Menu_py deleted file mode 100644 index 79c6564f19f..00000000000 --- a/devel/py-xdg/patches/patch-xdg_Menu_py +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-xdg_Menu_py,v 1.1.1.1 2008/04/16 12:05:28 jasper Exp $ ---- xdg/Menu.py.orig Thu Aug 11 13:37:48 2005 -+++ xdg/Menu.py Tue Apr 15 16:09:30 2008 -@@ -494,8 +494,12 @@ def parse(filename=None): - if not filename: - filename = __getFileName("applications.menu") - -+ # use gnome's if no filename given - if not filename: -- raise ParsingError('File not found', "/etc/xdg/menus/applications.menu") -+ filename = __getFileName("gnome-applications.menu") -+ -+ if not filename: -+ raise ParsingError('File not found', "!!SYSCONFDIR!!/xdg/menus/applications.menu") - - # check if it is a .menu file - if not os.path.splitext(filename)[1] == ".menu": diff --git a/devel/py-xdg/pkg/PLIST b/devel/py-xdg/pkg/PLIST index 0283d334e74..87b2a54d3c6 100644 --- a/devel/py-xdg/pkg/PLIST +++ b/devel/py-xdg/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2008/04/16 12:05:28 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.2 2008/10/30 14:19:24 ajacoutot Exp $ lib/python${MODPY_VERSION}/site-packages/pyxdg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info lib/python${MODPY_VERSION}/site-packages/xdg/ lib/python${MODPY_VERSION}/site-packages/xdg/BaseDirectory.py @@ -6,7 +6,6 @@ lib/python${MODPY_VERSION}/site-packages/xdg/BaseDirectory.pyc lib/python${MODPY_VERSION}/site-packages/xdg/Config.py lib/python${MODPY_VERSION}/site-packages/xdg/Config.pyc lib/python${MODPY_VERSION}/site-packages/xdg/DesktopEntry.py -lib/python${MODPY_VERSION}/site-packages/xdg/DesktopEntry.pyc lib/python${MODPY_VERSION}/site-packages/xdg/Exceptions.py lib/python${MODPY_VERSION}/site-packages/xdg/Exceptions.pyc lib/python${MODPY_VERSION}/site-packages/xdg/IconTheme.py