From owner-svn-ports-head@FreeBSD.ORG  Sun Jun 16 13:50:55 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A15C24C7;
 Sun, 16 Jun 2013 13:50:55 +0000 (UTC) (envelope-from rm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 796151998;
 Sun, 16 Jun 2013 13:50:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5GDotj2041456;
 Sun, 16 Jun 2013 13:50:55 GMT (envelope-from rm@svn.freebsd.org)
Received: (from rm@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5GDosnE041453;
 Sun, 16 Jun 2013 13:50:54 GMT (envelope-from rm@svn.freebsd.org)
Message-Id: <201306161350.r5GDosnE041453@svn.freebsd.org>
From: Ruslan Makhmatkhanov <rm@FreeBSD.org>
Date: Sun, 16 Jun 2013 13:50:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r321048 - in head/finance/electrum: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Jun 2013 13:50:55 -0000

Author: rm
Date: Sun Jun 16 13:50:54 2013
New Revision: 321048
URL: http://svnweb.freebsd.org/changeset/ports/321048

Log:
  - change another file, forgotten in previous commit, to make this
    port actually respect PREFIX
  - sort pkg-plist, while here

Modified:
  head/finance/electrum/Makefile
  head/finance/electrum/files/patch-lib__util.py
  head/finance/electrum/pkg-plist

Modified: head/finance/electrum/Makefile
==============================================================================
--- head/finance/electrum/Makefile	Sun Jun 16 13:50:54 2013	(r321047)
+++ head/finance/electrum/Makefile	Sun Jun 16 13:50:54 2013	(r321048)
@@ -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 <bsd.port.mk>

Modified: head/finance/electrum/files/patch-lib__util.py
==============================================================================
--- head/finance/electrum/files/patch-lib__util.py	Sun Jun 16 13:50:54 2013	(r321047)
+++ head/finance/electrum/files/patch-lib__util.py	Sun Jun 16 13:50:54 2013	(r321048)
@@ -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"):

Modified: head/finance/electrum/pkg-plist
==============================================================================
--- head/finance/electrum/pkg-plist	Sun Jun 16 13:50:54 2013	(r321047)
+++ head/finance/electrum/pkg-plist	Sun Jun 16 13:50:54 2013	(r321048)
@@ -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