Update to 2.76

Various rc script tidying

PR:		ports/175255
Submitted by:	Sayetsky Anton <vsjcfm@gmail.com>

4 files changed, 18 insertions, 10 deletions

diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index 468901ffc338..1ac13bd47c33 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	transmission
-PORTVERSION=	2.75
+PORTVERSION=	2.76
 PORTREVISION?=	0
 CATEGORIES?=	net-p2p
 #MASTER_SITES=	http://download.m0k.org/${PORTNAME}/files/
@@ -19,7 +19,7 @@ OPTIONS_DEFINE=	LITE
 
 .include <bsd.port.options.mk>
 
-.if ${SLAVEPORT}!="web"
+.if ${SLAVEPORT} != web
 LIB_DEPENDS?=	${GEN_LIB_DEPENDS}
 
 # General dependencies
@@ -50,7 +50,7 @@ MAN1?=		transmission-cli.1 transmission-create.1 transmission-edit.1 \
 EXTRA_PATCHES=	${PATCHDIR}/disable-web
 .endif
 
-USE_XZ=	yes
+USE_XZ=		yes
 
 DOCS=		AUTHORS COPYING NEWS README
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
@@ -58,7 +58,7 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 general-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g'
-.if ${SLAVEPORT}!="gtk2"
+.if ${SLAVEPORT} != gtk2
 	@${REINPLACE_CMD} -e '/#define DISABLE_GETTEXT/s,/\* \(.*\) \*/,\1,' \
 		${WRKSRC}/libtransmission/utils.h
 .endif
@@ -69,7 +69,7 @@ general-patch:
 			${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|doc \\| \\|g' \
 		${WRKSRC}/Makefile.in
-.if ${SLAVEPORT}!="cli"
+.if ${SLAVEPORT} != cli
 	@${REINPLACE_CMD} -e 's|utils \\|\\|g' \
 		${WRKSRC}/Makefile.in
 .endif
diff --git a/net-p2p/transmission-cli/distinfo b/net-p2p/transmission-cli/distinfo
index 7eec7dd9c64f..d4cf156c8db1 100644
--- a/net-p2p/transmission-cli/distinfo
+++ b/net-p2p/transmission-cli/distinfo
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.75.tar.xz) = 2869f9a5c1202fa1b65dbf60ffae9e4cad7d6e2fff0de55416a761e60d894a66
-SIZE (transmission-2.75.tar.xz) = 2986844
+SHA256 (transmission-2.76.tar.xz) = 02c8c47da5b5567f9018d4a1fdad585cff58d315bd2a544da71e7bd473853b33
+SIZE (transmission-2.76.tar.xz) = 2954220
diff --git a/net-p2p/transmission-cli/files/transmission.in b/net-p2p/transmission-cli/files/transmission.in
index 41a2d743d54a..bd90f256ce94 100644
--- a/net-p2p/transmission-cli/files/transmission.in
+++ b/net-p2p/transmission-cli/files/transmission.in
@@ -38,7 +38,7 @@ load_rc_config $name
 transmission_group=${transmission_group:-$transmission_user}
 
 command=%%PREFIX%%/bin/transmission-daemon
-pidfile=/var/run/transmission/damon.pid
+pidfile=/var/run/transmission/daemon.pid
 start_precmd=transmission_prestart
 
 transmission_flags=" \
@@ -55,11 +55,19 @@ transmission_prestart()
 	chown $transmission_user:$transmission_group $transmission_download_dir
 	chown -R $transmission_user:$transmission_group $transmission_conf_dir/*
 	chgrp $transmission_group $transmission_conf_dir
-	chmod 1770 $transmission_conf_dir
+	chmod 750 $transmission_conf_dir
 	if [ -n "$transmission_web_home" ]; then
 		TRANSMISSION_WEB_HOME=$transmission_web_home
 		export TRANSMISSION_WEB_HOME
 	fi
 }
 
+# Unfortunately there was a typo in a previous version, which may have
+# left some people with /var/run/transmission/damon.pid .  Deal with
+# this for a few months at least, until everyone will have restarted
+# transmission
+if [ ! -f $pidfile -a -f /var/run/transmission/damon.pid ]; then
+	pidfile=/var/run/transmission/damon.pid
+fi
+
 run_rc_command $1
diff --git a/net-p2p/transmission/Makefile b/net-p2p/transmission/Makefile
index 8041df654ec2..a0539793feff 100644
--- a/net-p2p/transmission/Makefile
+++ b/net-p2p/transmission/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	transmission
-PORTVERSION=	2.75
+PORTVERSION=	2.76
 CATEGORIES=	net-p2p
 MASTER_SITES=	# empty
 DISTFILES=	# empty