summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/Makefile2
-rw-r--r--audio/icecast2/Makefile69
-rw-r--r--audio/icecast2/distinfo2
-rw-r--r--audio/icecast2/files/patch-configure20
-rw-r--r--audio/icecast2/files/patch-src::connection.c18
-rw-r--r--audio/icecast2/files/patch-src::sock.c18
-rw-r--r--audio/icecast2/files/patch-src::threads.c13
-rw-r--r--audio/icecast2/pkg-comment2
-rw-r--r--audio/icecast2/pkg-descr2
-rw-r--r--audio/icecast2/pkg-message15
-rw-r--r--audio/icecast2/pkg-plist31
-rw-r--r--audio/libshout2/Makefile37
-rw-r--r--audio/libshout2/distinfo2
-rw-r--r--audio/libshout2/files/patch-aa16
-rw-r--r--audio/libshout2/files/patch-ab11
-rw-r--r--audio/libshout2/files/patch-src::Makefile.in11
-rw-r--r--audio/libshout2/pkg-comment2
-rw-r--r--audio/libshout2/pkg-descr4
-rw-r--r--audio/libshout2/pkg-plist33
19 files changed, 97 insertions, 211 deletions
diff --git a/audio/Makefile b/audio/Makefile
index dfa05e181f99..6af431ea37af 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -100,6 +100,7 @@
SUBDIR += gsm
SUBDIR += holyshout
SUBDIR += icecast
+ SUBDIR += icecast2
SUBDIR += id3ed
SUBDIR += id3el
SUBDIR += id3lib
@@ -118,6 +119,7 @@
SUBDIR += libmikmod
SUBDIR += libogg
SUBDIR += libshout
+ SUBDIR += libshout2
SUBDIR += libsidplay
SUBDIR += libsidplay2
SUBDIR += libsndfile
diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index 704cb8a95e69..18a3b7e9a384 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -5,40 +5,51 @@
# $FreeBSD$
#
-PORTNAME= icecast
-PORTVERSION= 1.3.12
-PORTREVISION= 1
+PORTNAME= icecast2
+PORTVERSION= 20021112
CATEGORIES= audio net
-MASTER_SITES= http://www.icecast.org/releases/
+MASTER_SITES= http://tigress.com/lofi/\
+ http://lofi.dyndns.org/
+DISTNAME= icecast-devel-${PORTVERSION}
-MAINTAINER= zach@pabst.bendnet.com
+MAINTAINER= michaelnottebrock@gmx.net
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --with-libwrap
+LIB_DEPENDS= ogg.4:${PORTSDIR}/audio/libogg \
+ shout.3:${PORTSDIR}/audio/libshout2 \
+ vorbis.2:${PORTSDIR}/audio/libvorbis
+
+AUTOMAKE_ARGS= --add-missing
+AUTOMAKE_ENV= CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
+ LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --disable-oggtest --disable-vorbistest --disable-shouttest
+CONFIGURE_ENV= CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
+ LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+USE_AUTOMAKE= yes
+USE_GMAKE= yes
+USE_LIBTOOL= yes
USE_REINPLACE= yes
-pre-patch:
- @${REINPLACE_CMD} -e 's|<history.h>|<readline/history.h>|' \
- -e 's|<readline.h>|<readline/readline.h>|' \
- ${WRKSRC}/src/admin.c
- @${REINPLACE_CMD} -e 's|#undef HAVE_HISTORY_H|#undef HAVE_READLINE_HISTORY_H|g' \
- ${WRKSRC}/config.h.in
+WRKSRC= ${WRKDIR}/icecast
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/icecast ${PREFIX}/sbin
- ${MKDIR} ${PREFIX}/etc/icecast/conf
- ${MKDIR} ${PREFIX}/etc/icecast/templates
-.for CONF in groups.aut.dist icecast.conf.dist mounts.aut.dist users.aut.dist
- ${INSTALL_DATA} ${WRKSRC}/conf/${CONF} ${PREFIX}/etc/icecast/conf
-.endfor
-.for TEMPL in 306.html 400.html 403.html 404.html 504.html bodytag.html info.html \
- list_directory.html mountlist.html statistics.html admin_describe.html \
- admin.html alias_add.html manual.html alias_del.html header.html \
- footer.html admin_change.html
- ${INSTALL_DATA} ${WRKSRC}/templates/${TEMPL} ${PREFIX}/etc/icecast/templates
-.endfor
- ${MKDIR} ${PREFIX}/share/doc/icecast/
- ${INSTALL_DATA} ${WRKSRC}/doc/manual.html ${PREFIX}/share/doc/icecast/
- @${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g'
+post-configure:
+ @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/src/Makefile
+ @${REINPLACE_CMD} -e 's|-O20|${CFLAGS}|' ${WRKSRC}/conf/Makefile \
+ ${WRKSRC}/doc/Makefile \
+ ${WRKSRC}/src/avl/Makefile \
+ ${WRKSRC}/src/log/Makefile \
+ ${WRKSRC}/src/net/Makefile \
+ ${WRKSRC}/src/httpp/Makefile \
+ ${WRKSRC}/src/thread/Makefile \
+ ${WRKSRC}/src/timing/Makefile \
+ ${WRKSRC}/src/Makefile \
+ ${WRKSRC}/web/Makefile \
+ ${WRKSRC}/win32/res/Makefile \
+ ${WRKSRC}/win32/Makefile \
+ ${WRKSRC}/Makefile
+post-install:
+.if !defined(NOPORTDOCS)
+ ${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/conf/icecast.xml ${DOCSDIR}
+.endif
.include <bsd.port.mk>
diff --git a/audio/icecast2/distinfo b/audio/icecast2/distinfo
index ccc9fcffd73a..c17bfe450804 100644
--- a/audio/icecast2/distinfo
+++ b/audio/icecast2/distinfo
@@ -1 +1 @@
-MD5 (icecast-1.3.12.tar.gz) = 69ba36d30722884ea538b70628f1de80
+MD5 (icecast-devel-20021112.tar.gz) = b0098cd736a7605b93f230b33ca32d0c
diff --git a/audio/icecast2/files/patch-configure b/audio/icecast2/files/patch-configure
deleted file mode 100644
index 99b42e7b4e83..000000000000
--- a/audio/icecast2/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig Wed Apr 10 18:50:20 2002
-+++ configure Tue Aug 6 05:36:56 2002
-@@ -2113,7 +2113,7 @@
- fi
- fi
-
--opt_readline="no"
-+opt_readline="unset"
-
- if test "$opt_readline" = "unset"; then
- if test -f "$withval/include/readline/readline.h"; then
-@@ -3118,7 +3118,7 @@
-
- fi
-
--for ac_hdr in fcntl.h sys/time.h unistd.h sys/soundcard.h machine/soundcard.h pthread.h assert.h sys/resource.h math.h signal.h sys/signal.h mcheck.h malloc.h history.h Python.h
-+for ac_hdr in fcntl.h sys/time.h unistd.h sys/soundcard.h machine/soundcard.h pthread.h assert.h sys/resource.h math.h signal.h sys/signal.h mcheck.h malloc.h readline/history.h Python.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/audio/icecast2/files/patch-src::connection.c b/audio/icecast2/files/patch-src::connection.c
deleted file mode 100644
index 9fb9b0f7a136..000000000000
--- a/audio/icecast2/files/patch-src::connection.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/connection.c.orig Mon Aug 5 20:39:21 2002
-+++ src/connection.c Mon Aug 5 20:40:08 2002
-@@ -18,6 +18,7 @@
- *
- */
-
-+#include <sys/types.h>
- #ifdef HAVE_CONFIG_H
- #ifdef _WIN32
- #include <win32config.h>
-@@ -42,7 +43,6 @@
- #include <unistd.h>
- #endif
-
--#include <sys/types.h>
- #include <ctype.h>
- #include <errno.h>
- #include <time.h>
diff --git a/audio/icecast2/files/patch-src::sock.c b/audio/icecast2/files/patch-src::sock.c
deleted file mode 100644
index 67c50425f9cb..000000000000
--- a/audio/icecast2/files/patch-src::sock.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/sock.c.orig Mon Aug 5 20:57:27 2002
-+++ src/sock.c Mon Aug 5 20:57:48 2002
-@@ -19,6 +19,7 @@
- *
- */
-
-+#include <sys/types.h>
- #ifdef HAVE_CONFIG_H
- #ifdef _WIN32
- #include <win32config.h>
-@@ -35,7 +36,6 @@
-
- #include "definitions.h"
-
--#include <sys/types.h>
- #include <ctype.h>
-
- #ifdef HAVE_UNISTD_H
diff --git a/audio/icecast2/files/patch-src::threads.c b/audio/icecast2/files/patch-src::threads.c
deleted file mode 100644
index 9f97408f4cb3..000000000000
--- a/audio/icecast2/files/patch-src::threads.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/threads.c.old Mon Jul 31 14:52:19 2000
-+++ src/threads.c Mon Nov 18 12:19:41 2002
-@@ -39,7 +39,10 @@
- #include <errno.h>
- #include <sys/types.h>
- #include <time.h>
-+
-+#define __XSI_VISIBLE 1
- #include <signal.h>
-+#undef __XSI_VISIBLE
-
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
diff --git a/audio/icecast2/pkg-comment b/audio/icecast2/pkg-comment
index 627383078592..394b453accae 100644
--- a/audio/icecast2/pkg-comment
+++ b/audio/icecast2/pkg-comment
@@ -1 +1 @@
-A streaming mp3 audio server
+A streaming mp3/ogg-vorbis audio server
diff --git a/audio/icecast2/pkg-descr b/audio/icecast2/pkg-descr
index c683f3434b65..2ba0e61729d2 100644
--- a/audio/icecast2/pkg-descr
+++ b/audio/icecast2/pkg-descr
@@ -1,4 +1,4 @@
-Icecast is a streaming mp3 audio server.
+Icecast is a streaming mp3/ogg-vorbis audio server.
Icecast provides nearly all the functionality of the Shoutcast server.
It will accept encoding streams from encoders like winamp, shout and ices.
diff --git a/audio/icecast2/pkg-message b/audio/icecast2/pkg-message
deleted file mode 100644
index 34690c5d02ae..000000000000
--- a/audio/icecast2/pkg-message
+++ /dev/null
@@ -1,15 +0,0 @@
------------------------------------------------------------------
-
-Icecast's various components have been installed in the following
-directories:
-
- - The icecast server:
- %%PREFIX%%/sbin/icecast
-
- - Icecast configuration files have been installed in:
- %%PREFIX%%/etc/icecast/
-
- - Icecast documentation is located in:
- %%PREFIX%%/share/doc/icecast/
-
------------------------------------------------------------------
diff --git a/audio/icecast2/pkg-plist b/audio/icecast2/pkg-plist
index 5ed338f1a9f0..e9e270b92c4c 100644
--- a/audio/icecast2/pkg-plist
+++ b/audio/icecast2/pkg-plist
@@ -1,28 +1,3 @@
-etc/icecast/conf/groups.aut.dist
-etc/icecast/conf/icecast.conf.dist
-etc/icecast/conf/mounts.aut.dist
-etc/icecast/conf/users.aut.dist
-etc/icecast/templates/306.html
-etc/icecast/templates/400.html
-etc/icecast/templates/403.html
-etc/icecast/templates/404.html
-etc/icecast/templates/504.html
-etc/icecast/templates/admin.html
-etc/icecast/templates/admin_change.html
-etc/icecast/templates/admin_describe.html
-etc/icecast/templates/alias_add.html
-etc/icecast/templates/alias_del.html
-etc/icecast/templates/bodytag.html
-etc/icecast/templates/footer.html
-etc/icecast/templates/header.html
-etc/icecast/templates/info.html
-etc/icecast/templates/list_directory.html
-etc/icecast/templates/manual.html
-etc/icecast/templates/mountlist.html
-etc/icecast/templates/statistics.html
-sbin/icecast
-share/doc/icecast/manual.html
-@dirrm etc/icecast/conf
-@dirrm etc/icecast/templates
-@dirrm etc/icecast
-@dirrm share/doc/icecast
+bin/icecast
+%%PORTDOCS%%share/doc/icecast2/icecast.xml
+%%PORTDOCS%%@dirrm share/doc/icecast2
diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile
index 112498c4fdfd..673a9be0d872 100644
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@@ -5,15 +5,42 @@
# $FreeBSD$
#
-PORTNAME= libshout
-PORTVERSION= 1.0.7
+PORTNAME= libshout2
+PORTVERSION= 20021112
CATEGORIES= audio net
-MASTER_SITES= http://developer.icecast.org/libshout/releases/
+MASTER_SITES= http://tigress.com/lofi/ \
+ http://lofi.dyndns.org/
+DISTNAME= libshout-devel-${PORTVERSION}
-MAINTAINER= zach@pabst.bendnet.com
+MAINTAINER= michaelnottebrock@gmx.net
+LIB_DEPENDS= ogg.4:${PORTSDIR}/audio/libogg \
+ vorbis.2:${PORTSDIR}/audio/libvorbis
+
+CONFIGURE_ENV= CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
+ LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-PLIST_SUB+= PORTVERSION=${PORTVERSION}
+USE_GMAKE= yes
+USE_LIBTOOL= yes
+USE_REINPLACE= yes
+
+WRKSRC= ${WRKDIR}/libshout
+
+post-configure:
+ @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|'\
+ ${WRKSRC}/examples/Makefile
+ @${REINPLACE_CMD} -E -e 's|(INCLUDES \=.*)|\1 -I${LOCALBASE}/include|'\
+ ${WRKSRC}/src/Makefile
+ @${REINPLACE_CMD} -e 's|-O20|${CFLAGS}|' ${WRKSRC}/examples/Makefile \
+ ${WRKSRC}/include/Makefile \
+ ${WRKSRC}/include/shout/Makefile \
+ ${WRKSRC}/src/avl/Makefile \
+ ${WRKSRC}/src/httpp/Makefile \
+ ${WRKSRC}/src/net/Makefile \
+ ${WRKSRC}/src/timing/Makefile \
+ ${WRKSRC}/src/thread/Makefile \
+ ${WRKSRC}/src/Makefile \
+ ${WRKSRC}/Makefile
.include <bsd.port.mk>
diff --git a/audio/libshout2/distinfo b/audio/libshout2/distinfo
index 97be1b6a634d..64838a0e8553 100644
--- a/audio/libshout2/distinfo
+++ b/audio/libshout2/distinfo
@@ -1 +1 @@
-MD5 (libshout-1.0.7.tar.gz) = 7e8054f8c6dbb0bd9179057e2ee465c1
+MD5 (libshout-devel-20021112.tar.gz) = 24678973d24ec6b5ae3fdb213a1d47b1
diff --git a/audio/libshout2/files/patch-aa b/audio/libshout2/files/patch-aa
deleted file mode 100644
index 7787a49dec2f..000000000000
--- a/audio/libshout2/files/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.in.orig Wed Aug 1 17:56:09 2001
-+++ Makefile.in Tue Dec 11 08:50:30 2001
-@@ -507,9 +507,10 @@
-
- install-data-local:
- mkdir -p $(DESTDIR)$(includedir)/shout
-- mkdir -p $(DESTDIR)$(prefix)/doc/$(PACKAGE)-$(VERSION)/example
-- $(INSTALL) -m 0644 $(top_srcdir)/README $(top_srcdir)/AUTHORS $(top_srcdir)/COPYING $(top_srcdir)/CHANGES $(DESTDIR)$(prefix)/doc/$(PACKAGE)-$(VERSION)
-- $(INSTALL) -m 0644 $(top_srcdir)/example/Makefile $(top_srcdir)/example/example.c $(DESTDIR)$(prefix)/doc/$(PACKAGE)-$(VERSION)/example
-+ mkdir -p $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION)
-+ mkdir -p $(DESTDIR)$(prefix)/share/examples/$(PACKAGE)-$(VERSION)
-+ $(INSTALL) -m 0644 $(top_srcdir)/README $(top_srcdir)/AUTHORS $(top_srcdir)/COPYING $(top_srcdir)/CHANGES $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION)
-+ $(INSTALL) -m 0644 $(top_srcdir)/example/Makefile $(top_srcdir)/example/example.c $(DESTDIR)$(prefix)/share/examples/$(PACKAGE)-$(VERSION)
- $(INSTALL) -m 0644 $(top_srcdir)/shout.h $(DESTDIR)$(includedir)/shout
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/audio/libshout2/files/patch-ab b/audio/libshout2/files/patch-ab
deleted file mode 100644
index 65112e1f5765..000000000000
--- a/audio/libshout2/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig Tue Dec 11 09:28:01 2001
-+++ doc/Makefile.in Tue Dec 11 09:28:08 2001
-@@ -76,7 +76,7 @@
-
- AUTOMAKE_OPTIONS = foreign
-
--docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
-+docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
-
- doc_DATA = index.html overview.html initialization.html connection.html datastreaming.html metadata.html datastructures.html shout_conn_t.html shout_connect.html shout_disconnect.html shout_sleep.html shout_init_connection.html shout_send_data.html shout_update_metadata.html style.css example.html example_c.html reference.html errorhandling.html shout_strerror.html
-
diff --git a/audio/libshout2/files/patch-src::Makefile.in b/audio/libshout2/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..87eaf57fb0ec
--- /dev/null
+++ b/audio/libshout2/files/patch-src::Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig Wed Jan 15 18:27:50 2003
++++ src/Makefile.in Wed Jan 15 18:29:09 2003
+@@ -106,7 +106,7 @@
+ DEFS = @DEFS@ -I. -I$(srcdir)
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-libshout_la_LDFLAGS =
++libshout_la_LDFLAGS = -version-info 3:0:1
+ libshout_la_DEPENDENCIES = net/libicenet.la timing/libicetiming.la \
+ avl/libiceavl.la httpp/libicehttpp.la thread/libicethread.la
+ libshout_la_OBJECTS = shout.lo util.lo vorbis.lo mp3.lo
diff --git a/audio/libshout2/pkg-comment b/audio/libshout2/pkg-comment
index e5b650179863..905dbe4b2315 100644
--- a/audio/libshout2/pkg-comment
+++ b/audio/libshout2/pkg-comment
@@ -1 +1 @@
-A library providing routines for connecting and transmitting data to the icecast server
+Routines for connecting and transmitting data to the icecast server
diff --git a/audio/libshout2/pkg-descr b/audio/libshout2/pkg-descr
index e25884891692..f758bd5c0a70 100644
--- a/audio/libshout2/pkg-descr
+++ b/audio/libshout2/pkg-descr
@@ -6,5 +6,5 @@ implementation details.
WWW: http://developer.icecast.org/libshout/
-- Zach
-zach@pabst.bendnet.com
+- Michael Nottebrock
+michaelnottebrock@gmx.net
diff --git a/audio/libshout2/pkg-plist b/audio/libshout2/pkg-plist
index 4b771016fcc8..218b21f53545 100644
--- a/audio/libshout2/pkg-plist
+++ b/audio/libshout2/pkg-plist
@@ -1,34 +1,5 @@
include/shout/shout.h
-lib/libshout.so.2
-lib/libshout.so
-lib/libshout.la
lib/libshout.a
-share/doc/libshout-%%PORTVERSION%%/index.html
-share/doc/libshout-%%PORTVERSION%%/overview.html
-share/doc/libshout-%%PORTVERSION%%/initialization.html
-share/doc/libshout-%%PORTVERSION%%/connection.html
-share/doc/libshout-%%PORTVERSION%%/datastreaming.html
-share/doc/libshout-%%PORTVERSION%%/metadata.html
-share/doc/libshout-%%PORTVERSION%%/datastructures.html
-share/doc/libshout-%%PORTVERSION%%/shout_conn_t.html
-share/doc/libshout-%%PORTVERSION%%/shout_connect.html
-share/doc/libshout-%%PORTVERSION%%/shout_disconnect.html
-share/doc/libshout-%%PORTVERSION%%/shout_sleep.html
-share/doc/libshout-%%PORTVERSION%%/shout_init_connection.html
-share/doc/libshout-%%PORTVERSION%%/shout_send_data.html
-share/doc/libshout-%%PORTVERSION%%/shout_update_metadata.html
-share/doc/libshout-%%PORTVERSION%%/style.css
-share/doc/libshout-%%PORTVERSION%%/example.html
-share/doc/libshout-%%PORTVERSION%%/example_c.html
-share/doc/libshout-%%PORTVERSION%%/reference.html
-share/doc/libshout-%%PORTVERSION%%/errorhandling.html
-share/doc/libshout-%%PORTVERSION%%/shout_strerror.html
-share/doc/libshout-%%PORTVERSION%%/README
-share/doc/libshout-%%PORTVERSION%%/AUTHORS
-share/doc/libshout-%%PORTVERSION%%/COPYING
-share/doc/libshout-%%PORTVERSION%%/CHANGES
-share/examples/libshout-%%PORTVERSION%%/Makefile
-share/examples/libshout-%%PORTVERSION%%/example.c
+lib/libshout.so
+lib/libshout.so.3
@dirrm include/shout
-@dirrm share/doc/libshout-%%PORTVERSION%%
-@dirrm share/examples/libshout-%%PORTVERSION%%
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-21 11:14:58 +0000