darkice: Update to 1.4

pkgsrc changes:

- add many more package options.
- adjust the man page for device names on NetBSD.

01-03-2020 Darkice 1.4 released
    o Shoutcast and Icecast 2 connection issues fixed.

04-08-2016 Darkice 1.3 released
    o Small bugs fixed by Nicolas Boulenguez <nicolas@debian.org>.
    o Bugs related to streaming to remote servers fixed. Patch by Kalle Kulonen
	<kulonenk@gmail.com> and Mark Turner <jmarkturner@gmail.com>.

11 files changed, 56 insertions, 103 deletions

diff --git a/audio/darkice/DESCR b/audio/darkice/DESCR
index 800ae05e37c..8474354c5f3 100644
--- a/audio/darkice/DESCR
+++ b/audio/darkice/DESCR
@@ -1,5 +1,3 @@
-DarkIce is an IceCast, IceCast2 and ShoutCast live audio streamer. It takes
-audio input from a sound card, encodes it into mp3 and/or Ogg Vorbis, and sends
-the streams to one or more IceCast, ShoutCast and/or IceCast2 servers. DarkIce
-uses lame as a shared object as its mp3 encoder, and the Ogg Vorbis libs as its
-Ogg Vorbis encoder.
+DarkIce is a live audio streamer. It records audio from an audio interface
+(e.g. sound card), encodes it and sends it to a streaming server using the
+ShoutCast, IceCast (1.3.x and 2.x), or Darwin Streaming Server protocols.
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index 2a1aeac4924..cb32dcd7f5e 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -1,34 +1,39 @@
-# $NetBSD: Makefile,v 1.24 2020/08/18 17:57:35 leot Exp $
+# $NetBSD: Makefile,v 1.25 2021/04/17 09:07:46 nia Exp $
 #
 
-DISTNAME=	darkice-1.2
-PKGREVISION=	1
+DISTNAME=	darkice-1.4
 CATEGORIES=	audio
-MASTER_SITES=	https://darkice.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=rafael2k/}
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://darkice.tyrell.hu/
-COMMENT=	IceCast, IceCast2 and ShoutCast live audio streamer
+HOMEPAGE=	http://www.darkice.org/
+COMMENT=	IceCast, IceCast2, and ShoutCast live audio streamer
 LICENSE=	gnu-gpl-v3
 
-GNU_CONFIGURE=		yes
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake
-
-CHECK_PORTABILITY_SKIP+=	configure.in
-
-CONFIGURE_ARGS+=	--with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis}
-CONFIGURE_ARGS+=	--with-lame-prefix=${BUILDLINK_PREFIX.lame}
-CONFIGURE_ARGS+=	--with-twolame-prefix=${BUILDLINK_PREFIX.twolame}
-CONFIGURE_ARGS+=	--with-faac-prefix=${BUILDLINK_PREFIX.faac}
-CONFIGURE_ARGS+=	--without-jack
-LIBS+=			${LIBOSSAUDIO:Q}
+GNU_CONFIGURE=	yes
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	gmake pkg-config
 
 EGDIR=		${PREFIX}/share/examples/darkice
 HTMLDIR=	${PREFIX}/share/doc/darkice
 
 CONF_FILES=	${EGDIR}/darkice.conf ${PKG_SYSCONFDIR}/darkice.conf
 
+CONFIGURE_ARGS+=	--without-aacplus
+
+.include "../../mk/oss.buildlink3.mk"
+
+.if ${OSS_TYPE} != "none"
+LIBS+=			${LIBOSSAUDIO}
+SUBST_CLASSES+=		oss
+SUBST_STAGE.oss=	pre-configure
+SUBST_MESSAGE.oss=	Correcting the path to the OSS device.
+SUBST_FILES.oss+=	darkice.cfg
+SUBST_FILES.oss+=	man/darkice.cfg.5
+SUBST_SED.oss+=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
+.endif
+
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 
 do-install:
