Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Sep 2013 18:43:18 +0000 (UTC)
From:      Christian Weisgerber <naddy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r328189 - in head/audio/libao: . files
Message-ID:  <201309241843.r8OIhIqX070018@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: naddy
Date: Tue Sep 24 18:43:17 2013
New Revision: 328189
URL: http://svnweb.freebsd.org/changeset/ports/328189

Log:
  Convert to stage and overhaul.

Deleted:
  head/audio/libao/files/patch-Makefile.in
Modified:
  head/audio/libao/Makefile
  head/audio/libao/pkg-plist

Modified: head/audio/libao/Makefile
==============================================================================
--- head/audio/libao/Makefile	Tue Sep 24 18:37:18 2013	(r328188)
+++ head/audio/libao/Makefile	Tue Sep 24 18:43:17 2013	(r328189)
@@ -10,48 +10,25 @@ MASTER_SITES=	http://downloads.xiph.org/
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Portable audio output library
 
-USE_AUTOTOOLS=	libtool
-NO_STAGE=	yes
-WANT_GNOME=	yes
 USES=		pathfix pkgconfig
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-arts
 
-MAN5=		libao.conf.5
-
 OPTIONS_DEFINE=	DOCS ESOUND NAS PULSEAUDIO
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+NAS_LIB_DEPENDS=libaudio.so:${PORTSDIR}/audio/nas
+NAS_CONFIGURE_ENABLE=	nas
 
-.if ${PORT_OPTIONS:MDOCS}
-MAKE_ENV=	DOC=doc
-.else
-MAKE_ENV=	DOC=""
-.endif
+PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_CONFIGURE_ENABLE=	pulse
 
+ESOUND_CONFIGURE_ENABLE=esd
+.include <bsd.port.options.mk>
 .if ${PORT_OPTIONS:MESOUND}
 USE_GNOME+=	esound
-PLIST_SUB+=	ESOUND=""
-.else
-CONFIGURE_ARGS+=--disable-esd
-PLIST_SUB+=	ESOUND="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNAS}
-LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
-PLIST_SUB+=	NAS=""
-.else
-CONFIGURE_ARGS+=--disable-nas
-PLIST_SUB+=	NAS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	pulse-simple.0:${PORTSDIR}/audio/pulseaudio
-PLIST_SUB+=	PULSEAUDIO=""
-.else
-CONFIGURE_ARGS+=--disable-pulse
-PLIST_SUB+=	PULSEAUDIO="@comment "
 .endif
 
 post-patch:

Modified: head/audio/libao/pkg-plist
==============================================================================
--- head/audio/libao/pkg-plist	Tue Sep 24 18:37:18 2013	(r328188)
+++ head/audio/libao/pkg-plist	Tue Sep 24 18:43:17 2013	(r328189)
@@ -15,6 +15,7 @@ lib/ao/plugins-4/liboss.so
 %%PULSEAUDIO%%lib/ao/plugins-4/libpulse.la
 %%PULSEAUDIO%%lib/ao/plugins-4/libpulse.so
 libdata/pkgconfig/ao.pc
+man/man5/libao.conf.5.gz
 share/aclocal/ao.m4
 %%PORTDOCS%%%%DOCSDIR%%/ao_append_option.html
 %%PORTDOCS%%%%DOCSDIR%%/ao_close.html



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309241843.r8OIhIqX070018>