prepare Python>=32 bytecode file location change

2 files changed, 57 insertions, 1 deletions

diff --git a/lang/python/extension.mk b/lang/python/extension.mk
index 3d6c92644de..4bcea26e245 100644
--- a/lang/python/extension.mk
+++ b/lang/python/extension.mk
@@ -1,4 +1,4 @@
-# $NetBSD: extension.mk,v 1.29 2011/05/04 10:01:02 obache Exp $
+# $NetBSD: extension.mk,v 1.30 2012/05/13 12:54:54 obache Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -51,3 +51,9 @@ INSTALL_ENV+=		PKGSRC_PYTHON_NO_EGG=defined
 .if defined(PY_PATCHPLIST)
 PLIST_SUBST+=	PYINC=${PYINC} PYLIB=${PYLIB} PYSITELIB=${PYSITELIB}
 .endif
+
+# prepare Python>=32 bytecode file location change
+.if empty(_PYTHON_VERSION:M2?) && ${_PYTHON_VERSION} != "31"
+PLIST_AWK+=	-f ${PKGSRCDIR}/lang/python/plist-python.awk
+PLIST_AWK_ENV+=	PYTHON_SOABI="cpython-${_PYTHON_VERSION}"
+.endif
diff --git a/lang/python/plist-python.awk b/lang/python/plist-python.awk
new file mode 100644
index 00000000000..a2a4159176d
--- /dev/null
+++ b/lang/python/plist-python.awk
@@ -0,0 +1,50 @@
+# $NetBSD: plist-python.awk,v 1.1 2012/05/13 12:54:54 obache Exp $
+#
+# Copyright (c) 2012 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by OBATA Akio.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+### This awk script handles python bytcode file entries in PLISTs.  This script
+### requires the following scripts to be included:
+###
+###	plist-functions.awk (print_entry)
+###
+### Certain environment variables must be set prior to running this script:
+###
+### PY_SOABI is the python SO ABI.
+###
+BEGIN {
+	PYTHON_SOABI = getenv_or_die("PYTHON_SOABI")
+}
+
+###
+### For each python bytecode file entry, convert directory and file name
+### using cache sub directory and SOABI.
+###
+/^[^@]/ && /[^\/]+\.py[co]$/ {
+	sub(/[^\/]+\.py[co]$/, "__pycache__/&")
+	sub(/\.py[co]$/, "." PYTHON_SOABI "&")
+}