From owner-freebsd-ports-bugs@FreeBSD.ORG  Sun Aug 15 10:30:03 2010
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
Delivered-To: freebsd-ports-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 72C40106566C
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Sun, 15 Aug 2010 10:30:03 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 324888FC1A
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Sun, 15 Aug 2010 10:30:03 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o7FAU3sC073903
	for <freebsd-ports-bugs@freefall.freebsd.org>;
	Sun, 15 Aug 2010 10:30:03 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o7FAU3Kn073898;
	Sun, 15 Aug 2010 10:30:03 GMT (envelope-from gnats)
Resent-Date: Sun, 15 Aug 2010 10:30:03 GMT
Resent-Message-Id: <201008151030.o7FAU3Kn073898@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-ports-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, bf <bf1783@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B6210106566B
	for <freebsd-gnats-submit@FreeBSD.org>;
	Sun, 15 Aug 2010 10:26:23 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id A57DC8FC0A
	for <freebsd-gnats-submit@FreeBSD.org>;
	Sun, 15 Aug 2010 10:26:23 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o7FAQN03036060
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 15 Aug 2010 10:26:23 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o7FAQNIj036053;
	Sun, 15 Aug 2010 10:26:23 GMT (envelope-from nobody)
Message-Id: <201008151026.o7FAQNIj036053@www.freebsd.org>
Date: Sun, 15 Aug 2010 10:26:23 GMT
From: bf <bf1783@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-3.1
Cc: 
Subject: ports/149670: Mk/bsd.port.mk: remove two checks obviated by the
	removal of _OPTIONSFILE in revision 1.596
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Aug 2010 10:30:03 -0000


>Number:         149670
>Category:       ports
>Synopsis:       Mk/bsd.port.mk: remove two checks obviated by the removal of _OPTIONSFILE in revision 1.596
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 15 10:30:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     bf
>Release:        9-CURRENT amd64
>Organization:
-
>Environment:
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.643
diff -u -r1.643 bsd.port.mk
--- bsd.port.mk	15 Jul 2010 14:48:50 -0000	1.643
+++ bsd.port.mk	15 Aug 2010 09:40:38 -0000
@@ -3462,9 +3462,6 @@
 .endif
 .if defined(_OPTIONS_READ)
 	@${ECHO_MSG} "===>  Found saved configuration for ${_OPTIONS_READ}"
-.if ${OPTIONSFILE} != ${OPTIONSFILE}
-	@${ECHO_MSG} "===>  *** CAUTION *** Using wrong configuration file ${OPTIONSFILE}"
-.endif
 .endif
 
 
@@ -6087,10 +6084,6 @@
 .if !defined(OPTIONS)
 	@${ECHO_MSG} "===> No options to configure"
 .else
-.if ${OPTIONSFILE} != ${OPTIONSFILE}
-	@${ECHO_MSG} "===> Using wrong configuration file ${OPTIONSFILE}"
-	@exit 1
-.endif
 .if ${UID} != 0 && !defined(INSTALL_AS_USER)
 	@optionsdir=${OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \
 	${ECHO_MSG} "===>  Switching to root credentials to create $${optionsdir}"; \


>Release-Note:
>Audit-Trail:
>Unformatted: