From owner-svn-ports-head@FreeBSD.ORG Wed Jan 16 19:01:16 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 88E3050E; Wed, 16 Jan 2013 19:01:16 +0000 (UTC) (envelope-from crees@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 7A5B733B; Wed, 16 Jan 2013 19:01:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0GJ1G33021926; Wed, 16 Jan 2013 19:01:16 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0GJ1FrI021921; Wed, 16 Jan 2013 19:01:15 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201301161901.r0GJ1FrI021921@svn.freebsd.org> From: Chris Rees Date: Wed, 16 Jan 2013 19:01:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310511 - in head/net-p2p: transmission transmission-cli transmission-cli/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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2013 19:01:16 -0000 Author: crees Date: Wed Jan 16 19:01:15 2013 New Revision: 310511 URL: http://svnweb.freebsd.org/changeset/ports/310511 Log: Update to 2.76 Various rc script tidying PR: ports/175255 Submitted by: Sayetsky Anton Modified: head/net-p2p/transmission-cli/Makefile head/net-p2p/transmission-cli/distinfo head/net-p2p/transmission-cli/files/transmission.in head/net-p2p/transmission/Makefile Modified: head/net-p2p/transmission-cli/Makefile ============================================================================== --- head/net-p2p/transmission-cli/Makefile Wed Jan 16 18:58:29 2013 (r310510) +++ head/net-p2p/transmission-cli/Makefile Wed Jan 16 19:01:15 2013 (r310511) @@ -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 -.if ${SLAVEPORT}!="web" +.if ${SLAVEPORT} != web LIB_DEPENDS?= ${GEN_LIB_DEPENDS} # General dependencies @@ -50,7 +50,7 @@ MAN1?= transmission-cli.1 transmission- 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} 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 Modified: head/net-p2p/transmission-cli/distinfo ============================================================================== --- head/net-p2p/transmission-cli/distinfo Wed Jan 16 18:58:29 2013 (r310510) +++ head/net-p2p/transmission-cli/distinfo Wed Jan 16 19:01:15 2013 (r310511) @@ -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 Modified: head/net-p2p/transmission-cli/files/transmission.in ============================================================================== --- head/net-p2p/transmission-cli/files/transmission.in Wed Jan 16 18:58:29 2013 (r310510) +++ head/net-p2p/transmission-cli/files/transmission.in Wed Jan 16 19:01:15 2013 (r310511) @@ -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 Modified: head/net-p2p/transmission/Makefile ============================================================================== --- head/net-p2p/transmission/Makefile Wed Jan 16 18:58:29 2013 (r310510) +++ head/net-p2p/transmission/Makefile Wed Jan 16 19:01:15 2013 (r310511) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= transmission -PORTVERSION= 2.75 +PORTVERSION= 2.76 CATEGORIES= net-p2p MASTER_SITES= # empty DISTFILES= # empty