@@ -42,11 +47,6 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/darkice.cfg.5 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/darkice.conf.5
 
-.include "../../audio/faac/buildlink3.mk"
-.include "../../audio/lame/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/twolame/buildlink3.mk"
-
+.include "options.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/darkice/distinfo b/audio/darkice/distinfo
index 1dea5b753c8..8d40e2de50f 100644
--- a/audio/darkice/distinfo
+++ b/audio/darkice/distinfo
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.14 2015/11/03 01:12:28 agc Exp $
+$NetBSD: distinfo,v 1.15 2021/04/17 09:07:46 nia Exp $
 
-SHA1 (darkice-1.2.tar.gz) = 508eb0560a7cdf0990a8793f4b8d324ae74bc343
-RMD160 (darkice-1.2.tar.gz) = cc627a716efc49275f3dc3e56011c4d62d0b176d
-SHA512 (darkice-1.2.tar.gz) = d8959819d70eb9b44a34d087fcf3897be5e4cb23681c049f8d88e251d83dfd86b90fdd37744fe27d861dfcbb6bb6e1521b48c5c7b4967bb061ede75596f0a823
-Size (darkice-1.2.tar.gz) = 357026 bytes
-SHA1 (patch-configure) = cf4b34f3a995cec6256385908a9eeb9dfb870875
-SHA1 (patch-rc.darkice) = c8ea98936ad36768014b3fb1410b9c8a902f3a83
-SHA1 (patch-src_FaacEncoder.cpp) = a3ef45fbe17e8d59c09cc93b20665b4589ddc51b
-SHA1 (patch-src_IceCast.cpp) = 91e1920d9e12e9b317468fe64513cc13b75e9ce4
-SHA1 (patch-src_LameLibEncoder.cpp) = 9202aa7d5219dd24dddb7faa58e5edeeb26d6a18
-SHA1 (patch-src_Makefile.in) = ae028bf6e4616b615c4d1d50eb932077a287379d
-SHA1 (patch-src_SerialUlaw.cpp) = 259b99b7e772f743b32b94ace664451df28f90dd
-SHA1 (patch-src_TwoLameLibEncoder.cpp) = bd9774c98789ccdcd14b843d46ddf30f0c5da047
+SHA1 (darkice-1.4.tar.gz) = b863fcd6f4d46493bea9f419ceeceaec276ce776
+RMD160 (darkice-1.4.tar.gz) = 90db0e17936e92a97009fa5b8781957771eebda1
+SHA512 (darkice-1.4.tar.gz) = 708ab08a45e216dce350f6cd36374e10d4606f77f0cde4dfbf35675d9d0778fb7a013b49fd62d713039d5fcfb9e7d66e6b7ae14acf1e5f142685eecdf7a865bc
+Size (darkice-1.4.tar.gz) = 364782 bytes
+SHA1 (patch-rc.darkice) = fe30eb566c9de2c8ee86ef5b79f4adafb568aed7
+SHA1 (patch-src_FaacEncoder.cpp) = 977a151cad0a1054f380a0d5e00f00b08a8f9a06
+SHA1 (patch-src_IceCast.cpp) = 45a24b7fb7b3b2b3939b76c9e7299fe4580202e6
+SHA1 (patch-src_Makefile.in) = 19934d5d52b58505333fdf25b634b9d84bebd5e8
+SHA1 (patch-src_SerialUlaw.cpp) = 95804c48ace57cb5783f92559f4e4428fbe711d2
diff --git a/audio/darkice/patches/patch-configure b/audio/darkice/patches/patch-configure
deleted file mode 100644
index 1ff4a3c6b1e..00000000000
--- a/audio/darkice/patches/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2014/02/22 14:51:03 wiedi Exp $
-
-== portability
---- configure.orig	2013-07-15 05:53:19.000000000 +0000
-+++ configure
-@@ -6400,7 +6400,7 @@ else
- fi
- 
- 
--if test "x${USE_DEBUG}" == "xyes" ; then
-+if test "x${USE_DEBUG}" = "xyes" ; then
-     DEBUG_CXXFLAGS="-g"
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: compiling in debug mode" >&5
- $as_echo "compiling in debug mode" >&6; }
diff --git a/audio/darkice/patches/patch-rc.darkice b/audio/darkice/patches/patch-rc.darkice
index 76b063426fb..bccad66776c 100644
--- a/audio/darkice/patches/patch-rc.darkice
+++ b/audio/darkice/patches/patch-rc.darkice
@@ -1,6 +1,7 @@
-$NetBSD: patch-rc.darkice,v 1.1 2014/02/22 14:51:03 wiedi Exp $
+$NetBSD: patch-rc.darkice,v 1.2 2021/04/17 09:07:46 nia Exp $
 
 == portability
