From e4273f8e4ffcbfbd0ee622563b054cf7791588dd Mon Sep 17 00:00:00 2001 From: naddy Date: Thu, 12 Jul 2007 21:10:15 +0000 Subject: [PATCH] * maintenance update to 0.8.8 * don't build nonsensical static modules --- audio/libao/Makefile | 8 ++++---- audio/libao/distinfo | 10 +++++----- audio/libao/patches/patch-configure | 10 +++++----- audio/libao/patches/patch-doc_Makefile_in | 20 +++++++++---------- audio/libao/patches/patch-src_Makefile_in | 12 ----------- .../patches/patch-src_plugins_Makefile_in | 12 +++++++++++ audio/libao/pkg/PFRAG.shared-arts | 3 +-- audio/libao/pkg/PFRAG.shared-esd | 3 +-- audio/libao/pkg/PFRAG.shared-main | 3 +-- 9 files changed, 39 insertions(+), 42 deletions(-) delete mode 100644 audio/libao/patches/patch-src_Makefile_in create mode 100644 audio/libao/patches/patch-src_plugins_Makefile_in diff --git a/audio/libao/Makefile b/audio/libao/Makefile index dbc921a4c0c..bb9645e96e5 100644 --- a/audio/libao/Makefile +++ b/audio/libao/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.38 2007/07/06 14:21:05 naddy Exp $ +# $OpenBSD: Makefile,v 1.39 2007/07/12 21:10:15 naddy Exp $ COMMENT-main= "portable audio output library" COMMENT-arts= "aRts module for portable audio output library" COMMENT-esd= "ESounD module for portable audio output library" -VERSION= 0.8.6 +VERSION= 0.8.8 DISTNAME= libao-${VERSION} PKGNAME-main= libao-${VERSION} PKGNAME-arts= libao-arts-${VERSION} @@ -45,10 +45,10 @@ CONFIGURE_ARGS+=--disable-arts CONFIGURE_ARGS+=--disable-esd .endif CONFIGURE_ARGS+=--disable-nas \ - --disable-polyp + --disable-pulse .if ${MULTI_PACKAGES:M-arts} -MODULES= devel/gettext +MODULES= devel/gettext .endif LIB_DEPENDS-main= diff --git a/audio/libao/distinfo b/audio/libao/distinfo index d1bae17596e..6b709458a18 100644 --- a/audio/libao/distinfo +++ b/audio/libao/distinfo @@ -1,5 +1,5 @@ -MD5 (libao-0.8.6.tar.gz) = EuE2pMCZUGj/E0mXyEQh7Q== -RMD160 (libao-0.8.6.tar.gz) = ZQJYJAKV8iHpXTnPI4Ctpz88tOE= -SHA1 (libao-0.8.6.tar.gz) = IFDgCP/P1oA+LCwDx9X0abbYN54= -SHA256 (libao-0.8.6.tar.gz) = mVZcb4pWCrwkv2wHcmc31U22TargjIcI/J6POutyOYU= -SIZE (libao-0.8.6.tar.gz) = 387583 +MD5 (libao-0.8.8.tar.gz) = uSy6PLzx7pvCIRGKhdI9zQ== +RMD160 (libao-0.8.8.tar.gz) = ULnx6MIuWbqfo9jmNVCbikpSiXQ= +SHA1 (libao-0.8.8.tar.gz) = 1uhnu/xDYTRtuOUFxRJx5BYq58Q= +SHA256 (libao-0.8.8.tar.gz) = 5S4Fr2sQ9C0u6YRd8aWBvys1IGDqv3lGruCmAMOHiVQ= +SIZE (libao-0.8.8.tar.gz) = 405619 diff --git a/audio/libao/patches/patch-configure b/audio/libao/patches/patch-configure index 5cb56d9873c..fa7b63431f0 100644 --- a/audio/libao/patches/patch-configure +++ b/audio/libao/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.8 2007/07/06 14:21:05 naddy Exp $ ---- configure.orig Tue Jan 11 23:08:26 2005 -+++ configure Thu Jul 5 18:27:12 2007 -@@ -19103,7 +19103,7 @@ if test -z "$GCC"; then +$OpenBSD: patch-configure,v 1.9 2007/07/12 21:10:15 naddy Exp $ +--- configure.orig Thu May 24 12:51:52 2007 ++++ configure Wed Jul 11 21:58:16 2007 +@@ -20076,7 +20076,7 @@ if test -z "$GCC"; then *) PLUGIN_LDFLAGS="-export-dynamic -avoid-version" DEBUG="-g" @@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.8 2007/07/06 14:21:05 naddy Exp $ PROFILE="-g -p" ;; esac else -@@ -19126,9 +19126,9 @@ else +@@ -20099,9 +20099,9 @@ else PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore" ;; *) PLUGIN_LDFLAGS="-export-dynamic -avoid-version" diff --git a/audio/libao/patches/patch-doc_Makefile_in b/audio/libao/patches/patch-doc_Makefile_in index d384fa99fd9..ec885147d37 100644 --- a/audio/libao/patches/patch-doc_Makefile_in +++ b/audio/libao/patches/patch-doc_Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.6 2007/07/06 14:21:05 naddy Exp $ ---- doc/Makefile.in.orig Thu Jul 5 18:25:29 2007 -+++ doc/Makefile.in Thu Jul 5 18:26:14 2007 -@@ -199,7 +199,7 @@ sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - AUTOMAKE_OPTIONS = foreign +$OpenBSD: patch-doc_Makefile_in,v 1.7 2007/07/12 21:10:15 naddy Exp $ +--- doc/Makefile.in.orig Wed Jul 11 21:56:58 2007 ++++ doc/Makefile.in Wed Jul 11 21:57:09 2007 +@@ -161,7 +161,7 @@ build_vendor = @build_vendor@ + builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) +docdir = $(datadir)/doc/$(PACKAGE) - - # We list all of these as opposed to using a wildcard so that - # building outside the source directory works. + dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ diff --git a/audio/libao/patches/patch-src_Makefile_in b/audio/libao/patches/patch-src_Makefile_in deleted file mode 100644 index 64972e3f61f..00000000000 --- a/audio/libao/patches/patch-src_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_Makefile_in,v 1.6 2007/07/06 14:21:05 naddy Exp $ ---- src/Makefile.in.orig Thu Jul 5 18:26:37 2007 -+++ src/Makefile.in Thu Jul 5 18:26:56 2007 -@@ -233,7 +233,7 @@ SUBDIRS = plugins - INCLUDES = -I$(top_builddir)/include/ao -I$(top_srcdir)/include -DAO_PLUGIN_PATH=\"@plugindir@\" - lib_LTLIBRARIES = libao.la - libao_la_SOURCES = audio_out.c config.c ao_null.c ao_wav.c ao_au.c ao_raw.c ao_aixs.c ao_private.h --libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -ldl -+libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ - all: all-recursive - - .SUFFIXES: diff --git a/audio/libao/patches/patch-src_plugins_Makefile_in b/audio/libao/patches/patch-src_plugins_Makefile_in new file mode 100644 index 00000000000..ef5242845c4 --- /dev/null +++ b/audio/libao/patches/patch-src_plugins_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_plugins_Makefile_in,v 1.3 2007/07/12 21:10:15 naddy Exp $ +--- src/plugins/Makefile.in.orig Thu Jul 12 21:05:42 2007 ++++ src/plugins/Makefile.in Thu Jul 12 21:06:21 2007 +@@ -259,7 +259,7 @@ $(RECURSIVE_TARGETS): + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) LIBTOOL="$(LIBTOOL) --tag=disable-static" $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ diff --git a/audio/libao/pkg/PFRAG.shared-arts b/audio/libao/pkg/PFRAG.shared-arts index f5b25205d78..570d5ce82ef 100644 --- a/audio/libao/pkg/PFRAG.shared-arts +++ b/audio/libao/pkg/PFRAG.shared-arts @@ -1,4 +1,3 @@ -@comment $OpenBSD: PFRAG.shared-arts,v 1.3 2003/10/08 12:12:52 naddy Exp $ -@comment lib/ao/plugins-2/libarts.a +@comment $OpenBSD: PFRAG.shared-arts,v 1.4 2007/07/12 21:10:15 naddy Exp $ @comment lib/ao/plugins-2/libarts.la lib/ao/plugins-2/libarts.so diff --git a/audio/libao/pkg/PFRAG.shared-esd b/audio/libao/pkg/PFRAG.shared-esd index b1bd883de81..e0902831021 100644 --- a/audio/libao/pkg/PFRAG.shared-esd +++ b/audio/libao/pkg/PFRAG.shared-esd @@ -1,4 +1,3 @@ -@comment $OpenBSD: PFRAG.shared-esd,v 1.3 2003/10/08 12:12:52 naddy Exp $ -@comment lib/ao/plugins-2/libesd.a +@comment $OpenBSD: PFRAG.shared-esd,v 1.4 2007/07/12 21:10:15 naddy Exp $ @comment lib/ao/plugins-2/libesd.la lib/ao/plugins-2/libesd.so diff --git a/audio/libao/pkg/PFRAG.shared-main b/audio/libao/pkg/PFRAG.shared-main index 44c942a89ca..f29013e5b89 100644 --- a/audio/libao/pkg/PFRAG.shared-main +++ b/audio/libao/pkg/PFRAG.shared-main @@ -1,7 +1,6 @@ -@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/24 16:22:21 naddy Exp $ +@comment $OpenBSD: PFRAG.shared-main,v 1.2 2007/07/12 21:10:15 naddy Exp $ lib/ao/ lib/ao/plugins-2/ -@comment lib/ao/plugins-2/libsun.a @comment lib/ao/plugins-2/libsun.la lib/ao/plugins-2/libsun.so @lib lib/libao.so.${LIBao_VERSION}