Date: Thu, 25 Oct 2007 20:19:41 +0200 (CEST) From: Erwin Lansing <erwin@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/117507: Allow tab as well as space in param.h for OSVERSION determination Message-ID: <200710251819.l9PIJfmr041069@rabbit.home.droso.net> Resent-Message-ID: <200710251820.l9PIK2tT054410@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117507
>Category: ports
>Synopsis: Allow tab as well as space in param.h for OSVERSION determination
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 25 18:20:02 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Erwin Lansing
>Release: FreeBSD 8.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD rabbit.home.droso.net 8.0-CURRENT FreeBSD 8.0-CURRENT #: Thu Oct 11 19:03:26 CEST 2007 root@rabbit.home.droso.net:/usr/obj/usr/src/sys/RABBIT i386
>Description:
Recently, "#define __FreeBSD_version" was committed with a tab
instead of a space between those words, which breaks OSVERSION
determination. Change the awk(1) line to [[:blank:]] over ' '.
>How-To-Repeat:
Edit param.h to include a tab:
Current:
erwin@rabbit:sys/sys> awk '/^#define __FreeBSD_version/ {print $3}' < param.h
erwin@rabbit:sys/sys>
With patch:
erwin@rabbit:sys/sys> awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < param.h
800003
>Fix:
--- bpm-space.diff begins here ---
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.589
diff -u -r1.589 bsd.port.mk
--- bsd.port.mk 17 Oct 2007 10:12:24 -0000 1.589
+++ bsd.port.mk 25 Oct 2007 18:07:04 -0000
@@ -1167,9 +1167,9 @@
# Get __FreeBSD_version
.if !defined(OSVERSION)
.if exists(/usr/include/sys/param.h)
-OSVERSION!= ${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < /usr/include/sys/param.h
+OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < /usr/include/sys/param.h
.elif exists(/usr/src/sys/sys/param.h)
-OSVERSION!= ${AWK} '/^\#define __FreeBSD_version/ {print $$3}' < /usr/src/sys/sys/param.h
+OSVERSION!= ${AWK} '/^\#define[[:blank::]]__FreeBSD_version/ {print $$3}' < /usr/src/sys/sys/param.h
.else
OSVERSION!= ${SYSCTL} -n kern.osreldate
.endif
--- bpm-space.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710251819.l9PIJfmr041069>