+
 --- rc.darkice.orig	2013-07-15 05:50:01.000000000 +0000
 +++ rc.darkice
 @@ -40,7 +40,7 @@ case $1 in
diff --git a/audio/darkice/patches/patch-src_FaacEncoder.cpp b/audio/darkice/patches/patch-src_FaacEncoder.cpp
index 0ac3f722aca..6b4104665d9 100644
--- a/audio/darkice/patches/patch-src_FaacEncoder.cpp
+++ b/audio/darkice/patches/patch-src_FaacEncoder.cpp
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_FaacEncoder.cpp,v 1.1 2014/02/22 14:51:03 wiedi Exp $
+$NetBSD: patch-src_FaacEncoder.cpp,v 1.2 2021/04/17 09:07:46 nia Exp $
 
 string.h is needed for memmove()
+
 --- src/FaacEncoder.cpp.orig	2013-07-15 05:50:42.000000000 +0000
 +++ src/FaacEncoder.cpp
 @@ -37,7 +37,7 @@
diff --git a/audio/darkice/patches/patch-src_IceCast.cpp b/audio/darkice/patches/patch-src_IceCast.cpp
index 84666d0af2b..f0aa708830f 100644
--- a/audio/darkice/patches/patch-src_IceCast.cpp
+++ b/audio/darkice/patches/patch-src_IceCast.cpp
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_IceCast.cpp,v 1.1 2014/02/22 14:51:03 wiedi Exp $
+$NetBSD: patch-src_IceCast.cpp,v 1.2 2021/04/17 09:07:46 nia Exp $
 
 Fix "log10(int) is ambigous" on SunOS
+
 --- src/IceCast.cpp.orig	2013-07-15 05:50:42.000000000 +0000
 +++ src/IceCast.cpp
 @@ -145,7 +145,7 @@ IceCast :: sendLogin ( void )
