Update of /cvsroot/fink/experimental/thesin/finkinfo/sound
In directory usw-pr-cvs1:/tmp/cvs-serv10131/thesin/finkinfo/sound
Added Files:
audiofile-0.2.3-4.info audiofile-0.2.3-4.patch
bladeenc-0.94.2-2.info bladeenc-0.94.2-2.patch
icecast-1.3.11-4.info icecast-1.3.11-4.patch
mpg123-pre0.59s-4.info mpg123-pre0.59s-4.patch
shout-0.8.0-2.info shout-0.8.0-2.patch speex-0.8.1-1.info
speex-0.8.1-1.patch xmms-status-0.9-1.info
xmms-status-0.9-1.patch
Log Message:
finally making a finkinfo dir
--- NEW FILE: audiofile-0.2.3-4.info ---
Package: audiofile
Version: 0.2.3
Revision: 4
###
Depends: %N-shlibs (= %v-%r), %N-bin
BuildDepends: fink (>= 0.9.9)
Replaces: %N (<< %v-5)
BuildDependsOnly: true
###
Source: mirror:gnome:pre-gnome2/sources/%n/%n-%v.tar.gz
Source-MD5: 73f420be03e3f4591008fd5ead6d284d
###
Patch: %f.patch
###
ConfigureParams: --mandir=%i/share/man --infodir=%p/share/info --libexecdir=%p/lib
InstallScript: <<
make install DESTDIR=%d
rm -f %i/lib/lib%n.dylib
ln -s %p/lib/lib%n.0.0.2.dylib %i/lib/lib%n.dylib
<<
###
DocFiles: COPYING* README
###
SetCPPFLAGS: -no-cpp-precomp
###
SplitOff: <<
Package: %N-shlibs
Replaces: %N (<< %v-5)
Suggests: %N-bin
Files: lib/lib%N.0.dylib lib/lib%N.0.0.2.dylib
DocFiles: ACKNOWLEDGEMENTS AUTHORS COPYING* ChangeLog INSTALL NEWS NOTES README TODO
<<
SplitOff2: <<
Package: %N-bin
Replaces: %N (<< %v-5)
Depends: %N-shlibs (= %v-%r)
Files: bin/ share/aclocal/
DocFiles: COPYING* README
<<
###
Description: Audio File Library
DescDetail: <<
The Silicon Graphics Audio File Library provides a uniform programming
interface to standard digital audio file formats.
<<
DescPackaging: <<
The library versioning scheme has changed since 0.2.0. A compatibility
symlink is provided.
<<
###
License: LGPL
Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>
Homepage: http://oss.sgi.com/projects/audiofile/
--- NEW FILE: audiofile-0.2.3-4.patch ---
diff -ru audiofile-0.2.3/ltmain.sh audiofile-0.2.3-patched/ltmain.sh
--- audiofile-0.2.3/ltmain.sh Thu Oct 25 22:12:17 2001
+++ audiofile-0.2.3-patched/ltmain.sh Fri Feb 1 16:11:59 2002
@@ -2894,7 +2894,12 @@
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
eval cmds=\"$archive_expsym_cmds\"
else
+ save_deplibs="$deplibs"
+ for conv in $convenience; do
+ deplibs="${deplibs%$conv*} ${deplibs#*$conv}"
+ done
eval cmds=\"$archive_cmds\"
+ deplibs="$save_deplibs"
fi
save_ifs="$IFS"; IFS='~'
for cmd in $cmds; do
--- NEW FILE: bladeenc-0.94.2-2.info ---
Package: bladeenc
Version: 0.94.2
Revision: 2
###
BuildDepends: fink (>= 0.10)
###
Source: http://%n.mp3.no/source/%n-%v-src-stable.tar.gz
Source-MD5: 9b9f6eafe1637a48a67f0a0f8f6e71ad
SourceDirectory: %n-%v
TarFilesRename: BladeEnc.*
###
Patch: %f.patch
###
ConfigureParams: --mandir=%i/share/man --infodir=%p/share/info --libexecdir=%p/lib
###
DocFiles: AUTHORS COPYING ChangeLog INSTALL README TODO bladeenc.html
###
Description: LGPL'ed MP3 Encoder
DescDetail: <<
BladeEnc is a free, cross-platform, console-based MP3 encoder, based on
the ISO reference code. It is mostly intended for high quality encoding
in high bitrates.
<<
###
License: LGPL
Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>
Homepage: http://bladeenc.mp3.no/
--- NEW FILE: bladeenc-0.94.2-2.patch ---
diff -ruN bladeenc-0.94.2.orig/bladeenc/system.h bladeenc-0.94.2/bladeenc/system.h
--- bladeenc-0.94.2.orig/bladeenc/system.h 2001-05-08 06:11:53.000000000 -0600
+++ bladeenc-0.94.2/bladeenc/system.h 2002-01-10 15:19:28.000000000 -0700
@@ -321,10 +321,4 @@
typedef unsigned char uchar;
-#if (defined(UNIX_SYSTEM) && !defined(SYS_TYPES_H) && !defined(_SYS_TYPES_H)) ||
(!defined UNIX_SYSTEM && !defined(__GNUC__))
- typedef unsigned short ushort;
- typedef unsigned int uint;
-#endif
-
-
#endif /* __SYSTEM__ */
--- NEW FILE: icecast-1.3.11-4.info ---
Package: icecast
Version: 1.3.11
Revision: 4
###
Depends: daemonic
###
Source: http://www.icecast.org/releases/%n-%v.tar.gz
Source-MD5: 20d3b21829bc450c19607ee39ccb0e6c
###
Patch: %f.patch
###
ConfigureParams: --mandir=%i/share/man --infodir=%p/share/info --libexecdir=%p/lib
InstallScript: <<
make install DESTDIR=%d
cp %i/etc/icecast/groups.aut.dist %i/etc/icecast/groups.aut
cat %i/etc/icecast/icecast.conf.dist | sed s/your.server.name/localhost/ >
%i/etc/icecast/icecast.conf
cp %i/etc/icecast/mounts.aut.dist %i/etc/icecast/mounts.aut
cp %i/etc/icecast/users.aut.dist %i/etc/icecast/users.aut
<<
###
DocFiles: AUTHORS BUGS CHANGES COPYING ChangeLog FAQ INSTALL README TESTED TODO
icecast.spec
ConfFiles: <<
%p/etc/icecast/groups.aut
%p/etc/icecast/icecast.conf
%p/etc/icecast/mounts.aut
%p/etc/icecast/users.aut
<<
###
DaemonicName: icecast
DaemonicFile: <<
<service>
<description>IceCast MP3 Streaming Server</description>
<message>IceCast MP3 Streaming Server</message>
<daemon name="icecast">
<executable background="yes">%p/bin/icecast -c %p/etc/icecast/icecast.conf</executable>
<!-- the daemon will background itself, but may take a while
to start up to the point where it does so -->
<configfile>%p/etc/icecast/icecast.conf</configfile>
<pidfile>%p/var/run/icecast.pid</pidfile>
</daemon>
</service>
<<
###
Description: MP3 Audio Broadcasting System
DescDetail: <<
Icecast is a streaming media server based on the MP3 audio codec. It will
stream MP3s to virtually anything that will play MP3s, including XMMS,
mpg123, Sonique, WinAMP, RealPlayer, Windows Media Player, Ultraplayer,
C3, and others.
<<
DescPort: <<
Use "sudo daemonic enable icecast" for it to load on bootup
<<
###
License: GPL
Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>
Homepage: http://www.icecast.org/
--- NEW FILE: icecast-1.3.11-4.patch ---
diff -ru icecast-1.3.11/configure icecast-1.3.11-patched/configure
--- icecast-1.3.11/configure Tue Aug 7 20:59:26 2001
+++ icecast-1.3.11-patched/configure Tue Nov 20 10:15:37 2001
@@ -874,18 +874,18 @@
ICECAST_DOCDIR=/usr/doc/icecast-${ICECAST_VERSION_SMALL}
USE_FSSTD=yes
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_BINDIR=${prefix}/bin
+ ICECAST_SBINDIR=${prefix}/bin
+ ICECAST_ETCDIR=etc/icecast
+ ICECAST_ETCDIR_INST=${prefix}/etc/icecast
+ ICECAST_SHAREDIR=${prefix}/share/icecast
+ ICECAST_LOGDIR=var/log/icecast
+ ICECAST_LOGDIR_INST=${prefix}/var/log/icecast
+ ICECAST_TEMPLATEDIR=share/icecast/templates
+ ICECAST_TEMPLATEDIR_INST=${prefix}/share/icecast/templates
+ ICECAST_STATICDIR=share/icecast/static
+ ICECAST_STATICDIR_INST=${prefix}/share/icecast/static
+ ICECAST_DOCDIR=${prefix}/share/doc/icecast
USE_FSSTD=no
fi
diff -ru icecast-1.3.11/configure.in icecast-1.3.11-patched/configure.in
--- icecast-1.3.11/configure.in Tue Aug 7 20:52:19 2001
+++ icecast-1.3.11-patched/configure.in Tue Nov 20 10:12:15 2001
@@ -55,16 +55,16 @@
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=etc/icecast
+ ICECAST_ETCDIR_INST=${prefix}/etc/icecast
+ ICECAST_SHAREDIR=${prefix}/share/icecast
+ ICECAST_LOGDIR=var/log/icecast
+ ICECAST_LOGDIR_INST=${prefix}/var/log/icecast
+ ICECAST_TEMPLATEDIR=share/icecast/templates
+ ICECAST_TEMPLATEDIR_INST=${prefix}/share/icecast/templates
+ ICECAST_STATICDIR=share/icecast/static
+ ICECAST_STATICDIR_INST=${prefix}/share/icecast/static
+ ICECAST_DOCDIR=${prefix}/share/doc/icecast
USE_FSSTD=no
fi
--- NEW FILE: mpg123-pre0.59s-4.info ---
Package: mpg123
Version: pre0.59s
Revision: 4
###
Depends: esound-shlibs, audiofile-shlibs
BuildDepends: fink (>= 0.10), esound, audiofile
###
Source: http://www.%n.de/%n/%n-%v.tar.gz
Source-MD5: a63675b0ea7990d4a7d7e7e14f23a3e4
SourceDirectory: %n
TarFilesRename: JUKEBOX:JUKEBOX.txt
###
PatchScript: <<
sed 's|@FINKPREFIX@|%i|g' <%a/%f.patch | patch -p1
<<
###
CompileScript: <<
make darwin-esd
<<
###
DocFiles: BENCHMARKING BUGS CHANGES COPYING JUKEBOX.txt README TODO
###
Description: Real time MPEG Audio Player for Layer 1,2 and Layer3
DescDetail: <<
Mpg123 is a fast, free and portable MPEG audio player for Unix. It supports
MPEG 1.0/2.0 layers 1, 2 and 3. For full CD quality playback (44 kHz, 16 bit,
stereo) a Pentium, SPARCstation10, DEC Alpha or similar CPU is required.
Mono and/or reduced quality playback (22 kHz or 11 kHz) is even possible
on 486 CPUs.
<<
###
License: Restrictive
Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>
Homepage: http://www.mpg123.de/
--- NEW FILE: mpg123-pre0.59s-4.patch ---
diff -ru mpg123/Makefile mpg123-patched/Makefile
--- mpg123/Makefile Tue Jan 23 11:00:46 2001
+++ mpg123-patched/Makefile Wed Sep 12 15:53:51 2001
@@ -4,9 +4,9 @@
# Where to install binary and manpage on "make install":
-PREFIX=/usr/local
+PREFIX=@FINKPREFIX@
BINDIR=$(PREFIX)/bin
-MANDIR=$(PREFIX)/man
+MANDIR=$(PREFIX)/share/man
SECTION=1
########################################################
@@ -54,6 +54,7 @@
@echo "make netbsd NetBSD"
@echo "make openbsd OpenBSD"
@echo "make mint MiNT on Atari"
+ @echo "make darwin-esd Darwin (OSX) And ESound
@echo "make generic try this one if your system isn't listed above"
@echo ""
@echo "Please read the file INSTALL for additional information."
@@ -736,6 +737,12 @@
-finline-functions -ffast-math \
-DREAL_IS_FLOAT -DMINT -DNOXFERMEM' \
AUDIO_LIB='-lsocket' \
+ mpg123-make
+
+darwin-esd:
+ $(MAKE) CC=cc LDFLAGS='$(LDFLAGS)' AUDIO_LIB='-lesd -laudiofile' \
+ OBJECTS='decode.o dct64.o audio_esd.o' \
+ CFLAGS='$(CFLAGS) -O -DDARWIN -Wall -O2 -DPPC_ENDIAN -DUSE_ESD' \
mpg123-make
# maybe you need the additonal options LDFLAGS='-lnsl -lsocket' when linking (see
solaris:)
--- NEW FILE: shout-0.8.0-2.info ---
Package: shout
Version: 0.8.0
Revision: 2
###
Source: http://www.icecast.org/releases/%n-%v.tar.gz
Source-MD5: d44604a2235532e31e10d2d0e4740f20
###
Patch: %f.patch
###
ConfigureParams: --mandir=%i/share/man --infodir=%p/share/info --libexecdir=%p/lib
CompileScript: <<
./configure %c
rm -rf sock.o
make
<<
InstallScript: <<
make install DESTDIR=%d
cp %i/etc/shout.conf.dist %i/etc/shout.conf
touch %i/etc/shout.playlist
touch %i/var/log/default.playlist
<<
###
DocFiles: BUGS* CREDITS README* TODO
ConfFiles:<<
%p/etc/shout.conf
%p/etc/shout.playlist
<<
###
SetCFLAGS: -Wno-long-double
###
Description: Client for the shoutcast MP3 streaming system
DescDetail: <<
Shout is a broadcasting tool for icecast streaming servers. It broadcasts
mp3 files to an icecast server, and supports external programs which do
song selection.
<<
###
License: GPL
Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>
Homepage: http://www.icecast.org/
--- NEW FILE: shout-0.8.0-2.patch ---
diff -ru shout-0.8.0/Makefile.in shout-0.8.0-patched/Makefile.in
--- shout-0.8.0/Makefile.in Thu Apr 20 01:31:50 2000
+++ shout-0.8.0-patched/Makefile.in Tue Nov 20 13:11:35 2001
@@ -9,7 +9,7 @@
srcdir = @srcdir@
VPATH = @srcdir@
-prefix = @prefix@/icecast
+prefix = @prefix@
exec_prefix = @prefix@
bindir = @BINDIR@
etcdir = @ETCDIR@
diff -ru shout-0.8.0/configure shout-0.8.0-patched/configure
--- shout-0.8.0/configure Thu Apr 20 01:41:45 2000
+++ shout-0.8.0-patched/configure Tue Nov 20 13:17:59 2001
@@ -539,9 +539,9 @@
LOGDIR="/var/log/icecast"
else
echo "FSSTD DISABLED"
- BINDIR="${prefix}/icecast/bin"
- ETCDIR="${prefix}/icecast/etc"
- LOGDIR="${prefix}/icecast/log"
+ BINDIR="${prefix}/bin"
+ ETCDIR="${prefix}/etc"
+ LOGDIR="${prefix}/var/log"
fi
diff -ru shout-0.8.0/sock.c shout-0.8.0-patched/sock.c
--- shout-0.8.0/sock.c Thu Apr 20 01:31:50 2000
+++ shout-0.8.0-patched/sock.c Tue Nov 20 13:06:30 2001
@@ -12,6 +12,7 @@
#include <process.h>
#include <winbase.h>
#else /* *NIX */
+#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
diff -ru shout-0.8.0/util.c shout-0.8.0-patched/util.c
--- shout-0.8.0/util.c Thu Apr 20 01:31:50 2000
+++ shout-0.8.0-patched/util.c Tue Nov 20 11:38:14 2001
@@ -18,6 +18,7 @@
#include <process.h>
#include <winbase.h>
#else /* *NIX */
+#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
--- NEW FILE: speex-0.8.1-1.info ---
Package: speex
Version: 0.8.1
Revision: 1
###
Depends: libgnugetopt-shlibs, libogg-shlibs, %N-shlibs (= %v-%r)
BuildDepends: libgnugetopt, libogg
###
Source: mirror:sourceforge:%n/Speex-%v.tar.gz
Source-MD5: 83bed45197890810a4bab09da7ca9e42
###
Patch: %f.patch
###
ConfigureParams: --with-ogg-dir=%p --with-pic --enable-shared --enable-static
--mandir=%i/share/man --infodir=%p/share/info --libexecdir=%p/lib
###
Splitoff: <<
Package: %N-shlibs
Depends: libgnugetopt-shlibs, libogg-shlibs
BuildDepends: libgnugetopt, libogg
Files: <<
lib/lib%N-*.dylib
<<
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
<<
###
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
###
#SetCPPFLAGS: -no-cpp-precomp
###
Description: Voice compression format (codec)
DescDetail: <<
Speex is a patent-free compression format designed especially for speech. It
is specialized for voice communications at low bit-rates in the
8-32 kbps/channel range. Possible applications include Voice over IP (VoIP)
applications, Internet audio streaming at low bit-rate, and archiving of
speech data (e.g. voice mail).
<<
###
License: LGPL
Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>
Homepage: http://speex.sourceforge.net/
--- NEW FILE: speex-0.8.1-1.patch ---
diff -ruN Speex-0.8.1.orig/ltmain.sh Speex-0.8.1/ltmain.sh
--- Speex-0.8.1.orig/ltmain.sh 2002-08-22 23:43:38.000000000 -0600
+++ Speex-0.8.1/ltmain.sh 2002-09-24 08:30:56.000000000 -0600
@@ -56,7 +56,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
VERSION=1.4.2
-TIMESTAMP=" (1.922.2.54 2001/09/11 03:33:37)"
+TIMESTAMP=" (1.922.2.53 2001/09/11 03:18:52)"
default_mode=
help="Try \`$progname --help' for more information."
@@ -467,7 +467,7 @@
pic_mode=default
;;
esac
- if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+ if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
# non-PIC code in shared libraries is not supported
pic_mode=default
fi
@@ -1303,11 +1303,11 @@
output_objdir="$output_objdir/$objdir"
fi
# Create the object directory.
- if test ! -d "$output_objdir"; then
+ if test ! -d $output_objdir; then
$show "$mkdir $output_objdir"
$run $mkdir $output_objdir
status=$?
- if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+ if test $status -ne 0 && test ! -d $output_objdir; then
exit $status
fi
fi
@@ -1366,7 +1366,7 @@
;;
esac
for pass in $passes; do
- if test "$linkmode" = prog; then
+ if test $linkmode = prog; then
# Determine which files to process
case $pass in
dlopen)
@@ -1383,11 +1383,11 @@
found=no
case $deplib in
-l*)
- if test "$linkmode" = oldlib && test "$linkmode" = obj; then
+ if test $linkmode = oldlib && test $linkmode = obj; then
$echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib"
1>&2
continue
fi
- if test "$pass" = conv; then
+ if test $pass = conv; then
deplibs="$deplib $deplibs"
continue
fi
@@ -1407,7 +1407,7 @@
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib
$newdependency_libs"
+ test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
fi
continue
fi
@@ -1416,16 +1416,16 @@
case $linkmode in
lib)
deplibs="$deplib $deplibs"
- test "$pass" = conv && continue
+ test $pass = conv && continue
newdependency_libs="$deplib $newdependency_libs"
newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e
's/^-L//'`
;;
prog)
- if test "$pass" = conv; then
+ if test $pass = conv; then
deplibs="$deplib $deplibs"
continue
fi
- if test "$pass" = scan; then
+ if test $pass = scan; then
deplibs="$deplib $deplibs"
newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e
's/^-L//'`
else
@@ -1440,7 +1440,7 @@
continue
;; # -L
-R*)
- if test "$pass" = link; then
+ if test $pass = link; then
dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
# Make sure the xrpath contains only unique directories.
case "$xrpath " in
@@ -1453,7 +1453,7 @@
;;
*.la) lib="$deplib" ;;
*.$libext)
- if test "$pass" = conv; then
+ if test $pass = conv; then
deplibs="$deplib $deplibs"
continue
fi
@@ -1474,7 +1474,7 @@
continue
;;
prog)
- if test "$pass" != link; then
+ if test $pass != link; then
deplibs="$deplib $deplibs"
else
compile_deplibs="$deplib $compile_deplibs"
@@ -1485,7 +1485,7 @@
esac # linkmode
;; # *.$libext
*.lo | *.$objext)
- if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test
"$build_libtool_libs" = no; then
+ if test $pass = dlpreopen || test "$dlopen_support" != yes || test
+"$build_libtool_libs" = no; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
newdlprefiles="$newdlprefiles $deplib"
@@ -1501,7 +1501,7 @@
continue
;;
esac # case $deplib
- if test "$found" = yes || test -f "$lib"; then :
+ if test $found = yes || test -f "$lib"; then :
else
$echo "$modename: cannot find the library \`$lib'" 1>&2
exit 1
@@ -1535,13 +1535,13 @@
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
- { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
+ { test $linkmode = oldlib && test $linkmode = obj; }; then
# Add dl[pre]opened files of deplib
test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
fi
- if test "$pass" = conv; then
+ if test $pass = conv; then
# Only check for convenience libraries
deplibs="$lib $deplibs"
if test -z "$libdir"; then
@@ -1560,7 +1560,7 @@
esac
tmp_libs="$tmp_libs $deplib"
done
- elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ elif test $linkmode != prog && test $linkmode != lib; then
$echo "$modename: \`$lib' is not a convenience library" 1>&2
exit 1
fi
@@ -1578,7 +1578,7 @@
fi
# This library was specified with -dlopen.
- if test "$pass" = dlopen; then
+ if test $pass = dlopen; then
if test -z "$libdir"; then
$echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
exit 1
@@ -1627,7 +1627,7 @@
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
# This library was specified with -dlpreopen.
- if test "$pass" = dlpreopen; then
+ if test $pass = dlpreopen; then
if test -z "$libdir"; then
$echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
exit 1
@@ -1646,7 +1646,7 @@
if test -z "$libdir"; then
# Link the convenience library
- if test "$linkmode" = lib; then
+ if test $linkmode = lib; then
deplibs="$dir/$old_library $deplibs"
elif test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$dir/$old_library $compile_deplibs"
@@ -1657,7 +1657,7 @@
continue
fi
- if test "$linkmode" = prog && test "$pass" != link; then
+ if test $linkmode = prog && test $pass != link; then
newlib_search_path="$newlib_search_path $ladir"
deplibs="$lib $deplibs"
@@ -1673,7 +1673,7 @@
-L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e
's/^-L//'`;; ### testsuite: skip nested quoting test
esac
# Need to link against all dependency_libs?
- if test "$linkalldeplibs" = yes; then
+ if test $linkalldeplibs = yes; then
deplibs="$deplib $deplibs"
else
# Need to hardcode shared library paths
@@ -1694,7 +1694,7 @@
# Link against this shared library
if test "$linkmode,$pass" = "prog,link" ||
- { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
+ { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
# Hardcode the library path.
# Skip directories that are in the system default run-time
# search path.
@@ -1716,7 +1716,7 @@
esac
;;
esac
- if test "$linkmode" = prog; then
+ if test $linkmode = prog; then
# We need to hardcode the library path
if test -n "$shlibpath_var"; then
# Make sure the rpath contains only unique directories.
@@ -1798,9 +1798,9 @@
# make sure the library variables are pointing to the new library
dir=$output_objdir
linklib=$newlib
- fi # test -n "$old_archive_from_expsyms_cmds"
+ fi # test -n $old_archive_from_expsyms_cmds
- if test "$linkmode" = prog || test "$mode" != relink; then
+ if test $linkmode = prog || test "$mode" != relink; then
add_shlibpath=
add_dir=
add=
@@ -1849,7 +1849,7 @@
*) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
esac
fi
- if test "$linkmode" = prog; then
+ if test $linkmode = prog; then
test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
test -n "$add" && compile_deplibs="$add $compile_deplibs"
else
@@ -1866,7 +1866,7 @@
fi
fi
- if test "$linkmode" = prog || test "$mode" = relink; then
+ if test $linkmode = prog || test "$mode" = relink; then
add_shlibpath=
add_dir=
add=
@@ -1888,7 +1888,7 @@
add="-l$name"
fi
- if test "$linkmode" = prog; then
+ if test $linkmode = prog; then
test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
else
@@ -1896,7 +1896,7 @@
test -n "$add" && deplibs="$add $deplibs"
fi
fi
- elif test "$linkmode" = prog; then
+ elif test $linkmode = prog; then
if test "$alldeplibs" = yes &&
{ test "$deplibs_check_method" = pass_all ||
{ test "$build_libtool_libs" = yes &&
@@ -1955,10 +1955,10 @@
fi
fi # link shared/static library?
- if test "$linkmode" = lib; then
+ if test $linkmode = lib; then
if test -n "$dependency_libs" &&
- { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
- test "$link_static" = yes; }; then
+ { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
+ test $link_static = yes; }; then
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
@@ -1987,7 +1987,7 @@
tmp_libs="$tmp_libs $deplib"
done
- if test "$link_all_deplibs" != no; then
+ if test $link_all_deplibs != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
case $deplib in
@@ -2030,15 +2030,15 @@
fi # link_all_deplibs != no
fi # linkmode = lib
done # for deplib in $libs
- if test "$pass" = dlpreopen; then
+ if test $pass = dlpreopen; then
# Link the dlpreopened libraries before other libraries
for deplib in $save_deplibs; do
deplibs="$deplib $deplibs"
done
fi
- if test "$pass" != dlopen; then
- test "$pass" != scan && dependency_libs="$newdependency_libs"
- if test "$pass" != conv; then
+ if test $pass != dlopen; then
+ test $pass != scan && dependency_libs="$newdependency_libs"
+ if test $pass != conv; then
# Make sure lib_search_path contains only unique directories.
lib_search_path=
for dir in $newlib_search_path; do
@@ -2096,7 +2096,7 @@
deplibs=
fi
done # for pass
- if test "$linkmode" = prog; then
+ if test $linkmode = prog; then
dlfiles="$newdlfiles"
dlprefiles="$newdlprefiles"
fi
@@ -2173,7 +2173,7 @@
fi
set dummy $rpath
- if test "$#" -gt 2; then
+ if test $# -gt 2; then
$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library"
1>&2
fi
install_libdir="$2"
@@ -2214,7 +2214,7 @@
# Check that each of the things are valid numbers.
case $current in
- [0-9]*) ;;
+ 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
*)
$echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
@@ -2223,7 +2223,7 @@
esac
case $revision in
- [0-9]*) ;;
+ 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
*)
$echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
@@ -2232,7 +2232,7 @@
esac
case $age in
- [0-9]*) ;;
+ 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
*)
$echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
@@ -2240,7 +2240,7 @@
;;
esac
- if test "$age" -gt "$current"; then
+ if test $age -gt $current; then
$echo "$modename: AGE \`$age' is greater than the current interface number
\`$current'" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
exit 1
@@ -2279,7 +2279,7 @@
# Add in all the interfaces that we are compatible with.
loop=$revision
- while test "$loop" -ne 0; do
+ while test $loop != 0; do
iface=`expr $revision - $loop`
loop=`expr $loop - 1`
verstring="sgi$major.$iface:$verstring"
@@ -2302,7 +2302,7 @@
# Add in all the interfaces that we are compatible with.
loop=$age
- while test "$loop" -ne 0; do
+ while test $loop != 0; do
iface=`expr $current - $loop`
loop=`expr $loop - 1`
verstring="$verstring:${iface}.0"
@@ -2403,7 +2403,7 @@
*) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
- if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
@@ -2446,7 +2446,7 @@
;;
*)
# Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
+ if test $build_libtool_need_lc = "yes"; then
deplibs="$deplibs -lc"
fi
;;
@@ -2487,7 +2487,7 @@
EOF
$rm conftest
$CC -o conftest conftest.c $deplibs
- if test "$?" -eq 0 ; then
+ if test $? -eq 0 ; then
ldd_output=`ldd conftest`
for i in $deplibs; do
name="`expr $i : '-l\(.*\)'`"
@@ -2521,7 +2521,7 @@
$rm conftest
$CC -o conftest conftest.c $i
# Did it work?
- if test "$?" -eq 0 ; then
+ if test $? -eq 0 ; then
ldd_output=`ldd conftest`
libname=`eval \\$echo \"$libname_spec\"`
deplib_matches=`eval \\$echo \"$library_names_spec\"`
@@ -2692,7 +2692,7 @@
echo "*** automatically added whenever a program is linked with this
library"
echo "*** or is declared to -dlopen it."
- if test "$allow_undefined" = no; then
+ if test $allow_undefined = no; then
echo
echo "*** Since this library must not contain undefined symbols,"
echo "*** because either the platform does not support them or"
@@ -2719,7 +2719,7 @@
# Test again, we may have decided not to build it any more
if test "$build_libtool_libs" = yes; then
- if test "$hardcode_into_libs" = yes; then
+ if test $hardcode_into_libs = yes; then
# Hardcode the library paths
hardcode_libdirs=
dep_rpath=
@@ -2850,7 +2850,7 @@
$show "mkdir $gentop"
$run mkdir "$gentop"
status=$?
- if test "$status" -ne 0 && test ! -d "$gentop"; then
+ if test $status -ne 0 && test ! -d "$gentop"; then
exit $status
fi
generated="$generated $gentop"
@@ -2869,7 +2869,7 @@
$show "mkdir $xdir"
$run mkdir "$xdir"
status=$?
- if test "$status" -ne 0 && test ! -d "$xdir"; then
+ if test $status -ne 0 && test ! -d "$xdir"; then
exit $status
fi
$show "(cd $xdir && $AR x $xabs)"
@@ -2894,7 +2894,12 @@
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
eval cmds=\"$archive_expsym_cmds\"
else
- eval cmds=\"$archive_cmds\"
+ save_deplibs="$deplibs"
+ for conv in $convenience; do
+ deplibs="${deplibs%$conv*} ${deplibs#*$conv}"
+ done
+ eval cmds=\"$archive_cmds\"
+ deplibs="$save_deplibs"
fi
save_ifs="$IFS"; IFS='~'
for cmd in $cmds; do
@@ -2989,7 +2994,7 @@
$show "mkdir $gentop"
$run mkdir "$gentop"
status=$?
- if test "$status" -ne 0 && test ! -d "$gentop"; then
+ if test $status -ne 0 && test ! -d "$gentop"; then
exit $status
fi
generated="$generated $gentop"
@@ -3008,7 +3013,7 @@
$show "mkdir $xdir"
$run mkdir "$xdir"
status=$?
- if test "$status" -ne 0 && test ! -d "$xdir"; then
+ if test $status -ne 0 && test ! -d "$xdir"; then
exit $status
fi
$show "(cd $xdir && $AR x $xabs)"
@@ -3403,7 +3408,7 @@
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
fi
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ if test $need_relink = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
compile_command=`$echo "X$compile_command" | $Xsed -e
's%@OUTPUT@%'"$output"'%g'`
link_command="$compile_command$compile_rpath"
@@ -3528,7 +3533,7 @@
relink_command="$var=\"$var_value\"; export $var; $relink_command"
fi
done
- relink_command="(cd `pwd`; $relink_command)"
+ relink_command="cd `pwd`; $relink_command"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
fi
@@ -3771,7 +3776,7 @@
$show "mkdir $gentop"
$run mkdir "$gentop"
status=$?
- if test "$status" -ne 0 && test ! -d "$gentop"; then
+ if test $status -ne 0 && test ! -d "$gentop"; then
exit $status
fi
generated="$generated $gentop"
@@ -3791,7 +3796,7 @@
$show "mkdir $xdir"
$run mkdir "$xdir"
status=$?
- if test "$status" -ne 0 && test ! -d "$xdir"; then
+ if test $status -ne 0 && test ! -d "$xdir"; then
exit $status
fi
$show "(cd $xdir && $AR x $xabs)"
@@ -3858,7 +3863,7 @@
fi
done
# Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"
+ relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
# Only create the output if not a dry run.
@@ -3948,7 +3953,7 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
- if test "$installed" = no && test "$need_relink" = yes; then
+ if test "$installed" = no && test $need_relink = yes; then
$echo >> $output "\
relink_command=\"$relink_command\""
fi
@@ -4084,7 +4089,7 @@
# Not a directory, so check to see that there is only one file specified.
set dummy $files
- if test "$#" -gt 2; then
+ if test $# -gt 2; then
$echo "$modename: \`$dest' is not a directory" 1>&2
$echo "$help" 1>&2
exit 1
@@ -4186,7 +4191,7 @@
$run eval "$striplib $destdir/$realname" || exit $?
fi
- if test "$#" -gt 0; then
+ if test $# -gt 0; then
# Delete the old symlinks, and create new ones.
for linkname
do
@@ -4319,11 +4324,7 @@
if test "$finalize" = yes && test -z "$run"; then
tmpdir="/tmp"
test -n "$TMPDIR" && tmpdir="$TMPDIR"
- tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
- if test $? = 0 ; then :
- else
- tmpdir="$tmpdir/libtool-$$"
- fi
+ tmpdir="$tmpdir/libtool-$$"
if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
else
$echo "$modename: error: cannot create temporary directory \`$tmpdir'"
1>&2
@@ -4448,7 +4449,7 @@
fi
# Exit here if they wanted silent mode.
- test "$show" = : && exit 0
+ test "$show" = ":" && exit 0
echo "----------------------------------------------------------------------"
echo "Libraries have been installed in:"
@@ -4614,7 +4615,7 @@
fi
# Now prepare to actually exec the command.
- exec_cmd="\$cmd$args"
+ exec_cmd='"$cmd"$args'
else
# Display what would be done.
if test -n "$shlibpath_var"; then
@@ -4664,10 +4665,10 @@
objdir="$dir/$objdir"
fi
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- test "$mode" = uninstall && objdir="$dir"
+ test $mode = uninstall && objdir="$dir"
# Remember objdir for removal later, being careful to avoid duplicates
- if test "$mode" = clean; then
+ if test $mode = clean; then
case " $rmdirs " in
*" $objdir "*) ;;
*) rmdirs="$rmdirs $objdir" ;;
@@ -4699,9 +4700,9 @@
rmfiles="$rmfiles $objdir/$n"
done
test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
- test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
- if test "$mode" = uninstall; then
+ if test $mode = uninstall; then
if test -n "$library_names"; then
# Do each command in the postuninstall commands.
eval cmds=\"$postuninstall_cmds\"
@@ -4710,7 +4711,7 @@
IFS="$save_ifs"
$show "$cmd"
$run eval "$cmd"
- if test "$?" -ne 0 && test "$rmforce" != yes; then
+ if test $? != 0 && test "$rmforce" != yes; then
exit_status=1
fi
done
@@ -4725,7 +4726,7 @@
IFS="$save_ifs"
$show "$cmd"
$run eval "$cmd"
- if test "$?" -ne 0 && test "$rmforce" != yes; then
+ if test $? != 0 && test "$rmforce" != yes; then
exit_status=1
fi
done
@@ -4745,7 +4746,7 @@
*)
# Do a test to see if this is a libtool program.
- if test "$mode" = clean &&
+ if test $mode = clean &&
(sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1;
then
relink_command=
. $dir/$file
diff -ruN Speex-0.8.1.orig/src/Makefile.in Speex-0.8.1/src/Makefile.in
--- Speex-0.8.1.orig/src/Makefile.in 2002-08-27 14:26:16.000000000 -0600
+++ Speex-0.8.1/src/Makefile.in 2002-09-24 08:45:35.000000000 -0600
@@ -101,10 +101,10 @@
bin_PROGRAMS = speexenc speexdec
speexenc_SOURCES = speexenc.c wav_io.c
-speexenc_LDADD = $(top_srcdir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS)
+speexenc_LDADD = $(top_srcdir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS)
+-lgnugetopt
speexdec_SOURCES = speexdec.c wav_io.c
-speexdec_LDADD = $(top_srcdir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS)
+speexdec_LDADD = $(top_srcdir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS)
+-lgnugetopt
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
bin_PROGRAMS = speexenc$(EXEEXT) speexdec$(EXEEXT)
diff -ruN Speex-0.8.1.orig/src/speexdec.c Speex-0.8.1/src/speexdec.c
--- Speex-0.8.1.orig/src/speexdec.c 2002-08-26 23:29:10.000000000 -0600
+++ Speex-0.8.1/src/speexdec.c 2002-09-24 08:44:35.000000000 -0600
@@ -19,7 +19,7 @@
#include <stdio.h>
#if !defined WIN32 && !defined _WIN32
#include <unistd.h>
-#include <getopt.h>
+#include <gnugetopt/getopt.h>
#endif
#include <stdlib.h>
#include <string.h>
diff -ruN Speex-0.8.1.orig/src/speexenc.c Speex-0.8.1/src/speexenc.c
--- Speex-0.8.1.orig/src/speexenc.c 2002-08-23 11:34:22.000000000 -0600
+++ Speex-0.8.1/src/speexenc.c 2002-09-24 08:48:22.000000000 -0600
@@ -19,7 +19,7 @@
#include <stdio.h>
#if !defined WIN32 && !defined _WIN32
#include <unistd.h>
-#include <getopt.h>
+#include <gnugetopt/getopt.h>
#endif
#include <stdlib.h>
#include <string.h>
--- NEW FILE: xmms-status-0.9-1.info ---
Package: xmms-status
Version: 0.9
Revision: 1
###
Depends: dlcompat, glib-shlibs, gtk+-shlibs, x11, xmms-shlibs
BuildDepends: xmms, gtk+, glib
###
Source: http://www.hellion.org.uk/source/%n-plugin-%v.tar.gz
Source-MD5: 75cf2f91aee128679f469a7723db73f2
###
Patch: %f.patch
###
ConfigureParams: --disable-fatal-warnings --with-pic --enable-shared --enable-static
--mandir=%i/share/man --infodir=%p/share/info --libexecdir=%p/lib
###
InstallScript: make install DESTDIR=%d
###
DocFiles: ABOUT-NLS AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README TODO
###
Description: Plugin for XMMS adds a status applet for GNOME and KDE
DescDetail: <<
xmms-status-plugin is a general plugin for the xmms mp3 player. It provides
a docklet for the GNOME Status applet and the KDE panel.
Enlightenment: Status plugins and enlightenment do not play well together,
this is not anyones fault, but is due to the rather hacky way in which
status windows are implemented. Unfortunately I don't use E and haven't
got the time to implement anything myself.
<<
###
License: GPL
Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>
Homepage: http://www.hellion.org.uk/xmms-status-plugin/
--- NEW FILE: xmms-status-0.9-1.patch ---
diff -ruN xmms-status-plugin-0.9.orig/configure xmms-status-plugin-0.9/configure
--- xmms-status-plugin-0.9.orig/configure 2002-01-18 10:19:57.000000000 -0700
+++ xmms-status-plugin-0.9/configure 2002-08-15 09:28:08.000000000 -0600
@@ -3391,7 +3391,7 @@
# cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes. Also zsh mangles
# `"' quotes if we put them in here... so don't!
- archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib)
$allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name
$rpath/$soname $verstring'
+ archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib)
+$allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(test .$module != .yes
+&& echo -install_name $rpath/$soname $verstring)'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
