Date: Sun, 15 Aug 2010 10:26:23 GMT From: bf <bf1783@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/149670: Mk/bsd.port.mk: remove two checks obviated by the removal of _OPTIONSFILE in revision 1.596 Message-ID: <201008151026.o7FAQNIj036053@www.freebsd.org> Resent-Message-ID: <201008151030.o7FAU3Kn073898@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008151026.o7FAQNIj036053>