From 4cf9a3a01ebc8c9df23d0fec4ff9679056cb8363 Mon Sep 17 00:00:00 2001 From: rm Date: Sun, 16 Jun 2013 13:50:54 +0000 Subject: - change another file, forgotten in previous commit, to make this port actually respect PREFIX - sort pkg-plist, while here --- finance/electrum/Makefile | 3 ++- finance/electrum/files/patch-lib__util.py | 2 +- finance/electrum/pkg-plist | 16 ++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) (limited to 'finance') diff --git a/finance/electrum/Makefile b/finance/electrum/Makefile index 56d34162982b..ec241f87895f 100644 --- a/finance/electrum/Makefile +++ b/finance/electrum/Makefile @@ -21,6 +21,7 @@ USE_PYDISTUTILS=yes PYDISTUTILS_PKGNAME= Electrum post-patch: - @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/setup.py + @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ + ${WRKSRC}/setup.py ${WRKSRC}/lib/util.py .include diff --git a/finance/electrum/files/patch-lib__util.py b/finance/electrum/files/patch-lib__util.py index e8347d0e2ef0..2cbc66f006d6 100644 --- a/finance/electrum/files/patch-lib__util.py +++ b/finance/electrum/files/patch-lib__util.py @@ -6,7 +6,7 @@ return os.path.join(sys.prefix, "share", "electrum") + elif (sys.platform.startswith("dragonfly") or + sys.platform.startswith("freebsd")): -+ return os.path.join(sys.prefix, "share", "electrum") ++ return os.path.join('%%PREFIX%%', "share", "electrum") elif (platform.system() == "Darwin" or - platform.system() == "DragonFly" or platform.system() == "NetBSD"): diff --git a/finance/electrum/pkg-plist b/finance/electrum/pkg-plist index a0dc7db62993..4f676ee97a7b 100644 --- a/finance/electrum/pkg-plist +++ b/finance/electrum/pkg-plist @@ -110,9 +110,6 @@ bin/electrum %%PYTHON_SITELIBDIR%%/electrum_plugins/virtualkeyboard.py %%PYTHON_SITELIBDIR%%/electrum_plugins/virtualkeyboard.pyc %%PYTHON_SITELIBDIR%%/electrum_plugins/virtualkeyboard.pyo -@dirrm %%PYTHON_SITELIBDIR%%/electrum_plugins -@dirrm %%PYTHON_SITELIBDIR%%/electrum_gui -@dirrm %%PYTHON_SITELIBDIR%%/electrum share/app-install/icons/electrum.png share/applications/electrum.desktop share/electrum/README @@ -138,10 +135,13 @@ share/locale/sl/LC_MESSAGES/electrum.mo share/locale/ta/LC_MESSAGES/electrum.mo share/locale/vi/LC_MESSAGES/electrum.mo share/locale/zh/LC_MESSAGES/electrum.mo -@dirrmtry share/app-install/icons -@dirrmtry share/app-install -@dirrmtry share/applications -@dirrm share/electrum/cleanlook -@dirrm share/electrum/dark @dirrm share/electrum/sahara +@dirrm share/electrum/dark +@dirrm share/electrum/cleanlook @dirrm share/electrum +@dirrmtry share/applications +@dirrmtry share/app-install/icons +@dirrmtry share/app-install +@dirrm %%PYTHON_SITELIBDIR%%/electrum_plugins +@dirrm %%PYTHON_SITELIBDIR%%/electrum_gui +@dirrm %%PYTHON_SITELIBDIR%%/electrum -- cgit