 @@ -1,52 +1,52 @@
-# $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
+DISTNAME=	darkice-1.4
 PKGREVISION=	1
 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/
+HOMEPAGE=	http://www.darkice.org/
-COMMENT=	IceCast, IceCast2 and ShoutCast live audio streamer
+COMMENT=	IceCast, IceCast2, and ShoutCast live audio streamer
 LICENSE=	gnu-gpl-v3
-GNU_CONFIGURE=		yes
+GNU_CONFIGURE=	yes
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=	c c++
-USE_TOOLS+=		gmake
+USE_TOOLS+=	gmake pkg-config
 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}
 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:
 	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 	${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}
 	${INSTALL_DATA} ${WRKSRC}/darkice.cfg \
 		${DESTDIR}${EGDIR}/darkice.conf
 	${INSTALL_PROGRAM} ${WRKSRC}/src/darkice ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/darkice.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_MAN} ${WRKSRC}/man/darkice.cfg.5 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/darkice.conf.5
-.include "../../audio/faac/buildlink3.mk"
+.include "options.mk"
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/twolame/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -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
+SHA1 (darkice-1.4.tar.gz) = b863fcd6f4d46493bea9f419ceeceaec276ce776
-RMD160 (darkice-1.2.tar.gz) = cc627a716efc49275f3dc3e56011c4d62d0b176d
+RMD160 (darkice-1.4.tar.gz) = 90db0e17936e92a97009fa5b8781957771eebda1
-SHA512 (darkice-1.2.tar.gz) = d8959819d70eb9b44a34d087fcf3897be5e4cb23681c049f8d88e251d83dfd86b90fdd37744fe27d861dfcbb6bb6e1521b48c5c7b4967bb061ede75596f0a823
+SHA512 (darkice-1.4.tar.gz) = 708ab08a45e216dce350f6cd36374e10d4606f77f0cde4dfbf35675d9d0778fb7a013b49fd62d713039d5fcfb9e7d66e6b7ae14acf1e5f142685eecdf7a865bc
-Size (darkice-1.2.tar.gz) = 357026 bytes
+Size (darkice-1.4.tar.gz) = 364782 bytes
-SHA1 (patch-configure) = cf4b34f3a995cec6256385908a9eeb9dfb870875
+SHA1 (patch-rc.darkice) = fe30eb566c9de2c8ee86ef5b79f4adafb568aed7
-SHA1 (patch-rc.darkice) = c8ea98936ad36768014b3fb1410b9c8a902f3a83
+SHA1 (patch-src_FaacEncoder.cpp) = 977a151cad0a1054f380a0d5e00f00b08a8f9a06
-SHA1 (patch-src_FaacEncoder.cpp) = a3ef45fbe17e8d59c09cc93b20665b4589ddc51b
+SHA1 (patch-src_IceCast.cpp) = 45a24b7fb7b3b2b3939b76c9e7299fe4580202e6
-SHA1 (patch-src_IceCast.cpp) = 91e1920d9e12e9b317468fe64513cc13b75e9ce4
+SHA1 (patch-src_Makefile.in) = 19934d5d52b58505333fdf25b634b9d84bebd5e8
-SHA1 (patch-src_LameLibEncoder.cpp) = 9202aa7d5219dd24dddb7faa58e5edeeb26d6a18
+SHA1 (patch-src_SerialUlaw.cpp) = 95804c48ace57cb5783f92559f4e4428fbe711d2
 SHA1 (patch-src_Makefile.in) = ae028bf6e4616b615c4d1d50eb932077a287379d
 SHA1 (patch-src_SerialUlaw.cpp) = 259b99b7e772f743b32b94ace664451df28f90dd
 SHA1 (patch-src_TwoLameLibEncoder.cpp) = bd9774c98789ccdcd14b843d46ddf30f0c5da047

 @@ -1,16 +1,17 @@
-$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
  	if [ -f $pidfile ]; then
                  PID=`cat $pidfile`
                  running=`ps --no-headers -o "%c" -p $PID`
 -                if ( [ "$progname" == "$running" ] ); then
 +                if ( [ "$progname" = "$running" ] ); then
  			echo "$progname is still running"
  		else
  			echo "$progname seems crashed - PID ($PID) does not match the deamon"
 @@ -85,7 +85,7 @@ case $1 in
  	if [ -f $pidfile ]; then

 @@ -1,14 +1,15 @@
-$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 @@
  #ifdef HAVE_FAAC_LIB
+-
 +#include <string.h>
  #include "Exception.h"
  #include "Util.h"
  #include "FaacEncoder.h"

 @@ -1,14 +1,15 @@
-$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 )
      /* send the x-audiocast headers */
      str = "\nx-audiocast-bitrate: ";
      sink->write( str, strlen( str));
 -    if ( log10(getBitRate()) >= (STRBUF_SIZE-2) ) {
 +    if ( log10((double)getBitRate()) >= (STRBUF_SIZE-2) ) {
          throw Exception( __FILE__, __LINE__,
                           "bitrate does not fit string buffer", getBitRate());
+     }

 @@ -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
+Avoid forcing -O2 or -pedantic.
 -bit builds fail.
---- src/Makefile.in.orig	2013-07-15 05:53:19.000000000 +0000
+--- src/Makefile.in.orig	2020-01-04 20:53:32.000000000 +0000
 +++ src/Makefile.in
-@@ -253,7 +253,7 @@ target_alias = @target_alias@
+@@ -388,7 +388,7 @@ top_build_prefix = @top_build_prefix@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
--AM_CXXFLAGS = -O2 -pedantic -Wall @DEBUG_CXXFLAGS@ @PTHREAD_CFLAGS@
+ darkice_CXXFLAGS = \
-+AM_CXXFLAGS = -O2 -Wall @DEBUG_CXXFLAGS@ @PTHREAD_CFLAGS@
+- -O2 -pedantic -Wall \
- INCLUDES = @LAME_INCFLAGS@ @VORBIS_INCFLAGS@ @OPUS_INCFLAGS@ @FAAC_INCFLAGS@ @AACPLUS_INCFLAGS@ @TWOLAME_INCFLAGS@ \
++ -Wall \
- 		@ALSA_INCFLAGS@ @PULSEAUDIO_INCFLAGS@ @JACK_INCFLAGS@ @SRC_INCFLAGS@
+  $(DEBUG_CXXFLAGS) \
   $(PTHREAD_CFLAGS) \
   $(LAME_CFLAGS) \

 @@ -1,16 +1,17 @@
-$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 )
+     }
      cfsetispeed(&ts, B115200);
 +#if defined(__sun)
 +    ts.c_iflag &= ~(IMAXBEL|IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
 +    ts.c_oflag &= ~OPOST;
 +    ts.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
 +    ts.c_cflag &= ~(CSIZE|PARENB);
 +    ts.c_cflag |= CS8;
 +#else

 @@ -1,5 +1,3 @@
-DarkIce is an IceCast, IceCast2 and ShoutCast live audio streamer. It takes
+DarkIce is a live audio streamer. It records audio from an audio interface
-audio input from a sound card, encodes it into mp3 and/or Ogg Vorbis, and sends
+(e.g. sound card), encodes it and sends it to a streaming server using the
-the streams to one or more IceCast, ShoutCast and/or IceCast2 servers. DarkIce
+ShoutCast, IceCast (1.3.x and 2.x), or Darwin Streaming Server protocols.
 uses lame as a shared object as its mp3 encoder, and the Ogg Vorbis libs as its
 Ogg Vorbis encoder.