From nobody Tue Mar 01 15:33:41 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 76DE919EB1EA; Tue, 1 Mar 2022 15:33:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K7Lr52rYgz3mvm; Tue, 1 Mar 2022 15:33:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646148821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pP0PZw3uNt8AsK6VPaULXletK/JbXFz/uAP+63Ypnog=; b=okF6tnSXbkIlkMah7ijH184nbWAVFC7S3LALEpaCi3C+8Vs2KiQoUG58HF25Rg7AR0FtFk wneP96eyLAv2CcjDCWmarlC9pksNk0FL7mIaXDQgrBesitaVfvsrL9Nl9lZpfbUU+rVNVD 3k8D/s99ygPpygSO/ljBH3YuEKVcVB0nc92KExBB3eEQDCALsjkwxwQ3ADd1HjrHhWMck2 /ArpiwxzJ6TlVgRLF/ZeTgEwHiTtlDEaeKuyF2v36LgxzXCtz9AR+kGAkkpdvY3yyijCs5 ZDIJC/C7MQFXYQNDhEyjckdHWYxCjMueIB8yVoiboTptaHWl8VSE4kyi+PctMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 415C812499; Tue, 1 Mar 2022 15:33:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 221FXfig019568; Tue, 1 Mar 2022 15:33:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 221FXfOQ019567; Tue, 1 Mar 2022 15:33:41 GMT (envelope-from git) Date: Tue, 1 Mar 2022 15:33:41 GMT Message-Id: <202203011533.221FXfOQ019567@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: 3341ddfca4f9 - main - audio/darkice: Delete libaacplus List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3341ddfca4f9e59fb86c6519045d4c94adb13c02 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646148821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pP0PZw3uNt8AsK6VPaULXletK/JbXFz/uAP+63Ypnog=; b=NNTDjrSM5qD2K7cdP0rdNUXLaXpRFTNTqKlwQC6UexA3T7M8O+1w20KEtm8HpQ1fNVRLqf qd+alNdIAMgtMmHWDtJi+pWhMd8FfP//sbMTQJtHnHdyMfBs2U5XXVAgxp0ogaBNAHUuRG GjbiTYgAe71yGOYQ4fI3hwfV8qc//q6A6hlm5U8ERey9joQyU1wbtvXrLY0OMZrCk0riGw sCWfamvWkI99c+WzxUvx4nbUsGemZCQhM2bPZFnCdvT6BR+jibgEIFFS1gTSbeTTFmaKK8 C8XTSLEBkjO0hFZMnKt69dCoPprbdaTv1ywAwsSznkzW8M1CQyAClDfiM5Vhfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646148821; a=rsa-sha256; cv=none; b=GlKt9eIyjh2eqlVZAv/P/cd42KND2SYKstXvY1mAC8ek1gbPWtu9V9zQe/8RxcH4jCHlAt Gn5jsQG83hX784rrIzh+/fITrO+kjDGlXYpOc0fgMfZY1lOYbg680de3dTfBFefRJS3Ox2 ofnRmqWb7/P5gaZVB5KBRCkaRxNuF2gkTtzSsEsiY+XuDiLYEq3OdykLevQ/+1F8KYGN6V kx+2Ilw7BbRBFrU0Xt5IqnyeQ9qAGmtKoQr7nDhHe9EoNk3hRUesatHbbyrqkLLhwTM+bp WLtbCpdkRordDDjQ7xcPIxZFxlgS6baEPTBk77phUAdJhfDNpKYhztd8sWTMGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=3341ddfca4f9e59fb86c6519045d4c94adb13c02 commit 3341ddfca4f9e59fb86c6519045d4c94adb13c02 Author: Kenji Takefu AuthorDate: 2022-03-01 08:01:11 +0000 Commit: Fernando Apesteguía CommitDate: 2022-03-01 15:32:02 +0000 audio/darkice: Delete libaacplus * libaacplus has been abandoned * Add missing libogg dependency * Reporter becomes MAINTAINER PR: 262185 Reported by: takefu@airport.fm Reviewed by: decke@ koobs@ --- audio/darkice/Makefile | 31 +++++++++++++++++-------------- audio/darkice/files/darkice.in | 3 ++- audio/darkice/files/pkg-message.in | 12 +++--------- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile index b14674926b84..dafa3f0cf218 100644 --- a/audio/darkice/Makefile +++ b/audio/darkice/Makefile @@ -2,53 +2,56 @@ PORTNAME= darkice PORTVERSION= 1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio net MASTER_SITES= https://github.com/rafael2k/darkice/releases/download/v${PORTVERSION}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= takefu@airport.fm COMMENT= IceCast, IceCast2, and ShoutCast live audio streamer LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c++11-lang pkgconfig +USES= pkgconfig USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-alsa CONFIGURE_ENV= ac_cv_prog_acx_pthread_config=no - SUB_FILES= pkg-message OPTIONS_DEFINE= JACK PULSEAUDIO OPTIONS_DEFAULT= VORBIS OPTIONS_MULTI= CODEC -OPTIONS_MULTI_CODEC= AACPLUS FAAC LAME OPUS TWOLAME VORBIS +OPTIONS_MULTI_CODEC= FAAC LAME OPUS TWOLAME VORBIS -AACPLUS_DESC= AAC HEv2 and libsamplerate support -AACPLUS_LIB_DEPENDS= libaacplus.so:audio/libaacplus \ - libsamplerate.so:audio/libsamplerate -AACPLUS_CONFIGURE_ON= --with-aacplus --with-samplerate -AACPLUS_CONFIGURE_OFF= --without-aacplus --without-samplerate FAAC_LIB_DEPENDS= libfaac.so:audio/faac FAAC_CONFIGURE_ON= --with-faac-prefix=${LOCALBASE} FAAC_CONFIGURE_OFF= --without-faac -JACK_LIB_DEPENDS= libjack.so:audio/jack +JACK_LIB_DEPENDS= libjack.so:audio/jack\ + libsamplerate.so:audio/libsamplerate JACK_CONFIGURE_WITH= jack LAME_LIB_DEPENDS= libmp3lame.so:audio/lame LAME_CONFIGURE_ON= --with-lame-prefix=${LOCALBASE} LAME_CONFIGURE_OFF= --without-lame -OPUS_LIB_DEPENDS= libopus.so:audio/opus +OPUS_LIB_DEPENDS= libopus.so:audio/opus\ + libogg.so:audio/libogg OPUS_CONFIGURE_WITH= opus -PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio +PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio\ + libsamplerate.so:audio/libsamplerate PULSEAUDIO_CONFIGURE_WITH= pulseaudio TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame TWOLAME_CONFIGURE_WITH= twolame -VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis +VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis\ + libogg.so:audio/libogg VORBIS_CONFIGURE_WITH= vorbis +SOURCE_URL= man/darkice.1 man/darkice.cfg.5 src/IceCast2.cpp src/main.cpp + post-patch: @${REINPLACE_CMD} -e 's|-O2 -pedantic||g' ${WRKSRC}/src/Makefile.in +.for i in ${SOURCE_URL} + @${REINPLACE_CMD} -e 's|http://code.google.com/p/darkice/|http://darkice.org/|' ${WRKSRC}/${i} +.endfor do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin diff --git a/audio/darkice/files/darkice.in b/audio/darkice/files/darkice.in index 7008c51f1bba..37d4d61ee207 100644 --- a/audio/darkice/files/darkice.in +++ b/audio/darkice/files/darkice.in @@ -1,7 +1,8 @@ #!/bin/sh # PROVIDE: darkice -# REQUIRE: LOGIN +# REQUIRE: DAEMON +# BEFORE: LOGIN # KEYWORD: SHUTDOWN # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf diff --git a/audio/darkice/files/pkg-message.in b/audio/darkice/files/pkg-message.in index 6b2e5b95ab17..d5bdb51e263d 100644 --- a/audio/darkice/files/pkg-message.in +++ b/audio/darkice/files/pkg-message.in @@ -8,16 +8,10 @@ Please edit it according to your needs. ******************************************************************** -The darkice will *not* be started automatically. To allow it -to start, put this line in /etc/rc.conf: +In order to enable darkice Server service at startup and start it please run: +# service darkice enable +# service darkice start -darkice_enable="YES" - -Then, it will be started on the next boot. If this line is already -present, the client will be started now. Otherwise, edit -/etc/rc.conf and execute this command: - - %%PREFIX%%/etc/rc.d/darkice start EOM } ]