From owner-svn-ports-all@freebsd.org Tue Jan 12 12:43:00 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A3492A6B92C; Tue, 12 Jan 2016 12:43:00 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 57DAE1B14; Tue, 12 Jan 2016 12:43:00 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0CCgxlD080782; Tue, 12 Jan 2016 12:42:59 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0CCgxVI080780; Tue, 12 Jan 2016 12:42:59 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201601121242.u0CCgxVI080780@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 12 Jan 2016 12:42:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405868 - in head/x11/i3status: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2016 12:43:00 -0000 Author: bapt Date: Tue Jan 12 12:42:59 2016 New Revision: 405868 URL: https://svnweb.freebsd.org/changeset/ports/405868 Log: Instead of simply removing pulseaudio provide an option (off by default) Added: head/x11/i3status/files/no-pulseaudio.diff (contents, props changed) Deleted: head/x11/i3status/files/patch-Makefile head/x11/i3status/files/patch-src_print__volume.c Modified: head/x11/i3status/Makefile Modified: head/x11/i3status/Makefile ============================================================================== --- head/x11/i3status/Makefile Tue Jan 12 12:36:53 2016 (r405867) +++ head/x11/i3status/Makefile Tue Jan 12 12:42:59 2016 (r405868) @@ -10,6 +10,8 @@ COMMENT= Small program for generating a LICENSE= BSD3CLAUSE +OPTIONS_DEFINE= PULSEAUDIO + LIB_DEPENDS= libconfuse.so:${PORTSDIR}/devel/libconfuse \ libyajl.so:${PORTSDIR}/devel/yajl @@ -17,6 +19,9 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USES= gmake tar:bzip2 +PULSEAUDIO_EXTRA_PATCHES_OFF= ${FILESDIR}/no-pulseaudio.diff +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio + post-patch: @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/i3status.c Added: head/x11/i3status/files/no-pulseaudio.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/i3status/files/no-pulseaudio.diff Tue Jan 12 12:42:59 2016 (r405868) @@ -0,0 +1,25 @@ +--- Makefile.orig 2016-01-12 12:26:06 UTC ++++ Makefile +@@ -75,6 +75,11 @@ OBJS:=$(filter-out src/pulse.o, $(OBJS)) + LIBS:=$(filter-out -lpulse, $(LIBS)) -lpthread + endif + ++ifeq ($(OS),FreeBSD) ++OBJS:=$(filter-out src/pulse.o, $(OBJS)) ++LIBS:=$(filter-out -lpulse, $(LIBS)) -lpthread ++endif ++ + src/%.o: src/%.c include/i3status.h + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + @echo " CC $<" +--- src/print_volume.c.orig 2016-01-12 12:27:47 UTC ++++ src/print_volume.c +@@ -60,7 +60,7 @@ void print_volume(yajl_gen json_gen, cha + free(instance); + } + +-#ifndef __OpenBSD__ ++#if !defined(__OPENBSD__) && !defined(__FreeBSD__) + /* Try PulseAudio first */ + + /* If the device name has the format "pulse[:N]" where N is the