diff options
Diffstat (limited to 'net/DarwinStreamingServer/files')
10 files changed, 147 insertions, 82 deletions
diff --git a/net/DarwinStreamingServer/files/darwin_streaming_server.sh b/net/DarwinStreamingServer/files/darwin_streaming_server.sh deleted file mode 100644 index 765c60cfe4a5..000000000000 --- a/net/DarwinStreamingServer/files/darwin_streaming_server.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/${0##*/}\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 64 -fi - -if [ -r /etc/defaults/rc.conf ]; then - . /etc/defaults/rc.conf - source_rc_confs -elif [ -r /etc/rc.conf ]; then - . /etc/rc.conf -fi - -case "$1" in -start) - case ${darwin_streaming_server_enable} in - [Yy][Ee][Ss]) - /usr/bin/nice -5 ${darwin_streaming_server_program:-${PREFIX}/sbin/DarwinStreamingServer} ${darwin_streaming_server_flags} && \ - echo -n ' DarwinStreamingServer' - ;; - esac - ;; -stop) - case ${darwin_streaming_server_enable} in - [Yy][Ee][Ss]) - if [ -f /var/run/DarwinStreamingServer.pid ]; then - /bin/kill `/bin/cat /var/run/DarwinStreamingServer.pid` - echo -n ' DarwinStreamingServer' - fi - ;; - esac - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - ;; -esac - -exit 0 diff --git a/net/DarwinStreamingServer/files/darwin_streaming_server.sh.in b/net/DarwinStreamingServer/files/darwin_streaming_server.sh.in new file mode 100644 index 000000000000..b66febd6bb01 --- /dev/null +++ b/net/DarwinStreamingServer/files/darwin_streaming_server.sh.in @@ -0,0 +1,26 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# PROVIDE: darwin_streaming_server +# REQUIRE: streamingadminserver +# +darwin_streaming_server_enable=${darwin_streaming_server_enable-"NO"} + +. %%RC_SUBR%% + +name=darwin_streaming_server +rcvar=`set_rcvar` +command=%%PREFIX%%/sbin/DarwinStreamingServer + +load_rc_config ${name} + +case "$streamingadminserver_enable" in +[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) + darwin_streaming_server_enable="NO" + ;; +esac + +pidfile=/var/run/DarwinStreamingServer.pid + +run_rc_command "$1" diff --git a/net/DarwinStreamingServer/files/patch-Buildit b/net/DarwinStreamingServer/files/patch-Buildit index be749ba93e92..8cf222930639 100644 --- a/net/DarwinStreamingServer/files/patch-Buildit +++ b/net/DarwinStreamingServer/files/patch-Buildit @@ -1,6 +1,6 @@ ---- Buildit.orig Tue May 31 19:54:23 2005 -+++ Buildit Sun Jul 10 15:22:41 2005 -@@ -93,20 +93,20 @@ +--- Buildit.orig Fri Jul 14 18:36:35 2006 ++++ Buildit Sat Aug 12 23:51:46 2006 +@@ -100,20 +100,20 @@ fi ;; @@ -19,7 +19,7 @@ - COMPILER_FLAGS= - INCLUDE_FLAG="-include" + COMPILER_FLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" -+ INCLUDE_FLAG="-include" ++ INCLUDE_FLAG="-include" - CORE_LINK_LIBS="-pthread -lm -lcrypt" + CORE_LINK_LIBS="${PTHREAD_LIBS} -lm -lcrypt" diff --git a/net/DarwinStreamingServer/files/patch-CommonUtilitiesLib::OSHeaders.h b/net/DarwinStreamingServer/files/patch-CommonUtilitiesLib::OSHeaders.h new file mode 100644 index 000000000000..d26e6f2d9fa5 --- /dev/null +++ b/net/DarwinStreamingServer/files/patch-CommonUtilitiesLib::OSHeaders.h @@ -0,0 +1,49 @@ +--- CommonUtilitiesLib/OSHeaders.h.orig Wed May 18 17:01:14 2005 ++++ CommonUtilitiesLib/OSHeaders.h Sun Aug 13 00:34:52 2006 +@@ -27,11 +27,20 @@ + #define OSHeaders_H + #include <limits.h> + ++#ifdef __amd64__ ++#define CPU_64BIT ++#endif ++ + #define kSInt16_Max USHRT_MAX + #define kUInt16_Max USHRT_MAX + ++#ifdef CPU_64BIT ++#define kSInt32_Max INT_MAX ++#define kUInt32_Max UINT_MAX ++#else + #define kSInt32_Max LONG_MAX + #define kUInt32_Max ULONG_MAX ++#endif + + #define kSInt64_Max LONG_LONG_MAX + #define kUInt64_Max ULONG_LONG_MAX +@@ -72,8 +81,13 @@ + typedef signed char SInt8; + typedef unsigned short UInt16; + typedef signed short SInt16; ++#ifdef CPU_64BIT ++ typedef unsigned int UInt32; ++ typedef signed int SInt32; ++#else + typedef unsigned long UInt32; + typedef signed long SInt32; ++#endif + typedef signed long long SInt64; + typedef unsigned long long UInt64; + typedef float Float32; +@@ -81,7 +95,11 @@ + typedef UInt16 Bool16; + typedef UInt8 Bool8; + ++#ifdef CPU_64BIT ++ typedef unsigned int FourCharCode; ++#else + typedef unsigned long FourCharCode; ++#endif + typedef FourCharCode OSType; + + #ifdef FOUR_CHARS_TO_INT diff --git a/net/DarwinStreamingServer/files/patch-DSS_MakeRoot b/net/DarwinStreamingServer/files/patch-DSS_MakeRoot new file mode 100644 index 000000000000..08d94055b9bd --- /dev/null +++ b/net/DarwinStreamingServer/files/patch-DSS_MakeRoot @@ -0,0 +1,15 @@ +--- DSS_MakeRoot.orig Fri May 27 18:54:45 2005 ++++ DSS_MakeRoot Sun Aug 13 00:33:59 2006 +@@ -5,10 +5,10 @@ + # source release + + DSS=0 +-if [ $1 = "-f" ]; then ++if [ x"$1" = x"-f" ]; then + FLATTEN=1 + INSTALLROOT=$2 +- if [ $3 = "dss" ]; then ++ if [ x"$3" = x"dss" ]; then + DSS=1 + fi + else diff --git a/net/DarwinStreamingServer/files/patch-MP3Broadcaster::BroadcasterMain.cpp b/net/DarwinStreamingServer/files/patch-MP3Broadcaster::BroadcasterMain.cpp new file mode 100644 index 000000000000..fbb8ed529b1b --- /dev/null +++ b/net/DarwinStreamingServer/files/patch-MP3Broadcaster::BroadcasterMain.cpp @@ -0,0 +1,11 @@ +--- MP3Broadcaster/BroadcasterMain.cpp.orig Sat Mar 12 08:24:54 2005 ++++ MP3Broadcaster/BroadcasterMain.cpp Sun Aug 13 00:37:12 2006 +@@ -216,7 +216,7 @@ + + struct sigaction act; + +-#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__) ++#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__) || defined(__amd64__) + sigemptyset(&act.sa_mask); + act.sa_flags = 0; + act.sa_handler = (void(*)(int))&SignalEventHandler; diff --git a/net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj::PlaylistBroadcaster.cpp b/net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj::PlaylistBroadcaster.cpp new file mode 100644 index 000000000000..951baabe6361 --- /dev/null +++ b/net/DarwinStreamingServer/files/patch-PlaylistBroadcaster.tproj::PlaylistBroadcaster.cpp @@ -0,0 +1,11 @@ +--- PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp.orig Sat Mar 12 08:24:54 2005 ++++ PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp Sun Aug 13 00:38:20 2006 +@@ -2077,7 +2077,7 @@ + + struct sigaction act; + +-#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__powerpc__) || defined (__sgi_cc__) || defined(__osf__) || defined(__hpux__) ++#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__powerpc__) || defined (__sgi_cc__) || defined(__osf__) || defined(__hpux__) || defined(__amd64__) + sigemptyset(&act.sa_mask); + act.sa_flags = 0; + act.sa_handler = (void(*)(int))&SignalEventHandler; diff --git a/net/DarwinStreamingServer/files/patch-Server.tproj::main.cpp b/net/DarwinStreamingServer/files/patch-Server.tproj::main.cpp new file mode 100644 index 000000000000..37958f7ab378 --- /dev/null +++ b/net/DarwinStreamingServer/files/patch-Server.tproj::main.cpp @@ -0,0 +1,11 @@ +--- Server.tproj/main.cpp.orig Wed Apr 27 21:21:14 2005 ++++ Server.tproj/main.cpp Sun Aug 13 00:39:07 2006 +@@ -212,7 +212,7 @@ + //(void) ::signal(SIGPIPE, SIG_IGN); + struct sigaction act; + +-#if defined(sun) || defined(i386) || defined (__MacOSX__) || defined(__powerpc__) || defined (__osf__) || defined (__sgi_cc__) || defined (__hpux__) ++#if defined(sun) || defined(i386) || defined (__MacOSX__) || defined(__powerpc__) || defined (__osf__) || defined (__sgi_cc__) || defined (__hpux__) || defined(__amd64__) + sigemptyset(&act.sa_mask); + act.sa_flags = 0; + act.sa_handler = (void(*)(int))&sigcatcher; diff --git a/net/DarwinStreamingServer/files/streamingadminserver.sh b/net/DarwinStreamingServer/files/streamingadminserver.sh deleted file mode 100644 index 58e69805821e..000000000000 --- a/net/DarwinStreamingServer/files/streamingadminserver.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/${0##*/}\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 64 -fi - -if [ -r /etc/defaults/rc.conf ]; then - . /etc/defaults/rc.conf - source_rc_confs -elif [ -r /etc/rc.conf ]; then - . /etc/rc.conf -fi - -case "$1" in -start) - case ${streamingadminserver_enable} in - [Yy][Ee][Ss]) - ${streamingadminserver_program:-${PREFIX}/sbin/streamingadminserver.pl} ${streamingadminserver_flags} && \ - echo -n ' StreamingAdminServer' - ;; - esac - ;; -stop) - case ${streamingadminserver_enable} in - [Yy][Ee][Ss]) - if [ -f /var/run/streamingadminserver.pid ]; then - /bin/kill `/bin/cat /var/run/streamingadminserver.pid` - echo -n ' StreamingAdminServer' - fi - ;; - esac - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - ;; -esac - -exit 0 diff --git a/net/DarwinStreamingServer/files/streamingadminserver.sh.in b/net/DarwinStreamingServer/files/streamingadminserver.sh.in new file mode 100644 index 000000000000..bfa06a311f9c --- /dev/null +++ b/net/DarwinStreamingServer/files/streamingadminserver.sh.in @@ -0,0 +1,20 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# PROVIDE: streamingadminserver +# REQUIRE: login +# +streamingadminserver_enable=${streamingadminserver_enable-"NO"} + +. %%RC_SUBR%% + +name=streamingadminserver +rcvar=`set_rcvar` +command=%%PREFIX%%/sbin/${name}.pl + +load_rc_config ${name} + +pidfile=/var/run/streamingadminserver.pid + +run_rc_command "$1" |