[Midnightbsd-cvs] mports: audio/libao: Well archite made this, give him credit.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Nov 8 18:28:22 EST 2007


Log Message:
-----------
Well archite made this, give him credit.  (effectively)  Update it to a newer version which fixes a problem with nautlus-cd-burner found on magus

Modified Files:
--------------
    mports/audio/libao:
        Makefile (r1.1 -> r1.2)
        distinfo (r1.1 -> r1.2)
        pkg-descr (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/audio/libao/files:
        patch-Makefile.in (r1.1 -> r1.2)
        patch-configure (r1.1 -> r1.2)
        patch-doc_Makefile.in (r1.1 -> r1.2)
        patch-src_Makefile.in (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-descr
===================================================================
RCS file: /home/cvs/mports/audio/libao/pkg-descr,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/libao/pkg-descr -L audio/libao/pkg-descr -u -r1.1 -r1.2
--- audio/libao/pkg-descr
+++ audio/libao/pkg-descr
@@ -1,6 +1,6 @@
 libao is a cross-platform audio library that allows programs to
 output audio using a simple API on a wide variety of platforms.
-On FreeBSD, it currently supports:
+It currently supports:
    * null output
    * raw output
    * AU files
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/audio/libao/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/libao/pkg-plist -L audio/libao/pkg-plist -u -r1.1 -r1.2
--- audio/libao/pkg-plist
+++ audio/libao/pkg-plist
@@ -1,7 +1,8 @@
- at comment $FreeBSD: ports/audio/libao/pkg-plist,v 1.17 2006/03/12 06:12:37 nork Exp $
+ at comment $MidnightBSD$
 include/ao/ao.h
 include/ao/os_types.h
 include/ao/plugin.h
+lib/libao.a
 lib/libao.la
 lib/libao.so
 lib/libao.so.3
@@ -13,6 +14,8 @@
 %%ESOUND%%lib/ao/plugins-2/libesd.so
 %%NAS%%lib/ao/plugins-2/libnas.la
 %%NAS%%lib/ao/plugins-2/libnas.so
+%%PULSEAUDIO%%lib/ao/plugins-2/libpulse.la
+%%PULSEAUDIO%%lib/ao/plugins-2/libpulse.so
 libdata/pkgconfig/ao.pc
 share/aclocal/ao.m4
 %%PORTDOCS%%%%DOCSDIR%%/ao_append_option.html
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/audio/libao/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/libao/Makefile -L audio/libao/Makefile -u -r1.1 -r1.2
--- audio/libao/Makefile
+++ audio/libao/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:	libao
-# Date created:				18 October 2000
-# Whom:					t.vanklaveren at student.utwente.nl
+# Date created:				2006
+# Whom:					Adam Karim <archite at midnightbsd.org>
 #
 # $MidnightBSD$
-# $FreeBSD: ports/audio/libao/Makefile,v 1.34 2006/08/07 17:20:16 naddy Exp $
+# $FreeBSD: ports/audio/libao/Makefile,v 1.40 2007/07/24 15:10:13 rafan Exp $
 #
 
 PORTNAME=	libao
-PORTVERSION=	0.8.5
-PORTREVISION=	3
+PORTVERSION=	0.8.8
 CATEGORIES=	audio
-MASTER_SITES=	http://www.xiph.org/ao/src/
+MASTER_SITES=	http://downloads.xiph.org/releases/ao/
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Portable audio output library
 
+USE_AUTOTOOLS=	libtool:15
 WANT_GNOME=	yes
 USE_GNOME=	gnomehack pkgconfig
 GNU_CONFIGURE=	yes
@@ -28,35 +28,48 @@
 
 MAN5=		libao.conf.5
 
+OPTIONS=	ARTS "Enable the aRts module" off \
+		ESOUND "Enable the EsounD module" off \
+		NAS "Enable the Network Audio System module" off \
+		PULSEAUDIO "Enable the PulseAudio module" off
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_ARTS)
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
-PLIST_SUB+=	ARTS=""
 .else
-CONFIGURE_ARGS+=	--disable-arts
-PLIST_SUB+=	ARTS="@comment "
-pre-everything::
-	@${ECHO_MSG} "Define WITH_ARTS to enable the aRts module."
+CONFIGURE_ARGS+=--disable-arts
+.endif
+
+.if defined(WITH_ESOUND)
+USE_GNOME+=	esound
+.else
+CONFIGURE_ARGS+=--disable-esd
 .endif
 
 .if defined(WITH_NAS)
 LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
-PLIST_SUB+=	NAS=""
 .else
-CONFIGURE_ARGS+=	--disable-nas
-PLIST_SUB+=	NAS="@comment "
-pre-everything::
-	@${ECHO_MSG} "Define WITH_NAS to enable the NAS module."
+CONFIGURE_ARGS+=--disable-nas
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mesound}
-USE_GNOME+=	esound
-PLIST_SUB+=	ESOUND=""
-PKGNAMESUFFIX=	-esound
+.if defined(WITH_PULSEAUDIO)
+LIB_DEPENDS+=	pulse-simple.0:${PORTSDIR}/audio/pulseaudio
 .else
