ports/158955: [patch] [bsd.port.mk] change hardcoded /usr/src's to ${SRC_BASE}

Eitan Adler lists at eitanadler.com
Fri Jul 15 21:20:09 UTC 2011


>Number:         158955
>Category:       ports
>Synopsis:       [patch] [bsd.port.mk] change hardcoded /usr/src's to ${SRC_BASE}
>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:   Fri Jul 15 21:20:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Eitan Adler
>Release:        
>Organization:
>Environment:
>Description:

>How-To-Repeat:

>Fix:
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.686
diff -u -r1.686 bsd.port.mk
--- bsd.port.mk 9 Jun 2011 08:22:45 -0000       1.686
+++ bsd.port.mk 15 Jul 2011 21:17:04 -0000
@@ -1217,8 +1217,8 @@
 .if !defined(OSVERSION)
 .if exists(/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[[:blank:]]__FreeBSD_version/ {print $$3}' < /usr/src/sys/sys/param.h
+.elif exists(${SRC_BASE}/sys/sys/param.h)
+OSVERSION!=    ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC_BASE}/sys/sys/param.h
 .else
 OSVERSION!=    ${SYSCTL} -n kern.osreldate
 .endif
@@ -4088,7 +4088,7 @@
        @if [ ${UID} = 0 ]; then \
                if [ ! -f ${MTREE_FILE} ]; then \
                        ${ECHO_MSG} "Error: mtree file \"${MTREE_FILE}\" is missing."; \
-                       ${ECHO_MSG} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \
+                       ${ECHO_MSG} "Copy it from a suitable location (e.g., ${SRC_BASE}/etc/mtree) and try again."; \
                        exit 1; \
                else \
                        ${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \
Index: bsd.port.subdir.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.subdir.mk,v
retrieving revision 1.78
diff -u -r1.78 bsd.port.subdir.mk
--- bsd.port.subdir.mk  4 May 2011 22:33:13 -0000       1.78
+++ bsd.port.subdir.mk  15 Jul 2011 21:17:04 -0000
@@ -70,8 +70,8 @@
 .if !defined(OSVERSION)
 .if exists(/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[[:blank:]]__FreeBSD_version/ {print $$3}' < /usr/src/sys/sys/param.h
+.elif exists(${SRC_BASE}/sys/sys/param.h)
+OSVERSION!=    ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC_BASE}/sys/sys/param.h
 .else
 OSVERSION!=    ${SYSCTL} -n kern.osreldate
 .endif


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list