From owner-svn-ports-head@FreeBSD.ORG  Mon Dec 16 07:30:28 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BB39AC7A;
 Mon, 16 Dec 2013 07:30:28 +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 A769410B0;
 Mon, 16 Dec 2013 07:30:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG7USCF014317;
 Mon, 16 Dec 2013 07:30:28 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG7US2u014316;
 Mon, 16 Dec 2013 07:30:28 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201312160730.rBG7US2u014316@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 16 Dec 2013 07:30:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r336611 - head/security/tripwire
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Dec 2013 07:30:28 -0000

Author: bapt
Date: Mon Dec 16 07:30:28 2013
New Revision: 336611
URL: http://svnweb.freebsd.org/changeset/ports/336611

Log:
  Remove redondant variable testing which are now irrelevant
  with this part of the compatibility with the old framework being removed

Modified:
  head/security/tripwire/Makefile

Modified: head/security/tripwire/Makefile
==============================================================================
--- head/security/tripwire/Makefile	Mon Dec 16 06:02:22 2013	(r336610)
+++ head/security/tripwire/Makefile	Mon Dec 16 07:30:28 2013	(r336611)
@@ -161,8 +161,8 @@ make-pkg-install:
 	@ ${SED} "/^\. /s/^/: /;/^BASE_DIR=/d;s/BIN_DIR=/: BIN_DIR=/;/^POLICYSRC/d" ${WRKSRC}/install/install.sh >> ${PKGINSTALL}
 
 create-database:
-.if ${PORT_OPTIONS:MDB_BUILD} && ${WITH_DB_BUILD} == "true"
-.if ${PORT_OPTIONS:MSW_ONLY} && ${WITH_SW_ONLY} == "true"
+.if ${PORT_OPTIONS:MDB_BUILD}
+.if ${PORT_OPTIONS:MSW_ONLY}
 	@ ${ECHO} SW_ONLY has been specified, database will not be built.
 .else
 	@ ${MKDIR} ${TWCFG} ${TWPOLICY} ${TWSITEKEYDIR} ${TWLOCALKEYDIR} \