committed.
On 2026/06/28 14:06, Andrew Kloet wrote:
> I forgot to include some files in the previous patch.
> Here is everything.
>
> OK?
>
> Andrew
>
> diff --git a/net/ices2/Makefile b/net/ices2/Makefile
> index 7a80e1e10..7b433f4be 100644
> --- a/net/ices2/Makefile
> +++ b/net/ices2/Makefile
> @@ -1,8 +1,7 @@
> COMMENT= icecast source for streaming Ogg Vorbis
>
> -DISTNAME= ices-2.0.2
> +DISTNAME= ices-2.0.3
> CATEGORIES= net audio
> -REVISION= 8
>
> HOMEPAGE= https://icecast.org/ices/
>
> @@ -14,18 +13,14 @@ WANTLIB += vorbisenc xml2 z crypto ssl
>
> SITES= https://downloads.xiph.org/releases/ices/
>
> -# Needs AC_PROG_LIBTOOL
> -BUILD_DEPENDS += devel/libtool \
> - ${MODGNU_AUTOMAKE_DEPENDS}
> -
> LIB_DEPENDS= audio/speex \
> converters/libiconv \
> net/libshout \
> textproc/libxml
>
> -AUTOCONF_VERSION= 2.61
> -AUTOMAKE_VERSION= 1.9
> -CONFIGURE_STYLE= autoconf
> +AUTOCONF_VERSION= 2.69
> +AUTOMAKE_VERSION= 1.14
> +CONFIGURE_STYLE= autoreconf
> CONFIGURE_ARGS= --program-suffix=2 \
> --disable-sun-audio
>
> @@ -35,15 +30,4 @@ post-extract:
> cp ${FILESDIR}/im_sndio.{c,h} ${WRKSRC}/src/
> cp ${FILESDIR}/ices-sndio.xml ${WRKSRC}/conf/
>
> -AUTO_ENV= AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> - AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
> -
> -post-patch:
> - @echo "Running aclocal-${AUTOMAKE_VERSION} in ${WRKSRC}"
> - @cd ${WRKSRC}; ${AUTO_ENV} aclocal -I m4
> -
> -pre-configure:
> - @echo "Running automake-${AUTOMAKE_VERSION} in ${WRKSRC}"
> - @cd ${WRKSRC}; ${AUTO_ENV} automake --foreign
> -
> .include <bsd.port.mk>
> diff --git a/net/ices2/distinfo b/net/ices2/distinfo
> index 3a000d9e1..22b37c0c2 100644
> --- a/net/ices2/distinfo
> +++ b/net/ices2/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (ices-2.0.2.tar.gz) = e/epxbzhtkZd+N0UkeMDVEmQAGuO8B+LqO6ziERYiFk=
> -SIZE (ices-2.0.2.tar.gz) = 446287
> +SHA256 (ices-2.0.3.tar.gz) = 9xCy6nyjnEvc+23mEhHmFLRQTjUmdhlpB5nilGbGU34=
> +SIZE (ices-2.0.3.tar.gz) = 461511
> diff --git a/net/ices2/files/im_sndio.h b/net/ices2/files/im_sndio.h
> index 1ec7b1b10..9258f575c 100644
> --- a/net/ices2/files/im_sndio.h
> +++ b/net/ices2/files/im_sndio.h
> @@ -20,7 +20,7 @@
>
> #include <sndio.h>
> #include "inputmodule.h"
> -#include "thread/thread.h"
> +#include "common/thread/thread.h"
> #include <ogg/ogg.h>
>
> typedef struct
> diff --git a/net/ices2/patches/patch-Makefile_am
> b/net/ices2/patches/patch-Makefile_am
> deleted file mode 100644
> index 41791815a..000000000
> --- a/net/ices2/patches/patch-Makefile_am
> +++ /dev/null
> @@ -1,11 +0,0 @@
> ---- Makefile.am.orig Wed Apr 15 11:07:45 2015
> -+++ Makefile.am Wed Apr 15 11:08:59 2015
> -@@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4
> -
> - SUBDIRS = src conf doc
> -
> --EXTRA_DIST = README AUTHORS COPYING TODO m4/shout.m4 m4/vorbis.m4 m4/ogg.m4
> m4/xiph_compiler.m4 m4/xiph_xml2.m4
> -+EXTRA_DIST = AUTHORS COPYING TODO m4/shout.m4 m4/vorbis.m4 m4/ogg.m4
> m4/xiph_compiler.m4 m4/xiph_xml2.m4
> -
> - # SCCS Definitions (for BitKeeper)
> - GET = true
> diff --git a/net/ices2/patches/patch-configure_in
> b/net/ices2/patches/patch-configure_ac
> similarity index 78%
> rename from net/ices2/patches/patch-configure_in
> rename to net/ices2/patches/patch-configure_ac
> index f89804a20..b08b398d4 100644
> --- a/net/ices2/patches/patch-configure_in
> +++ b/net/ices2/patches/patch-configure_ac
> @@ -1,38 +1,39 @@
> ---- configure.in.orig Tue Aug 7 00:22:01 2012
> -+++ configure.in Wed Apr 15 11:15:31 2015
> -@@ -73,7 +73,19 @@ fi
> +Index: configure.ac
> +--- configure.ac.orig
> ++++ configure.ac
> +@@ -75,7 +75,19 @@ fi
>
> AM_CONDITIONAL(HAVE_OSS,test "$have_oss" = yes)
>
> +dnl ================================================================
> +dnl Check for sndio
> +dnl ================================================================
> -
> ++
> +AC_CHECK_HEADER(sndio.h, have_sndio=yes, have_sndio=no)
> +AM_CONDITIONAL(HAVE_SNDIO, test "$have_sndio" = yes)
> +if test "$have_sndio" = yes; then
> + SNDIO_LIBS="-lsndio"
> + AC_DEFINE(HAVE_SNDIO,,[Define to enable sndio input module])
> +fi
> -+
> +
> +AM_CONDITIONAL(HAVE_SNDIO,test "$have_sndio" = yes)
> +
> dnl ================================================================
> dnl Check for Sun audio
> dnl ================================================================
> -@@ -173,6 +185,7 @@ XIPH_VAR_PREPEND([XIPH_LIBS], [$VORBISENC_LIBS $VORBIS
> +@@ -187,6 +199,7 @@ XIPH_VAR_PREPEND([XIPH_LIBS], [$VORBISENC_LIBS $VORBIS
> dnl Make substitutions
>
> AC_SUBST(ALSA_LIBS)
> +AC_SUBST(SNDIO_LIBS)
> AC_SUBST(ROARAUDIO_LIBS)
> + AC_SUBST(ROARAUDIO_CFLAGS)
> AC_SUBST(XML_LIBS)
> - AC_SUBST(XML_CFLAGS)
> -@@ -198,6 +211,7 @@ echo "
> +@@ -213,6 +226,7 @@ echo "
>
> Build with alsa: $have_alsa
> Build with OSS: $have_oss
> -+ Build with sndio: $have_sndio
> ++ Build with sndio: $have_sndio
> Build with Sun audio: $have_sun_audio
> Build with RoarAudio: $have_roaraudio
>
> diff --git a/net/ices2/patches/patch-src_Makefile_am
> b/net/ices2/patches/patch-src_Makefile_am
> index a837f9834..26922d0da 100644
> --- a/net/ices2/patches/patch-src_Makefile_am
> +++ b/net/ices2/patches/patch-src_Makefile_am
> @@ -1,5 +1,6 @@
> ---- src/Makefile.am.orig Wed Apr 15 11:10:56 2015
> -+++ src/Makefile.am Wed Apr 15 11:11:45 2015
> +Index: src/Makefile.am
> +--- src/Makefile.am.orig
> ++++ src/Makefile.am
> @@ -14,6 +14,10 @@ if HAVE_OSS
> oss = im_oss.c
> endif
> @@ -18,12 +19,12 @@
> -ices_SOURCES = input.c cfgparse.c stream.c ices.c signals.c im_playlist.c
> reencode.c encode.c playlist_basic.c im_stdinpcm.c stream_shared.c metadata.c
> playlist_script.c audio.c resample.c $(oss) $(sun) $(alsa) $(roar)
> +ices_SOURCES = input.c cfgparse.c stream.c ices.c signals.c im_playlist.c
> reencode.c encode.c playlist_basic.c im_stdinpcm.c stream_shared.c metadata.c
> playlist_script.c audio.c resample.c $(oss) $(sun) $(alsa) $(roar) $(sndio)
>
> - ices_LDADD = log/libicelog.la \
> - timing/libicetiming.la \
> - thread/libicethread.la \
> - avl/libiceavl.la \
> + ices_LDADD = common/log/libicelog.la \
> + common/timing/libicetiming.la \
> + common/thread/libicethread.la \
> + common/avl/libiceavl.la \
> - @ROARAUDIO_LIBS@ \
> + @ROARAUDIO_LIBS@ @SNDIO_LIBS@ \
> - @ALSA_LIBS@ @XIPH_LIBS@
> + @ALSA_LIBS@ @XIPH_LIBS@ @OGG_LIBS@
>
> debug:
> diff --git a/net/ices2/pkg/PLIST b/net/ices2/pkg/PLIST
> index d2f9f01d6..ac1749f3f 100644
> --- a/net/ices2/pkg/PLIST
> +++ b/net/ices2/pkg/PLIST
> @@ -2,6 +2,7 @@
> @option is-branch
> @conflict ices-2.*
> @extraunexec rm -rf /var/log/ices/*
> +@rcscript ${RCDIR}/ices2
> @bin bin/ices2
> share/doc/ices2/
> share/doc/ices2/basic.html
> @@ -18,4 +19,3 @@ share/examples/ices2/ices-playlist.xml
> @mode
> share/examples/ices2/ices-sndio.xml
> @sample /var/log/ices/
> -@rcscript ${RCDIR}/ices2
