Date: Thu, 25 Oct 2007 18:50:03 GMT From: Erwin Lansing <erwin@FreeBSD.org> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/117507: Allow tab as well as space in param.h for OSVERSION determination Message-ID: <200710251850.l9PIo3r7056929@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/117507; it has been noted by GNATS.
From: Erwin Lansing <erwin@FreeBSD.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:
Subject: Re: ports/117507: Allow tab as well as space in param.h for
OSVERSION determination
Date: Thu, 25 Oct 2007 20:53:50 +0200
--dLXnlYbDJNCwF3YM
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Updated patch to include the same fix in bsd.port.subdir.mk
--dLXnlYbDJNCwF3YM
Content-Type: text/x-diff; charset=iso-8859-1
Content-Disposition: attachment; filename="bpm-space.diff"
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:48: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
Index: bsd.port.subdir.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.subdir.mk,v
retrieving revision 1.72
diff -u -r1.72 bsd.port.subdir.mk
--- bsd.port.subdir.mk 8 Aug 2007 03:46:04 -0000 1.72
+++ bsd.port.subdir.mk 25 Oct 2007 18:48:04 -0000
@@ -72,9 +72,9 @@
.endif
.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
--dLXnlYbDJNCwF3YM--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710251850.l9PIo3r7056929>