diff --git a/audio/darkice/patches/patch-src_LameLibEncoder.cpp b/audio/darkice/patches/patch-src_LameLibEncoder.cpp
deleted file mode 100644
index 40b08ec4e3a..00000000000
--- a/audio/darkice/patches/patch-src_LameLibEncoder.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_LameLibEncoder.cpp,v 1.1 2014/02/22 14:51:03 wiedi Exp $
-
-Fix broken amd64 build
---- src/LameLibEncoder.cpp.orig	2013-07-15 05:50:42.000000000 +0000
-+++ src/LameLibEncoder.cpp
-@@ -81,10 +81,10 @@ LameLibEncoder :: open ( void )
-     // ugly lame returns -1 in a pointer on allocation errors
-     // this is cast to (long int) so that the pointer can be handled
-     // on 64 bit systems as well
--    if ( !lameGlobalFlags || ((long int)lameGlobalFlags) == -1 ) {
-+    if ( !lameGlobalFlags || lameGlobalFlags == (lame_global_flags *)-1 ) {
-         throw Exception( __FILE__, __LINE__,
-                          "lame lib init error",
--                         (long int) lameGlobalFlags);
-+                         (long int)(intptr_t) lameGlobalFlags);
-     }
- 
-     if ( 0 > lame_set_num_channels( lameGlobalFlags, getInChannel()) ) {
diff --git a/audio/darkice/patches/patch-src_Makefile.in b/audio/darkice/patches/patch-src_Makefile.in
index e9173a65878..9720b4dbdad 100644
--- a/audio/darkice/patches/patch-src_Makefile.in
+++ b/audio/darkice/patches/patch-src_Makefile.in
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2014/02/22 14:51:03 wiedi Exp $
+$NetBSD: patch-src_Makefile.in,v 1.2 2021/04/17 09:07:46 nia Exp $
 
-Don't build with -pedantic; it causes g++ to reject "long long" so
-32-bit builds fail.
---- src/Makefile.in.orig	2013-07-15 05:53:19.000000000 +0000
+Avoid forcing -O2 or -pedantic.
+
+--- src/Makefile.in.orig	2020-01-04 20:53:32.000000000 +0000
 +++ src/Makefile.in
-@@ -253,7 +253,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
+@@ -388,7 +388,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
--AM_CXXFLAGS = -O2 -pedantic -Wall @DEBUG_CXXFLAGS@ @PTHREAD_CFLAGS@
-+AM_CXXFLAGS = -O2 -Wall @DEBUG_CXXFLAGS@ @PTHREAD_CFLAGS@
- INCLUDES = @LAME_INCFLAGS@ @VORBIS_INCFLAGS@ @OPUS_INCFLAGS@ @FAAC_INCFLAGS@ @AACPLUS_INCFLAGS@ @TWOLAME_INCFLAGS@ \
- 		@ALSA_INCFLAGS@ @PULSEAUDIO_INCFLAGS@ @JACK_INCFLAGS@ @SRC_INCFLAGS@
- 
+ darkice_CXXFLAGS = \
+- -O2 -pedantic -Wall \
++ -Wall \
+  $(DEBUG_CXXFLAGS) \
+  $(PTHREAD_CFLAGS) \
+  $(LAME_CFLAGS) \
diff --git a/audio/darkice/patches/patch-src_SerialUlaw.cpp b/audio/darkice/patches/patch-src_SerialUlaw.cpp
index f03376b817f..33ca37cebfc 100644
--- a/audio/darkice/patches/patch-src_SerialUlaw.cpp
+++ b/audio/darkice/patches/patch-src_SerialUlaw.cpp
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_SerialUlaw.cpp,v 1.1 2014/02/22 14:51:03 wiedi Exp $
+$NetBSD: patch-src_SerialUlaw.cpp,v 1.2 2021/04/17 09:07:46 nia Exp $
 
 cfmakeraw is not portable to SunOS
+
 --- src/SerialUlaw.cpp.orig	2013-07-15 05:50:42.000000000 +0000
 +++ src/SerialUlaw.cpp
 @@ -232,7 +232,15 @@ SerialUlaw :: open ( void )
diff --git a/audio/darkice/patches/patch-src_TwoLameLibEncoder.cpp b/audio/darkice/patches/patch-src_TwoLameLibEncoder.cpp
deleted file mode 100644
index 752124d47b6..00000000000
--- a/audio/darkice/patches/patch-src_TwoLameLibEncoder.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_TwoLameLibEncoder.cpp,v 1.1 2014/02/22 14:51:03 wiedi Exp $
-
-Fix broken amd64 build.
---- src/TwoLameLibEncoder.cpp.orig	2013-07-15 05:50:42.000000000 +0000
-+++ src/TwoLameLibEncoder.cpp
-@@ -116,7 +116,7 @@ TwoLameLibEncoder :: open ( void )
-     if ( !twolame_opts  ) {
-         throw Exception( __FILE__, __LINE__,
-                          "TwoLAME lib init error",
--                         (long int) twolame_opts);
-+                         /* (long int) twolame_opts */ /* why? */ 0);
-     }
- 
-     if ( 0 > twolame_set_num_channels( twolame_opts, getInChannel()) ) {