Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Feb 2015 20:09:25 +0000 (UTC)
From:      Sean Bruno <sbruno@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r380119 - head/audio/shoutcast
Message-ID:  <201502272009.t1RK9Pnr073280@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sbruno
Date: Fri Feb 27 20:09:25 2015
New Revision: 380119
URL: https://svnweb.freebsd.org/changeset/ports/380119
QAT: https://qat.redports.org/buildarchive/r380119/

Log:
  - Remove bash dependency and change the two scripts that are invoking bash to sh.
  - Actually install the two scripts in the package.  bug.
  - Install these two scripts when the CONFIG BUILDER option is set.
  - Bump portrevision.
  
  Submitted by:	Mike Brown <mike@skew.org>

Modified:
  head/audio/shoutcast/Makefile
  head/audio/shoutcast/pkg-plist

Modified: head/audio/shoutcast/Makefile
==============================================================================
--- head/audio/shoutcast/Makefile	Fri Feb 27 19:35:09 2015	(r380118)
+++ head/audio/shoutcast/Makefile	Fri Feb 27 20:09:25 2015	(r380119)
@@ -3,7 +3,7 @@
 
 PORTNAME=	shoutcast
 PORTVERSION=	2.4.2.167
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio net
 MASTER_SITES=	http://download.nullsoft.com/shoutcast/tools/
 DISTNAME=	sc_serv2_bsd-latest
@@ -11,13 +11,12 @@ DISTNAME=	sc_serv2_bsd-latest
 MAINTAINER=	sbruno@FreeBSD.org
 COMMENT=	SHOUTcast Distributed Network Audio Server
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-
 RESTRICTED=	redistribution of software is not permitted
 IA32_BINARY_PORT=	yes
 
 USES=		dos2unix shebangfix
 DOS2UNIX_REGEX=	.*\.(conf|css|html|js|txt|xml)
+bash_CMD=	${SH}
 SHEBANG_FILES=	builder.sh setup.sh
 
 USE_RC_SUBR=	shoutcast
@@ -84,8 +83,6 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sc_serv ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/builder.sh ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/setup.sh ${STAGEDIR}${PREFIX}/sbin
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${SHOUTCASTLDIR}
 	${MKDIR} ${STAGEDIR}${SHOUTCASTDIR}
@@ -151,6 +148,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/config_builder/config_builder.txt ${STAGEDIR}${WWWDIR}/config_builder/config_builder.txt
 	${INSTALL_DATA} ${WRKSRC}/config_builder/config_builder.js ${STAGEDIR}${WWWDIR}/config_builder/config_builder.js
 	${INSTALL_DATA} ${WRKSRC}/config_builder/config_builder.css ${STAGEDIR}${WWWDIR}/config_builder/config_builder.css
+	${INSTALL_DATA} ${WRKSRC}/builder.sh ${STAGEDIR}${WWWDIR}/config_builder/builder.sh
+	${INSTALL_DATA} ${WRKSRC}/setup.sh ${STAGEDIR}${WWWDIR}/config_builder/setup.sh
 .endif
 
 .include <bsd.port.mk>

Modified: head/audio/shoutcast/pkg-plist
==============================================================================
--- head/audio/shoutcast/pkg-plist	Fri Feb 27 19:35:09 2015	(r380118)
+++ head/audio/shoutcast/pkg-plist	Fri Feb 27 20:09:25 2015	(r380119)
@@ -53,6 +53,8 @@ sbin/sc_serv
 %%CONFIG_BUILDER%%%%WWWDIR%%/config_builder/config_builder.txt
 %%CONFIG_BUILDER%%%%WWWDIR%%/config_builder/config_builder.js
 %%CONFIG_BUILDER%%%%WWWDIR%%/config_builder/config_builder.css
+%%CONFIG_BUILDER%%%%WWWDIR%%/config_builder/builder.sh
+%%CONFIG_BUILDER%%%%WWWDIR%%/config_builder/setup.sh
 
 @dirrmtry %%ETCDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/res



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