svn commit: r315885 - in head/net/get_iplayer: . files

[Chris Rees]

Author: crees
Date: Tue Apr 16 18:54:41 2013
New Revision: 315885
URL: http://svnweb.freebsd.org/changeset/ports/315885

Log:
  Update to 2.82
  
  Remove incredibly naive pkg-deinstall script, and do general cleaning up
  
  Reminded by:	Stefan Bethke <stb at lassitu.de>
  Feature safe:	yes

Deleted:
  head/net/get_iplayer/pkg-deinstall
Modified:
  head/net/get_iplayer/Makefile
  head/net/get_iplayer/distinfo
  head/net/get_iplayer/files/get_iplayer.in

Modified: head/net/get_iplayer/Makefile
==============================================================================
--- head/net/get_iplayer/Makefile	Tue Apr 16 18:46:09 2013	(r315884)
+++ head/net/get_iplayer/Makefile	Tue Apr 16 18:54:41 2013	(r315885)
@@ -1,16 +1,10 @@
-# Ports collection Makefile for:	get_iplayer
-# Date created:				2nd March 2011
-# Whom:					Chris Rees <utisoft at gmail.com>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	get_iplayer
-PORTVERSION=	2.80
+PORTVERSION=	2.82
 CATEGORIES=	net multimedia
 MASTER_SITES=	ftp://ftp.infradead.org/pub/${PORTNAME}/ \
 		http://www.bayofrum.net/dist/${PORTNAME}/
-PKGNAMEPREFIX=	uk-
 
 MAINTAINER=	crees at FreeBSD.org
 COMMENT=	Search, index, or stream archive video from BBC iPlayer
@@ -22,25 +16,21 @@ NO_BUILD=	yes
 
 USE_RC_SUBR=	${PORTNAME}
 
-USERS  =	get_iplayer
-GROUPS =	get_iplayer
+USERS=		get_iplayer
+GROUPS=		get_iplayer
 
-MAN1=	get_iplayer.1
+MAN1=		get_iplayer.1
 
 SCRIPTS=	${PORTNAME} ${PORTNAME}.cgi
-PLIST_FILES=	bin/${PORTNAME} ${SCRIPTS:C,^,${WWWDIR_REL}/,}
+PLIST_FILES=	bin/${PORTNAME} ${SCRIPTS:S,^,${WWWDIR_REL}/,}
 
-.if !defined(NOPORTDATA)
 DATADIR=	${WWWDIR}
 PORTDATA=	html plugins
-.else
-PLIST_DIRS=	${WWWDIR_REL}
-.endif
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	CHANGELOG-get_iplayer.cgi.txt CHANGELOG.txt \
 		README-get_iplayer.cgi.txt README.txt web.sh
-.endif
+
+.include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e "s|/usr/bin/get_iplayer|${PREFIX}/bin/${PORTNAME}|" \
@@ -51,18 +41,16 @@ post-patch:
 		${WRKSRC}/get_iplayer
 
 do-install:
-	@${MKDIR} ${WWWDIR}
-	@(cd ${WRKSRC}; ${INSTALL_SCRIPT} ${SCRIPTS} ${WWWDIR})
-	@${LN} -sf ${WWWDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
-	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1
-.if !defined(NOPORTDATA)
+	${MKDIR} ${WWWDIR}
+	(cd ${WRKSRC}; ${INSTALL_SCRIPT} ${SCRIPTS} ${WWWDIR})
+	${LN} -sf ${WWWDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1
 .for DIR in html plugins
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${DIR} ${WWWDIR})
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} ${DIR} ${WWWDIR})
 .endfor
-.endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	(cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
 .endif
 
 post-install:

Modified: head/net/get_iplayer/distinfo
==============================================================================
--- head/net/get_iplayer/distinfo	Tue Apr 16 18:46:09 2013	(r315884)
+++ head/net/get_iplayer/distinfo	Tue Apr 16 18:54:41 2013	(r315885)
@@ -1,2 +1,2 @@
-SHA256 (get_iplayer-2.80.tar.gz) = c849afec269e7be3e9cd8ce73b54f79bc398ae1d584c07c35e43b1ef7d6ecac2
-SIZE (get_iplayer-2.80.tar.gz) = 230377
+SHA256 (get_iplayer-2.82.tar.gz) = d5841aa402f3856fb3b4b290a3bb6d68447143dd8bc3e4a911a546e876b7bd27
+SIZE (get_iplayer-2.82.tar.gz) = 248177

Modified: head/net/get_iplayer/files/get_iplayer.in
==============================================================================
--- head/net/get_iplayer/files/get_iplayer.in	Tue Apr 16 18:46:09 2013	(r315884)
+++ head/net/get_iplayer/files/get_iplayer.in	Tue Apr 16 18:54:41 2013	(r315885)
@@ -27,26 +27,21 @@
 
 . /etc/rc.subr
 
-name="get_iplayer"
+name=get_iplayer
 rcvar=get_iplayer_enable
 
 load_rc_config $name
 
-: ${get_iplayer_enable="NO"}
-: ${get_iplayer_bind_port="9370"}
-: ${get_iplayer_listen_address="127.0.0.1"}
-: ${get_iplayer_chdir="/tmp"}
+: ${get_iplayer_enable:=NO}
+: ${get_iplayer_bind_port=9370}
+: ${get_iplayer_listen_address=127.0.0.1}
+: ${get_iplayer_chdir=/tmp}
 
-command="/usr/sbin/daemon"
+command=/usr/sbin/daemon
 command_args="-f -u ${name} -p /var/run/${name}/${name}.pid %%WWWDIR%%/${name}.cgi -p ${get_iplayer_bind_port} -l ${get_iplayer_listen_address} --getiplayer %%WWWDIR%%/${name}"
-procname="/usr/bin/perl"
-pidfile="/var/run/${name}/${name}.pid"
+procname=/usr/bin/perl
+pidfile=/var/run/${name}/${name}.pid
 
-start_precmd="${name}_prestart"
-
-get_iplayer_prestart()
-{
-	install -d -o ${name} -m755 /var/run/${name}
-}
+start_precmd="install -d -o ${name} -m755 /var/run/${name}"
 
 run_rc_command "$1"