-CONFIGURE_ARGS+=	--disable-esd
-PLIST_SUB+=	ESOUND="@comment "
+CONFIGURE_ARGS+=--disable-pulse
 .endif
 
+.for m in ARTS ESOUND NAS PULSEAUDIO
+.   if defined(WITH_$m)
+PLIST_SUB+=	$m=""
+.   else
+PLIST_SUB+=	$m="@comment "
+.   endif
+.endfor
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/etc/libao.conf|${PREFIX}&|' \
+		${WRKSRC}/libao.conf.5 ${WRKSRC}/src/ao_private.h \
+		${WRKSRC}/doc/config.html
+
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/audio/libao/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/libao/distinfo -L audio/libao/distinfo -u -r1.1 -r1.2
--- audio/libao/distinfo
+++ audio/libao/distinfo
@@ -1,3 +1,3 @@
-MD5 (libao-0.8.5.tar.gz) = dd72b66f5f29361411bda465470b65e2
-SHA256 (libao-0.8.5.tar.gz) = fd9d8447f81a86d3d991dc137609b087560e0affea94e7430a59bc0ca62e0d82
-SIZE (libao-0.8.5.tar.gz) = 267283
+MD5 (libao-0.8.8.tar.gz) = b92cba3cbcf1ee9bc221118a85d23dcd
+SHA256 (libao-0.8.8.tar.gz) = e52e05af6b10f42d2ee9845df1a581bf2b352060eabf7946aee0a600c3878954
+SIZE (libao-0.8.8.tar.gz) = 405619
Index: patch-doc_Makefile.in
===================================================================
RCS file: /home/cvs/mports/audio/libao/files/patch-doc_Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/libao/files/patch-doc_Makefile.in -L audio/libao/files/patch-doc_Makefile.in -u -r1.1 -r1.2
--- audio/libao/files/patch-doc_Makefile.in
+++ audio/libao/files/patch-doc_Makefile.in
@@ -1,14 +1,14 @@
 
-$FreeBSD: ports/audio/libao/files/patch-doc_Makefile.in,v 1.2 2001/08/27 01:26:31 trevor Exp $
+$FreeBSD: ports/audio/libao/files/patch-doc_Makefile.in,v 1.3 2007/07/14 20:06:15 naddy Exp $
 
---- doc/Makefile.in.orig	Mon Aug 13 13:39:39 2001
-+++ doc/Makefile.in	Tue Aug 14 17:39:32 2001
-@@ -88,7 +88,7 @@
- 
- AUTOMAKE_OPTIONS = foreign
- 
+--- doc/Makefile.in.orig
++++ doc/Makefile.in
+@@ -161,7 +161,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(datadir)/doc/$(PACKAGE)
- 
- doc_DATA = *.html ao_example.c style.css
- 
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
Index: patch-configure
===================================================================
RCS file: /home/cvs/mports/audio/libao/files/patch-configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/libao/files/patch-configure -L audio/libao/files/patch-configure -u -r1.1 -r1.2
--- audio/libao/files/patch-configure
+++ audio/libao/files/patch-configure
@@ -1,17 +1,9 @@
 
