From owner-svn-ports-all@freebsd.org Sat Nov 3 22:15:40 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4701810E9C6B; Sat, 3 Nov 2018 22:15:40 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F8266C9FE; Sat, 3 Nov 2018 22:15:39 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2D5561FAE9; Sat, 3 Nov 2018 22:15:39 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA3MFdFq038283; Sat, 3 Nov 2018 22:15:39 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA3MFcGo038281; Sat, 3 Nov 2018 22:15:38 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201811032215.wA3MFcGo038281@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 3 Nov 2018 22:15:38 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/audio: . icecast icecast/files icecast2 X-SVN-Commit-Revision: 483913 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4F8266C9FE X-Spamd-Result: default: False [-0.11 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Nov 2018 22:15:40 -0000 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 # $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" #