Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 15 Dec 2013 22:22:21 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r336591 - in head/security/py-volatility: . files
Message-ID:  <201312152222.rBFMMLMu016719@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Sun Dec 15 22:22:21 2013
New Revision: 336591
URL: http://svnweb.freebsd.org/changeset/ports/336591

Log:
  - switch from easy_install to install
  - stage support
  - use PYDISTUTILS_AUTOPLIST

Added:
  head/security/py-volatility/files/
  head/security/py-volatility/files/patch-setup.py   (contents, props changed)
Deleted:
  head/security/py-volatility/pkg-plist
Modified:
  head/security/py-volatility/Makefile

Modified: head/security/py-volatility/Makefile
==============================================================================
--- head/security/py-volatility/Makefile	Sun Dec 15 22:14:40 2013	(r336590)
+++ head/security/py-volatility/Makefile	Sun Dec 15 22:22:21 2013	(r336591)
@@ -19,20 +19,23 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dist
 		${PYTHON_PKGNAMEPREFIX}openpyxl>=0:${PORTSDIR}/textproc/py-openpyxl
 
 USE_PYTHON=	-2.7
-USE_PYDISTUTILS=easy_install
+USE_PYDISTUTILS=yes
+PYDISTUTILS_AUTOPLIST=yes
 
 OPTIONS_DEFINE=	DOCS
 
+DATADIR=	${PREFIX}/share/py-${PORTNAME}
 PORTDOCS=	AUTHORS.txt CHANGELOG.txt CREDITS.txt README.txt
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
+
+PYDISTUTILS_INSTALLARGS+=--install-data ${DATADIR}
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Added: head/security/py-volatility/files/patch-setup.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/py-volatility/files/patch-setup.py	Sun Dec 15 22:22:21 2013	(r336591)
@@ -0,0 +1,14 @@
+--- ./setup.py.orig	2013-10-15 14:55:22.000000000 +0000
++++ ./setup.py	2013-12-15 21:41:37.000000000 +0000
+@@ -45,7 +45,10 @@
+     ret = []
+     for topdir in topdirs:
+         for r, _ds, fs in os.walk(topdir):
+-            ret.append((r, [ os.path.join(r, f) for f in fs if (f.endswith('.py') or not py)]))
++            fl = [ os.path.join(r, f) for f in fs if (f.endswith('.py') or not py)]
++            # Do not record directories (with no regular files inside)
++            if len(fl) > 0:
++                ret.append((r, fl))
+     return ret
+ 
+ opts = {}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312152222.rBFMMLMu016719>