- enable on sparc, lightly tested

- fix CATEGORIES, this doesn't belong in www
- disable crypt support until the utility needed for making the passwds is
included
- rename checksums file
This commit is contained in:
brad 2002-03-03 01:37:38 +00:00
parent ba5772bc40
commit e9760d28c4
6 changed files with 83 additions and 40 deletions

View File

@ -1,15 +1,15 @@
# $OpenBSD: Makefile,v 1.14 2001/08/30 02:10:40 brad Exp $
# $OpenBSD: Makefile,v 1.15 2002/03/03 01:37:38 brad Exp $
# Uses pthreads
COMMENT= "Internet based broadcasting system"
# archs that have pthreads library in
# good enough shape to run this app.
ONLY_FOR_ARCHS= i386
ONLY_FOR_ARCHS= i386 sparc
DISTNAME= icecast-1.3.11
CATEGORIES= net audio www
NEED_VERSION= 1.435
CATEGORIES= net audio
NEED_VERSION= 1.500
MASTER_SITES= http://www.icecast.org/releases/
HOMEPAGE= http://www.icecast.org/
@ -22,8 +22,11 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
SYSCONFDIR= /etc/icecast
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-crypt --with-libwrap
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= --with-libwrap
# disabled for now
# --with-crypt
DOCS= AUTHORS BUGS CHANGES COPYING FAQ README

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-configure,v 1.4 2001/03/06 06:52:41 fgsch Exp $
--- configure.orig Wed Jul 5 17:22:53 2000
+++ configure Tue Mar 6 03:23:41 2001
@@ -879,16 +879,16 @@ if test "x$enable_fsstd" = "xyes"; then
else
ICECAST_BINDIR=${prefix}/bin
ICECAST_SBINDIR=${prefix}/bin
- ICECAST_ETCDIR=conf
- ICECAST_ETCDIR_INST=${prefix}/conf
- ICECAST_SHAREDIR=${prefix}
- ICECAST_LOGDIR=logs
- ICECAST_LOGDIR_INST=${prefix}/logs
- ICECAST_TEMPLATEDIR=templates
- ICECAST_TEMPLATEDIR_INST=${prefix}/templates
- ICECAST_STATICDIR=static
- ICECAST_STATICDIR_INST=${prefix}/static
- ICECAST_DOCDIR=${prefix}/doc
+ ICECAST_ETCDIR=${sysconfdir}
+ ICECAST_ETCDIR_INST=${prefix}/share/examples/icecast
+ ICECAST_SHAREDIR=${prefix}/share/icecast
+ ICECAST_LOGDIR=/var/log/icecast
+ ICECAST_LOGDIR_INST=/var/log/icecast
+ ICECAST_TEMPLATEDIR=${prefix}/share/icecast/templates
+ ICECAST_TEMPLATEDIR_INST=${prefix}/share/icecast/templates
+ ICECAST_STATICDIR=${prefix}/share/icecast/static
+ ICECAST_STATICDIR_INST=${prefix}/share/icecast/static
+ ICECAST_DOCDIR=${prefix}/share/doc/icecast
USE_FSSTD=no
fi

View File

