View | Details | Raw Unified | Return to bug 178072
Collapse All | Expand All

(-)Mk/bsd.port.mk (-2 / +4 lines)
Lines 1260-1269 Link Here
1260
USE_SUBMAKE=	yes
1260
USE_SUBMAKE=	yes
1261
.endif
1261
.endif
1262
1262
1263
.if exists(${MASTERDIR}/Makefile.local)
1263
.for d in ${PORTSDIR} ${MASTERDIR}
1264
.include "${MASTERDIR}/Makefile.local"
1264
.if exists($d/Makefile.local)
1265
.include "$d/Makefile.local"
1265
USE_SUBMAKE=	yes
1266
USE_SUBMAKE=	yes
1266
.endif
1267
.endif
1268
.endfor
1267
1269
1268
# where 'make config' records user configuration options
1270
# where 'make config' records user configuration options
1269
PORT_DBDIR?=	/var/db/ports
1271
PORT_DBDIR?=	/var/db/ports
(-)Mk/bsd.port.subdir.mk (-9 / +11 lines)
Lines 107-139 Link Here
107
.endif
107
.endif
108
108
109
.if !defined(PYTHON_DEFAULT_VERSION)
109
.if !defined(PYTHON_DEFAULT_VERSION)
110
PYTHON_DEFAULT_VERSION!=	make -V PYTHON_DEFAULT_VERSION USE_PYTHON=1 -f ${PORTSDIR}/Mk/bsd.port.mk
110
PYTHON_DEFAULT_VERSION!=	${MAKE} -V PYTHON_DEFAULT_VERSION USE_PYTHON=1 -f ${PORTSDIR}/Mk/bsd.port.mk
111
.endif
111
.endif
112
112
113
.if !defined(PYTHON_DEFAULT_PORTVERSION)
113
.if !defined(PYTHON_DEFAULT_PORTVERSION)
114
# We are caching the PYTHON_PORTVERSION of the default python version so we can reuse it in the
114
# We are caching the PYTHON_PORTVERSION of the default python version so we can reuse it in the
115
# common case.
115
# common case.
116
PYTHON_DEFAULT_PORTVERSION!=	make -V PYTHON_PORTVERSION USE_PYTHON=1 -f ${PORTSDIR}/Mk/bsd.port.mk
116
PYTHON_DEFAULT_PORTVERSION!=	${MAKE} -V PYTHON_PORTVERSION USE_PYTHON=1 -f ${PORTSDIR}/Mk/bsd.port.mk
117
.endif
117
.endif
118
118
119
.if !defined(PYTHONBASE)
119
.if !defined(PYTHONBASE)
120
PYTHONBASE!=			make -V PYTHONBASE USE_PYTHON=1 -f ${PORTSDIR}/Mk/bsd.port.mk
120
PYTHONBASE!=			${MAKE} -V PYTHONBASE USE_PYTHON=1 -f ${PORTSDIR}/Mk/bsd.port.mk
121
.endif
121
.endif
122
122
123
.if !defined(_JAVA_VERSION_LIST_REGEXP)
123
.if !defined(_JAVA_VERSION_LIST_REGEXP)
124
_JAVA_VERSION_LIST_REGEXP!=	make -V _JAVA_VERSION_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
124
_JAVA_VERSION_LIST_REGEXP!=	${MAKE} -V _JAVA_VERSION_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
125
.endif
125
.endif
126
126
127
.if !defined(_JAVA_VENDOR_LIST_REGEXP)
127
.if !defined(_JAVA_VENDOR_LIST_REGEXP)
128
_JAVA_VENDOR_LIST_REGEXP!=	make -V _JAVA_VENDOR_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
128
_JAVA_VENDOR_LIST_REGEXP!=	${MAKE} -V _JAVA_VENDOR_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
129
.endif
129
.endif
130
130
131
.if !defined(_JAVA_OS_LIST_REGEXP)
131
.if !defined(_JAVA_OS_LIST_REGEXP)
132
_JAVA_OS_LIST_REGEXP!=		make -V _JAVA_OS_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
132
_JAVA_OS_LIST_REGEXP!=		${MAKE} -V _JAVA_OS_LIST_REGEXP USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
133
.endif
133
.endif
134
134
135
.if !defined(_JAVA_PORTS_INSTALLED)
135
.if !defined(_JAVA_PORTS_INSTALLED)
136
_JAVA_PORTS_INSTALLED!=		make -V _JAVA_PORTS_INSTALLED USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
136
_JAVA_PORTS_INSTALLED!=		${MAKE} -V _JAVA_PORTS_INSTALLED USE_JAVA=1 -f ${PORTSDIR}/Mk/bsd.port.mk
137
.endif
137
.endif
138
138
139
.if !defined(UID)
139
.if !defined(UID)
Lines 155-163 Link Here
155
INDEXFILE?=	INDEX-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}
155
INDEXFILE?=	INDEX-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}
156
156
157
# local customization of the ports tree
157
# local customization of the ports tree
158
.if exists(${.CURDIR}/Makefile.local)
158
.for d in ${PORTSDIR} ${.CURDIR}
159
.include "${.CURDIR}/Makefile.local"
159
.if exists($d/Makefile.local)
160
.include "$d/Makefile.local"
160
.endif
161
.endif
162
.endfor
161
163
162
TARGETS+=	all
164
TARGETS+=	all
163
TARGETS+=	build
165
TARGETS+=	build

Return to bug 178072