ports/164207: [PATCH] bsd.port.mk includes top-level Makefile.inc from wrong directory

[Greg Larkin]

>Number:         164207
>Category:       ports
>Synopsis:       [PATCH] bsd.port.mk includes top-level Makefile.inc from wrong directory
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 16 17:20:03 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Greg Larkin
>Release:        FreeBSD 8.2-RELEASE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD amd64_82.localdomain 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011 root at mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:
bsd.port.mk currently looks for a top-level Makefile.inc in the /usr
directory, instead of the /usr/ports directory.  It looks like a cut-and-paste
error.
	
>How-To-Repeat:
Create /usr/ports/Makefile.inc with a simple make target (e.g. echo
"Hello world!") and attempt to invoke it from a port directory in the tree.
Now move /usr/ports/Makefile.inc to /usr/Makefile.inc and try again.
	
>Fix:

	

--- bsd.port.mk.diff begins here ---
Index: Mk/bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.702
diff -u -r1.702 bsd.port.mk
--- Mk/bsd.port.mk	15 Jan 2012 22:13:42 -0000	1.702
+++ Mk/bsd.port.mk	16 Jan 2012 16:51:49 -0000
@@ -2084,8 +2084,8 @@
 .include "${PORTSDIR}/Mk/bsd.cmake.mk"
 .endif
 
-.if exists(${PORTSDIR}/../Makefile.inc)
-.include "${PORTSDIR}/../Makefile.inc"
+.if exists(${PORTSDIR}/Makefile.inc)
+.include "${PORTSDIR}/Makefile.inc"
 USE_SUBMAKE=	yes
 .endif
 
--- bsd.port.mk.diff ends here ---


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