From owner-svn-ports-all@FreeBSD.ORG  Mon Dec 16 22:13:37 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 013EEAC8;
 Mon, 16 Dec 2013 22:13:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E0B7012E0;
 Mon, 16 Dec 2013 22:13:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGMDaR4044434;
 Mon, 16 Dec 2013 22:13:36 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGMDaSS044433;
 Mon, 16 Dec 2013 22:13:36 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201312162213.rBGMDaSS044433@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 16 Dec 2013 22:13:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r336674 - branches/2014Q1/security/tripwire
X-SVN-Group: ports-branches
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Dec 2013 22:13:37 -0000

Author: bapt
Date: Mon Dec 16 22:13:36 2013
New Revision: 336674
URL: http://svnweb.freebsd.org/changeset/ports/336674

Log:
  MFH: r336672
  
  Fix another useless and redundant test that is now broken
  
  Reported by:	Peter Looyenga <pl@catslair.org>, jhellenthal@dataix.net

Modified:
  branches/2014Q1/security/tripwire/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/security/tripwire/Makefile
==============================================================================
--- branches/2014Q1/security/tripwire/Makefile	Mon Dec 16 22:07:24 2013	(r336673)
+++ branches/2014Q1/security/tripwire/Makefile	Mon Dec 16 22:13:36 2013	(r336674)
@@ -119,7 +119,7 @@ install-config-files:
 .ifdef PACKAGE_BUILDING
 	@ cd ${WRKSRC} && PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${GMAKE} install-data-hook
 .else
-.if ${PORT_OPTIONS:MSW_ONLY} && ${WITH_SW_ONLY} == "true"
+.if ${PORT_OPTIONS:MSW_ONLY}
 	@ cd ${WRKSRC} && PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${GMAKE} install-data-hook
 .else
 	@ cd ${WRKSRC} && PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} TW_PROMPT=${TW_PROMPT} ${GMAKE} install-data-hook