[Midnightbsd-cvs] mports: bsd.python.mk: PACKAGE_BUILDING fixes.

[ctriv at midnightbsd.org]

Log Message:
-----------
PACKAGE_BUILDING fixes.

Modified Files:
--------------
    mports/Mk:
        bsd.python.mk (r1.11 -> r1.12)

-------------- next part --------------
Index: bsd.python.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.python.mk,v
retrieving revision 1.11
retrieving revision 1.12
diff -L Mk/bsd.python.mk -L Mk/bsd.python.mk -u -r1.11 -r1.12
--- Mk/bsd.python.mk
+++ Mk/bsd.python.mk
@@ -227,9 +227,13 @@
 .else
 _PYTHON_CMD=		${LOCALBASE}/bin/python
 .endif
+.	if defined(PACKAGE_BUILDING)
+_PYTHON_VERSION!= ${ECHO_CMD} ${_PYTHON_PORTBRANCH} | ${TAIL} -n 1
+.   else
 _PYTHON_VERSION!=	(${_PYTHON_CMD} -c \
 					'import sys; print sys.version[:3]' 2> /dev/null \
-					|| ${ECHO_CMD} ${_PYTHON_PORTBRANCH}) | ${TAIL} -1
+					|| ${ECHO_CMD} ${_PYTHON_PORTBRANCH}) | ${TAIL} -n 1
+.	endif # defined(PACKAGE_BUILDING)
 .endif	# defined(PYTHON_VERSION)
 
 .if !defined(USE_PYTHON)
@@ -287,11 +291,17 @@
 
 PYTHON_VERSION?=	python${_PYTHON_VERSION}
 PYTHON_CMD?=		${_PYTHON_CMD}
+DEPENDS_ARGS+=		PYTHON_VERSION=${PYTHON_VERSION}
+
+.if defined(PACKAGE_BUILDING)
+PYTHONBASE= ${LOCALBASE}
+.else
 PYTHONBASE!=		(${PYTHON_CMD} -c 'import sys; print sys.prefix' \
 						2> /dev/null || ${ECHO_CMD} ${LOCALBASE}) | ${TAIL} -1
-DEPENDS_ARGS+=		PYTHON_VERSION=${PYTHON_VERSION}
 _PYTHON_PORTVERSION!=	(${PYTHON_CMD} -c 'import string, sys; \
 							print string.split(sys.version)[0].replace("b",".b")' 2> /dev/null) | ${TAIL} -1
+.endif
+
 .if !defined(PYTHON_NO_DEPENDS) && !empty(_PYTHON_PORTVERSION)
 PYTHON_PORTVERSION=	${_PYTHON_PORTVERSION}
 .endif