Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Nov 2018 22:15:38 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r483913 - in head/audio: . icecast icecast/files icecast2
Message-ID:  <201811032215.wA3MFcGo038281@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sat Nov  3 22:15:38 2018
New Revision: 483913
URL: https://svnweb.freebsd.org/changeset/ports/483913

Log:
  Move audio/icecast2 to audio/icecast
  
  - Clean up Makefile
  - Bump PORTREVISION for package change

Added:
  head/audio/icecast/
     - copied from r483912, head/audio/icecast2/
  head/audio/icecast/files/icecast.in
     - copied, changed from r483912, head/audio/icecast2/files/icecast2.in
Deleted:
  head/audio/icecast/files/icecast2.in
  head/audio/icecast2/
Modified:
  head/audio/Makefile
  head/audio/icecast/Makefile

Modified: head/audio/Makefile
==============================================================================
--- head/audio/Makefile	Sat Nov  3 21:54:52 2018	(r483912)
+++ head/audio/Makefile	Sat Nov  3 22:15:38 2018	(r483913)
@@ -336,8 +336,8 @@
     SUBDIR += hs-libmpd
     SUBDIR += hts_engine-API
     SUBDIR += hydrogen
+    SUBDIR += icecast
     SUBDIR += icecast-kh
-    SUBDIR += icecast2
     SUBDIR += icegenerator
     SUBDIR += ices
     SUBDIR += id3ed

Modified: head/audio/icecast/Makefile
==============================================================================
--- head/audio/icecast2/Makefile	Sat Nov  3 21:54:52 2018	(r483912)
+++ head/audio/icecast/Makefile	Sat Nov  3 22:15:38 2018	(r483913)
@@ -1,18 +1,19 @@
 # Created by: Chip Marshall <chip@eboai.org>
 # $FreeBSD$
 
-PORTNAME=	icecast2
+PORTNAME=	icecast
 PORTVERSION=	2.4.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	audio net ipv6
 MASTER_SITES=	http://downloads.xiph.org/releases/icecast/:source \
 		http://svn.xiph.org/releases/icecast/:source \
 		LOCAL/sunpoet/icecast:icon,source \
 		http://www.icecast.org/:icon
-DISTFILES=	icecast-${PORTVERSION}${EXTRACT_SUFX}:source \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:source \
 		favicon.ico:icon
 DIST_SUBDIR=	icecast
-EXTRACT_ONLY=	icecast-${PORTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Streaming mp3/ogg-vorbis audio server
@@ -29,18 +30,15 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 
 OPTIONS_DEFINE=	DOCS
 
+USES=		cpe gmake localbase
+
 CONFIGURE_ENV=	OGG_PREFIX=${LOCALBASE}
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	${PORTNAME}
-USES=		cpe gmake
-WRKSRC=		${WRKDIR}/icecast-${PORTVERSION}
 
-DATADIR=	${PREFIX}/share/icecast
-DOCSDIR=	${PREFIX}/share/doc/icecast
 SUB_FILES=	pkg-message
 
 CPE_VENDOR=	xiph
-CPE_PRODUCT=	icecast
 
 post-install:
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/favicon.ico ${STAGEDIR}${DATADIR}/web/

Copied and modified: head/audio/icecast/files/icecast.in (from r483912, head/audio/icecast2/files/icecast2.in)
==============================================================================
--- head/audio/icecast2/files/icecast2.in	Sat Nov  3 21:54:52 2018	(r483912, copy source)
+++ head/audio/icecast/files/icecast.in	Sat Nov  3 22:15:38 2018	(r483913)
@@ -3,12 +3,12 @@
 # $FreeBSD$
 #
 
-# PROVIDE: icecast2
+# PROVIDE: icecast
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
 # KEYWORD: shutdown
 
-# Add the following line to /etc/rc.conf to enable `icecast2'.
+# Add the following line to /etc/rc.conf to enable `icecast'.
 #
 #icecast_enable="YES"
 #



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