From owner-svn-ports-all@freebsd.org  Thu Aug 20 13:34:48 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
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 26FD79BE9B1;
 Thu, 20 Aug 2015 13:34:48 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 17FDCBF2;
 Thu, 20 Aug 2015 13:34:48 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7KDYlXv050937;
 Thu, 20 Aug 2015 13:34:47 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7KDYlY0050936;
 Thu, 20 Aug 2015 13:34:47 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201508201334.t7KDYlY0050936@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 20 Aug 2015 13:34:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r394872 - head/audio/alsa-plugins
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Aug 2015 13:34:48 -0000

Author: jbeich
Date: Thu Aug 20 13:34:47 2015
New Revision: 394872
URL: https://svnweb.freebsd.org/changeset/ports/394872

Log:
  audio/alsa-plugins: back out r394862, already applied by r394778
  
  It is a remnant from |git rebase| not ignoring line order by default
  when detecting already merged changes.
  
  Reported by:	kwm

Modified:
  head/audio/alsa-plugins/Makefile

Modified: head/audio/alsa-plugins/Makefile
==============================================================================
--- head/audio/alsa-plugins/Makefile	Thu Aug 20 13:16:12 2015	(r394871)
+++ head/audio/alsa-plugins/Makefile	Thu Aug 20 13:34:47 2015	(r394872)
@@ -38,7 +38,6 @@ BLKCNT_P2_CFLAGS=-DFREEBSD_OSS_BLKCNT_P2
 BUFSZ_P2_CFLAGS=-DFREEBSD_OSS_BUFSZ_P2
 VERBOSE_CFLAGS=	-DFREEBSD_OSS_DEBUG_VERBOSE
 
-JACK_IMPLIES=		SAMPLERATE
 JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 JACK_CONFIGURE_ENABLE=	jack
 JACK_IMPLIES=		SAMPLERATE