@ -0,0 +1,71 @@
$OpenBSD: patch-configure_in,v 1.1 2002/03/03 01:37:38 brad Exp $
--- configure.in.orig Tue Aug 7 22:52:19 2001
+++ configure.in Sat Feb 9 01:10:35 2002
@@ -55,16 +55,16 @@ if test "x$enable_fsstd" = "xyes"; then
else
ICECAST_BINDIR=${prefix}/bin
ICECAST_SBINDIR=${prefix}/bin
- ICECAST_ETCDIR=conf
- ICECAST_ETCDIR_INST=${prefix}/conf
- ICECAST_SHAREDIR=${prefix}
- ICECAST_LOGDIR=logs
- ICECAST_LOGDIR_INST=${prefix}/logs
- ICECAST_TEMPLATEDIR=templates
- ICECAST_TEMPLATEDIR_INST=${prefix}/templates
- ICECAST_STATICDIR=static
- ICECAST_STATICDIR_INST=${prefix}/static
- ICECAST_DOCDIR=${prefix}/doc
+ ICECAST_ETCDIR=${sysconfdir}
+ ICECAST_ETCDIR_INST=${prefix}/share/examples/icecast
+ ICECAST_SHAREDIR=${prefix}/share/icecast
+ ICECAST_LOGDIR=/var/log/icecast
+ ICECAST_LOGDIR_INST=/var/log/icecast
+ ICECAST_TEMPLATEDIR=${prefix}/share/icecast/templates
+ ICECAST_TEMPLATEDIR_INST=${prefix}/share/icecast/templates
+ ICECAST_STATICDIR=${prefix}/share/icecast/static
+ ICECAST_STATICDIR_INST=${prefix}/share/icecast/static
+ ICECAST_DOCDIR=${prefix}/share/doc/icecast
USE_FSSTD=no
fi
@@ -95,6 +95,7 @@ AC_PROG_RANLIB
dnl Checks for programs.
AC_PROG_CC
+AC_CANONICAL_HOST
if test "$CC" = "gcc"; then
CFLAGS="$CFLAGS -Wall"
@@ -156,17 +157,6 @@ case $system in
__SOMEBSD__=yes
AC_DEFINE(__SOMEBSD__)
AC_MSG_RESULT(Some BSD variant)
- OLDCPPFLAGS=$CPPFLAGS
- THREADCPPFLAGS="-pthread"
- CPPFLAGS="$OLDCPPFLAGS $THREADCPPFLAGS"
- AC_TRY_COMPILE([#include <pthread.h>],
- [pthread_t thread; ],
- ,
- CPPFLAGS="$OLDCPPFLAGS")
- CPPFLAGS=$OLDCPPFLAGS
- if test "$CC" = gcc; then
- CFLAGS="-pthreads $CFLAGS"
- fi
;;
*)
AC_MSG_RESULT($system)
@@ -362,6 +352,14 @@ THREADLIBS="no"
AC_MSG_CHECKING(for pthread functions in standard libraries)
AC_TRY_LINK(, [pthread_create();],AC_MSG_RESULT(yes);THREADLIBS="",AC_MSG_RESULT(no))
+
+case "$host_os" in
+*openbsd*)
+ AC_MSG_CHECKING(for pthreads on OpenBSD)
+ THREADLIBS="-pthread"
+ AC_MSG_RESULT($THREADLIBS)
+ ;;
+esac
if test "$THREADLIBS" = ""; then
AC_MSG_CHECKING(if that definition really works)

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.2 2000/08/29 04:27:51 brad Exp $
# $OpenBSD: INSTALL,v 1.3 2002/03/03 01:37:38 brad Exp $
#
# Pre/post-installation setup of icecast
@ -30,7 +30,7 @@ do_notice()
do_install()
{
install -d -o root -g wheel -m 755 $CONFIG_DIR
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/icecast.conf.dist $CONFIG_FILE
install -o root -g wheel -m 600 $SAMPLE_CONFIG_DIR/icecast.conf.dist $CONFIG_FILE
echo
echo "+---------------"
echo "| The $1 configuration files in $CONFIG_DIR,"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2001/03/06 06:52:43 fgsch Exp $
@comment $OpenBSD: PLIST,v 1.4 2002/03/03 01:37:38 brad Exp $
bin/icecast
share/doc/icecast/AUTHORS
share/doc/icecast/BUGS
@ -29,7 +29,6 @@ share/icecast/templates/list_directory.html
share/icecast/templates/mountlist.html
share/icecast/templates/statistics.html
@dirrm share/icecast/templates
@dirrm share/icecast/static
@dirrm share/icecast
@dirrm share/examples/icecast
@dirrm share/doc/icecast