From 388adea370f1b4104f1a90451b22d535bd049c9c Mon Sep 17 00:00:00 2001 From: brad Date: Wed, 3 Jan 2001 15:50:49 +0000 Subject: [PATCH] upgrade to esound 0.2.22 --- audio/esound/Makefile | 6 ++-- audio/esound/files/md5 | 6 ++-- audio/esound/patches/patch-esd.c | 38 ++++++++++++------------- audio/esound/patches/patch-ltconfig | 42 ++++++++++++++++++++++++++-- audio/esound/patches/patch-ltmain.sh | 23 +++++++-------- audio/esound/pkg/PFRAG.shared | 4 +-- 6 files changed, 79 insertions(+), 40 deletions(-) diff --git a/audio/esound/Makefile b/audio/esound/Makefile index 46cf8ee10c0..8b0f0c69943 100644 --- a/audio/esound/Makefile +++ b/audio/esound/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.20 2000/12/18 01:19:58 brad Exp $ +# $OpenBSD: Makefile,v 1.21 2001/01/03 15:50:49 brad Exp $ # $FreeBSD: Makefile,v 1.8 1999/03/09 01:08:46 nectar Exp $ -DISTNAME= esound-0.2.20 +DISTNAME= esound-0.2.22 CATEGORIES= audio NEED_VERSION= 1.336 MASTER_SITES= ${MASTER_SITE_GNOME} @@ -9,7 +9,7 @@ MASTER_SITE_SUBDIR= stable/sources/esound HOMEPAGE= http://www.tux.org/~ricdude/EsounD.html -LIB_DEPENDS= audiofile::devel/libaudiofile +LIB_DEPENDS= audiofile.0.1::devel/libaudiofile MAINTAINER= Brad Smith diff --git a/audio/esound/files/md5 b/audio/esound/files/md5 index 9ff28bb1908..a42f645aa68 100644 --- a/audio/esound/files/md5 +++ b/audio/esound/files/md5 @@ -1,3 +1,3 @@ -MD5 (esound-0.2.20.tar.gz) = 7973f370efe15bec740fb495b2571dfc -RMD160 (esound-0.2.20.tar.gz) = 5169d0a0b4abd2612d67bcf335189b28956c27cf -SHA1 (esound-0.2.20.tar.gz) = 09697e64b332688c203f87b3baf7a3bb24b7ef4e +MD5 (esound-0.2.22.tar.gz) = 0ac3c415917898ed0d98722a2f6abf2f +RMD160 (esound-0.2.22.tar.gz) = c02977750fa642f7054f7b42b4b1a786cba4dc73 +SHA1 (esound-0.2.22.tar.gz) = 85defeb1fc46cdef5d1fd99d82e58c7e24187061 diff --git a/audio/esound/patches/patch-esd.c b/audio/esound/patches/patch-esd.c index e8a6da3f65a..bce35e5909b 100644 --- a/audio/esound/patches/patch-esd.c +++ b/audio/esound/patches/patch-esd.c @@ -1,19 +1,19 @@ ---- esd.c.orig Mon Oct 2 12:39:17 2000 -+++ esd.c Thu Oct 5 19:39:00 2000 -@@ -219,12 +219,12 @@ - { - mkdir(ESD_UNIX_SOCKET_DIR, - S_IRUSR|S_IWUSR|S_IXUSR| -- S_IRGRP|S_IWGRP|S_IXGRP| -- S_IROTH|S_IWOTH|S_IXOTH); -+ S_IRGRP|S_IXGRP| -+ S_IROTH|S_IXOTH); - chmod(ESD_UNIX_SOCKET_DIR, - S_IRUSR|S_IWUSR|S_IXUSR| -- S_IRGRP|S_IWGRP|S_IXGRP| -- S_IROTH|S_IWOTH|S_IXOTH); -+ S_IRGRP|S_IXGRP| -+ S_IROTH|S_IXOTH); - } - if (access(ESD_UNIX_SOCKET_NAME, R_OK | W_OK) == -1) - { +--- esd.c.orig Wed Jan 3 08:56:09 2001 ++++ esd.c Wed Jan 3 08:58:00 2001 +@@ -210,12 +210,12 @@ + + #if defined(S_ISVTX) + #define ESD_UNIX_SOCKET_DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|\ +- S_IRGRP|S_IWGRP|S_IXGRP|\ +- S_IROTH|S_IWOTH|S_IXOTH|S_ISVTX) ++ S_IRGRP|S_IXGRP|\ ++ S_IROTH|S_IXOTH|S_ISVTX) + #else + #define ESD_UNIX_SOCKET_DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|\ +- S_IRGRP|S_IWGRP|S_IXGRP|\ +- S_IROTH|S_IWOTH|S_IXOTH) ++ S_IRGRP|S_IXGRP|\ ++ S_IROTH|S_IXOTH) + #endif + + if (mkdir(ESD_UNIX_SOCKET_DIR, ESD_UNIX_SOCKET_DIR_MODE) == 0) { diff --git a/audio/esound/patches/patch-ltconfig b/audio/esound/patches/patch-ltconfig index e004971cf57..452caa540cb 100644 --- a/audio/esound/patches/patch-ltconfig +++ b/audio/esound/patches/patch-ltconfig @@ -1,6 +1,44 @@ --- ltconfig.orig Fri Apr 9 02:12:57 1999 -+++ ltconfig Sun Aug 6 03:27:02 2000 -@@ -1796,6 +1796,7 @@ ++++ ltconfig Sun Dec 31 16:25:18 2000 +@@ -1030,6 +1030,9 @@ + freebsd2* | sunos4*) + exclude_expsyms="_GLOBAL_OFFSET_TABLE_" + ;; ++openbsd*) ++ with_gnu_ld=no ++ ;; + + esac + +@@ -1262,10 +1265,18 @@ + ;; + + openbsd*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' +- hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no ++ case "$host_os" in ++ openbsd2.[01234567]) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='-R$libdir' ++ ;; ++ *) ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ ;; ++ esac + ;; + + os2*) +@@ -1789,13 +1800,10 @@ + + openbsd*) + version_type=sunos +- if test "$with_gnu_ld" = yes; then +- need_lib_prefix=no +- need_version=no +- fi library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH diff --git a/audio/esound/patches/patch-ltmain.sh b/audio/esound/patches/patch-ltmain.sh index f4100639555..b6fa3254bf0 100644 --- a/audio/esound/patches/patch-ltmain.sh +++ b/audio/esound/patches/patch-ltmain.sh @@ -1,15 +1,16 @@ --- ltmain.sh.orig Fri Apr 9 02:12:58 1999 -+++ ltmain.sh Sun Aug 6 04:56:59 2000 -@@ -3227,7 +3227,7 @@ - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - if test "$finalize" = yes; then -- outputname="/tmp/$$-$file" -+ outputname=$(mktemp "${TMPDIR:-/tmp}/$file.XXXXXX") || exit $? - # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` - -@@ -3326,40 +3326,6 @@ ++++ ltmain.sh Sun Dec 31 16:26:02 2000 +@@ -1702,6 +1702,9 @@ + *-*-cygwin* | *-*-mingw* | *-*-os2*) + # these systems don't actually have a c library (as such)! + ;; ++ *-*-openbsd*) ++ # do not include libc due to us having libc/libc_r. ++ ;; + *) + # Add libc to deplibs on all other systems. + deplibs="$deplibs -lc" +@@ -3326,40 +3329,6 @@ # Exit here if they wanted silent mode. test "$show" = : && exit 0 diff --git a/audio/esound/pkg/PFRAG.shared b/audio/esound/pkg/PFRAG.shared index 6d83f4451fd..6e9133891a6 100644 --- a/audio/esound/pkg/PFRAG.shared +++ b/audio/esound/pkg/PFRAG.shared @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.4 2000/10/06 00:17:46 brad Exp $ -lib/libesd.so.2.20 +@comment $OpenBSD: PFRAG.shared,v 1.5 2001/01/03 15:50:50 brad Exp $ +lib/libesd.so.2.22 DYNLIBDIR(%B)