-$FreeBSD: ports/audio/libao/files/patch-configure,v 1.6 2004/10/22 16:39:16 naddy Exp $
+$FreeBSD: ports/audio/libao/files/patch-configure,v 1.7 2007/07/14 20:06:15 naddy Exp $
 
---- configure.orig	Sun Oct  5 03:32:52 2003
-+++ configure	Wed Oct  8 16:17:26 2003
-@@ -7787,6 +7787,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7816,7 +7817,7 @@
+--- configure.orig
++++ configure
+@@ -20076,7 +20076,7 @@
          *)
                  PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
                  DEBUG="-g"
@@ -20,7 +12,7 @@
                  PROFILE="-g -p" ;;
          esac
  else
-@@ -7839,9 +7840,9 @@
+@@ -20099,9 +20099,9 @@
                  PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore" ;;
          *)
                  PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
@@ -33,16 +25,16 @@
          esac
  fi
  CFLAGS="$CFLAGS $cflags_save"
-@@ -12128,7 +12129,7 @@
+@@ -24840,7 +24840,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-laudio -lXau $X_LIBS $LIBS"
 +LIBS="-laudio -lXau -lXt -lm $X_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -12337,7 +12338,7 @@
+ _ACEOF
+@@ -25055,7 +25055,7 @@
  
  if test "x$have_nas" = xyes; then
  	NAS_CFLAGS="$X_CFLAGS"
Index: patch-Makefile.in
===================================================================
RCS file: /home/cvs/mports/audio/libao/files/patch-Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/libao/files/patch-Makefile.in -L audio/libao/files/patch-Makefile.in -u -r1.1 -r1.2
--- audio/libao/files/patch-Makefile.in
+++ audio/libao/files/patch-Makefile.in
@@ -1,14 +1,14 @@
 
-$FreeBSD: ports/audio/libao/files/patch-Makefile.in,v 1.2 2001/08/27 01:26:31 trevor Exp $
+$FreeBSD: ports/audio/libao/files/patch-Makefile.in,v 1.3 2007/07/14 20:06:15 naddy Exp $
 
---- Makefile.in.orig	Mon Aug 13 13:39:22 2001
-+++ Makefile.in	Tue Aug 14 17:39:55 2001
-@@ -87,7 +87,7 @@
- 
- AUTOMAKE_OPTIONS = foreign dist-zip
- 
--SUBDIRS = src include doc debian
-+SUBDIRS = src include $(DOC) debian
- 
- m4datadir = $(datadir)/aclocal
+--- Makefile.in.orig
++++ Makefile.in
+@@ -225,7 +225,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
+-SUBDIRS = src include doc
++SUBDIRS = src include $(DOC)
+ m4datadir = $(prefix)/share/aclocal
  m4data_DATA = ao.m4
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
Index: patch-src_Makefile.in
===================================================================
RCS file: /home/cvs/mports/audio/libao/files/patch-src_Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/libao/files/patch-src_Makefile.in -L audio/libao/files/patch-src_Makefile.in -u -r1.1 -r1.2
--- audio/libao/files/patch-src_Makefile.in
+++ audio/libao/files/patch-src_Makefile.in
@@ -1,14 +1,14 @@
 
-$FreeBSD: ports/audio/libao/files/patch-src_Makefile.in,v 1.2 2003/10/08 16:17:10 naddy Exp $
+$FreeBSD: ports/audio/libao/files/patch-src_Makefile.in,v 1.3 2007/07/14 20:06:15 naddy Exp $
 
---- src/Makefile.in.orig	Wed Oct  8 03:17:06 2003
-+++ src/Makefile.in	Wed Oct  8 03:17:23 2003
-@@ -171,7 +171,7 @@
- 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@
- subdir = src
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES =
+--- src/Makefile.in.orig
++++ src/Makefile.in
+@@ -364,7 +364,7 @@
+ 	  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 \


More information about the Midnightbsd-cvs mailing list