- Update to 1.4.4.1

- Make dependency on tor optional

Approved by:	glarkin@ (mentor)
Feature safe:	yes

3 files changed, 13 insertions, 62 deletions

diff --git a/security/arm/Makefile b/security/arm/Makefile
index b0c9af6680bd..a93763124012 100644
--- a/security/arm/Makefile
+++ b/security/arm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	arm
-DISTVERSION=	1.4.4.0
+DISTVERSION=	1.4.4.1
 CATEGORIES=	security net python
 MASTER_SITES=	https://archive.torproject.org/arm/ \
 		http://www.c-s.li/ports/
@@ -17,21 +17,26 @@ COMMENT=	A terminal status monitor for Tor
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof \
-		tor:${PORTSDIR}/security/tor
-
 MAN1=		arm.1
 MANCOMPRESSED=	yes
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
-PYDISTUTILS_PKGVERSION=1.4.4
 USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 PORTDOCS=	armrc.sample
 
+OPTIONS=	TOR "Install tor locally" On
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_TOR)
+RUN_DEPENDS+=	lsof:${PORTSDIR}/sysutils/lsof \
+		tor:${PORTSDIR}/security/tor
+.endif
+
 post-patch:
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's,/usr/share/doc/,${WRKSRC}/src,g' \
@@ -49,4 +54,4 @@ post-patch:
  		${WRKSRC}/arm ${WRKSRC}/setup.py ${WRKSRC}/src/uninstall \
 		${WRKSRC}/src/gui/controller.py
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/arm/distinfo b/security/arm/distinfo
index fb742aea2934..d577aa568932 100644
--- a/security/arm/distinfo
+++ b/security/arm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (arm-1.4.4.0.tar.bz2) = 62edbf6f77bb690871ede7b1d8d0b0616c1c0774a242bd81b901e0809fedcc67
-SIZE (arm-1.4.4.0.tar.bz2) = 310148
+SHA256 (arm-1.4.4.1.tar.bz2) = bdf4342d61d0f8a6395a5d7ee2e1471a5db9327c59d7cdc89315116045a3abf8
+SIZE (arm-1.4.4.1.tar.bz2) = 303468
diff --git a/security/arm/pkg-plist b/security/arm/pkg-plist
index fcb57c9b2894..087e09e21e45 100644
--- a/security/arm/pkg-plist
+++ b/security/arm/pkg-plist
@@ -43,57 +43,6 @@ bin/arm
 %%PYTHON_SITELIBDIR%%/arm/TorCtl/example.py
 %%PYTHON_SITELIBDIR%%/arm/TorCtl/example.pyc
 %%PYTHON_SITELIBDIR%%/arm/TorCtl/example.pyo
-%%PYTHON_SITELIBDIR%%/arm/cagraph/__init__.py
-%%PYTHON_SITELIBDIR%%/arm/cagraph/__init__.pyc
-%%PYTHON_SITELIBDIR%%/arm/cagraph/__init__.pyo
-%%PYTHON_SITELIBDIR%%/arm/cagraph/ca_graph.py
-%%PYTHON_SITELIBDIR%%/arm/cagraph/ca_graph.pyc
-%%PYTHON_SITELIBDIR%%/arm/cagraph/ca_graph.pyo
-%%PYTHON_SITELIBDIR%%/arm/cagraph/ca_graph_file.py
-%%PYTHON_SITELIBDIR%%/arm/cagraph/ca_graph_file.pyc
-%%PYTHON_SITELIBDIR%%/arm/cagraph/ca_graph_file.pyo
-%%PYTHON_SITELIBDIR%%/arm/cagraph/ca_graph_grid.py
-%%PYTHON_SITELIBDIR%%/arm/cagraph/ca_graph_grid.pyc
-%%PYTHON_SITELIBDIR%%/arm/cagraph/ca_graph_grid.pyo
-%%PYTHON_SITELIBDIR%%/arm/cagraph/axis/__init__.py
-%%PYTHON_SITELIBDIR%%/arm/cagraph/axis/__init__.pyc
-%%PYTHON_SITELIBDIR%%/arm/cagraph/axis/__init__.pyo
-%%PYTHON_SITELIBDIR%%/arm/cagraph/axis/axis.py
-%%PYTHON_SITELIBDIR%%/arm/cagraph/axis/axis.pyc
-%%PYTHON_SITELIBDIR%%/arm/cagraph/axis/axis.pyo
-%%PYTHON_SITELIBDIR%%/arm/cagraph/axis/taxis.py
-%%PYTHON_SITELIBDIR%%/arm/cagraph/axis/taxis.pyc
-%%PYTHON_SITELIBDIR%%/arm/cagraph/axis/taxis.pyo
-%%PYTHON_SITELIBDIR%%/arm/cagraph/axis/xaxis.py
-%%PYTHON_SITELIBDIR%%/arm/cagraph/axis/xaxis.pyc
-%%PYTHON_SITELIBDIR%%/arm/cagraph/axis/xaxis.pyo
-%%PYTHON_SITELIBDIR%%/arm/cagraph/axis/yaxis.py
-%%PYTHON_SITELIBDIR%%/arm/cagraph/axis/yaxis.pyc
-%%PYTHON_SITELIBDIR%%/arm/cagraph/axis/yaxis.pyo
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/__init__.py
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/__init__.pyc
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/__init__.pyo
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/area.py
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/area.pyc
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/area.pyo
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/bar.py
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/bar.pyc
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/bar.pyo
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/dna.py
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/dna.pyc
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/dna.pyo
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/hbar.py
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/hbar.pyc
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/hbar.pyo
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/labels.py
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/labels.pyc
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/labels.pyo
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/line.py
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/line.pyc
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/line.pyo
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/series.py
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/series.pyc
-%%PYTHON_SITELIBDIR%%/arm/cagraph/series/series.pyo
 %%PYTHON_SITELIBDIR%%/arm/cli/__init__.py
 %%PYTHON_SITELIBDIR%%/arm/cli/__init__.pyc
 %%PYTHON_SITELIBDIR%%/arm/cli/__init__.pyo
@@ -264,9 +213,6 @@ bin/arm
 %%PYTHON_SITELIBDIR%%/arm/util/uiTools.pyc
 %%PYTHON_SITELIBDIR%%/arm/util/uiTools.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/arm/TorCtl
-@dirrm %%PYTHON_SITELIBDIR%%/arm/cagraph/axis
-@dirrm %%PYTHON_SITELIBDIR%%/arm/cagraph/series
-@dirrm %%PYTHON_SITELIBDIR%%/arm/cagraph
 @dirrm %%PYTHON_SITELIBDIR%%/arm/cli/connections
 @dirrm %%PYTHON_SITELIBDIR%%/arm/cli/graphing
 @dirrm %%PYTHON_SITELIBDIR%%/arm/cli/menu