Date: Fri, 25 Feb 2011 02:09:08 GMT From: Eitan Adler <eadler@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: misc/155017: [patch] remove check for /usr/share/mk/bsd.port.options.mk Message-ID: <201102250209.p1P298bD071860@red.freebsd.org> Resent-Message-ID: <201102250210.p1P2ADhR078194@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.mk>" >> /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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102250209.p1P298bD071860>