From owner-freebsd-bugs@FreeBSD.ORG Fri Feb 25 02:10:14 2011 Return-Path: Delivered-To: freebsd-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 285691065697 for ; Fri, 25 Feb 2011 02:10:14 +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 DFD9C8FC0C for ; Fri, 25 Feb 2011 02:10:13 +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 p1P2ADp5078199 for ; Fri, 25 Feb 2011 02:10:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p1P2ADhR078194; Fri, 25 Feb 2011 02:10:13 GMT (envelope-from gnats) Resent-Date: Fri, 25 Feb 2011 02:10:13 GMT Resent-Message-Id: <201102250210.p1P2ADhR078194@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Eitan Adler Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6E50106566B for ; Fri, 25 Feb 2011 02:09:08 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 9681B8FC1C for ; Fri, 25 Feb 2011 02:09:08 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p1P298Cb071861 for ; Fri, 25 Feb 2011 02:09:08 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p1P298bD071860; Fri, 25 Feb 2011 02:09:08 GMT (envelope-from nobody) Message-Id: <201102250209.p1P298bD071860@red.freebsd.org> Date: Fri, 25 Feb 2011 02:09:08 GMT From: Eitan Adler To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/155017: [patch] remove check for /usr/share/mk/bsd.port.options.mk X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 02:10:14 -0000 >Number: 155017 >Category: misc >Synopsis: [patch] remove check for /usr/share/mk/bsd.port.options.mk >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Feb 25 02:10:13 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Eitan Adler >Release: >Organization: >Environment: >Description: bsd.port.options.mk exists in 7.1.0 and beyond. There is no reason to include this check anymore. >How-To-Repeat: Read bsd.port.mk expecting sanity. Realize this will never happen and just look for code that is not needed anymore. >Fix: Index: bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.669 diff -u -r1.669 bsd.port.mk --- bsd.port.mk 16 Feb 2011 10:43:53 -0000 1.669 +++ bsd.port.mk 24 Feb 2011 21:00:06 -0000 @@ -2928,24 +2928,6 @@ @${ECHO_CMD} "${MAINTAINER}" .endif -.if !target(check-makefile) -check-makefile:: -.if !exists(/usr/share/mk/bsd.port.options.mk) - @${ECHO_CMD} "!!! Detected system without bsd.port.options.mk (probably old FreeBSD version)" - @${ECHO_CMD} "!!! Dropping bsd.port.options.mk into /usr/share/mk" - -@${ECHO_CMD} "USEOPTIONSMK= yes" > /usr/share/mk/bsd.port.options.mk 2>/dev/null - -@${ECHO_CMD} "INOPTIONSMK= yes" >> /usr/share/mk/bsd.port.options.mk 2>/dev/null - -@${ECHO_CMD} ".include " >> /usr/share/mk/bsd.port.options.mk 2>/dev/null - -@${ECHO_CMD} ".undef INOPTIONSMK" >> /usr/share/mk/bsd.port.options.mk 2>/dev/null -.if exists(/usr/share/mk/bsd.port.options.mk) - @${ECHO_CMD} "!!! Done" -.else - @${ECHO_CMD} "!!! Failed" -.endif -.endif - @${DO_NADA} -.endif - .if !defined(CATEGORIES) check-categories: @${ECHO_MSG} "${PKGNAME}: Makefile error: CATEGORIES is mandatory." >Release-Note: >Audit-Trail: >Unformatted: