[Fwd: dvdvideo-20120126_1 failed on amd64 8]

[wen heping]

Hi, all:

   I attached a patch to resole it .
   Any comments?

wen
-------------- next part --------------
--- Mk/bsd.python.mk.orig	2012-04-16 14:06:51.000000000 +0800
+++ Mk/bsd.python.mk	2012-04-16 16:03:06.000000000 +0800
@@ -448,6 +448,19 @@
 PYTHONPREFIX_LIBDIR=		${PYTHON_LIBDIR:S;${PYTHONBASE};${PREFIX};}
 PYTHONPREFIX_SITELIBDIR=	${PYTHON_SITELIBDIR:S;${PYTHONBASE};${PREFIX};}
 
+.if ${PYTHON_REL} >= 323
+PYC_IMPL?=	cpython
+PYC_VER?=	32
+PYC_ABI=	${PYC_IMPL}-${PYC_VER}
+PLIST_SUB+=	PYC_MULTI=${PYC_ABI}. \
+		PYC_CACHE="__pycache__/" \
+		PYC_CACHE_DIR=""
+.else
+PLIST_SUB+=	PYC_MULTI="" \
+		PYC_CACHE="" \
+		PYC_CACHE_DIR="@comment "
+.endif
+
 # setuptools support
 .if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install"
 .if ${PYTHON_SUFFIX} < 30
--- sysutils/dvdvideo/Makefile.orig	2012-04-16 16:44:13.000000000 +0800
+++ sysutils/dvdvideo/Makefile	2012-04-16 16:44:44.000000000 +0800
@@ -7,7 +7,7 @@
 
 PORTNAME=	dvdvideo
 PORTVERSION=	20120126
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils multimedia
 MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
 		LOCAL/martymac
--- sysutils/dvdvideo/pkg-plist.orig	2012-04-16 16:44:26.000000000 +0800
+++ sysutils/dvdvideo/pkg-plist	2012-04-16 16:41:43.000000000 +0800
@@ -1,40 +1,42 @@
 bin/dvdvideo-backup-image
 %%PYTHON_SITELIBDIR%%/dvdvideo/ifo.py
-%%PYTHON_SITELIBDIR%%/dvdvideo/libdvdcss.pyc
-%%PYTHON_SITELIBDIR%%/dvdvideo/vob.pyc
+%%PYTHON_SITELIBDIR%%/dvdvideo/%%PYC_CACHE%%libdvdcss.%%PYC_MULTI%%pyc
+%%PYTHON_SITELIBDIR%%/dvdvideo/%%PYC_CACHE%%vob.%%PYC_MULTI%%pyc
 %%PYTHON_SITELIBDIR%%/dvdvideo/volume.py
-%%PYTHON_SITELIBDIR%%/dvdvideo/volume.pyc
-%%PYTHON_SITELIBDIR%%/dvdvideo/volume.pyo
+%%PYTHON_SITELIBDIR%%/dvdvideo/%%PYC_CACHE%%volume.%%PYC_MULTI%%pyc
+%%PYTHON_SITELIBDIR%%/dvdvideo/%%PYC_CACHE%%volume.%%PYC_MULTI%%pyo
 %%PYTHON_SITELIBDIR%%/dvdvideo/vob.py
-%%PYTHON_SITELIBDIR%%/dvdvideo/utils.pyc
+%%PYTHON_SITELIBDIR%%/dvdvideo/%%PYC_CACHE%%utils.%%PYC_MULTI%%pyc
 %%PYTHON_SITELIBDIR%%/dvdvideo/libdvdcss.py
-%%PYTHON_SITELIBDIR%%/dvdvideo/media.pyc
-%%PYTHON_SITELIBDIR%%/dvdvideo/__init__.pyo
-%%PYTHON_SITELIBDIR%%/dvdvideo/ifo.pyc
+%%PYTHON_SITELIBDIR%%/dvdvideo/%%PYC_CACHE%%media.%%PYC_MULTI%%pyc
+%%PYTHON_SITELIBDIR%%/dvdvideo/%%PYC_CACHE%%__init__.%%PYC_MULTI%%pyo
+%%PYTHON_SITELIBDIR%%/dvdvideo/%%PYC_CACHE%%ifo.%%PYC_MULTI%%pyc
 %%PYTHON_SITELIBDIR%%/dvdvideo/udf/general.py
-%%PYTHON_SITELIBDIR%%/dvdvideo/udf/__init__.pyc
-%%PYTHON_SITELIBDIR%%/dvdvideo/udf/media.pyo
-%%PYTHON_SITELIBDIR%%/dvdvideo/udf/volume.pyo
-%%PYTHON_SITELIBDIR%%/dvdvideo/udf/filesystem.pyc
+%%PYTHON_SITELIBDIR%%/dvdvideo/udf/%%PYC_CACHE%%__init__.%%PYC_MULTI%%pyc
+%%PYTHON_SITELIBDIR%%/dvdvideo/udf/%%PYC_CACHE%%media.%%PYC_MULTI%%pyo
+%%PYTHON_SITELIBDIR%%/dvdvideo/udf/%%PYC_CACHE%%volume.%%PYC_MULTI%%pyo
+%%PYTHON_SITELIBDIR%%/dvdvideo/udf/%%PYC_CACHE%%filesystem.%%PYC_MULTI%%pyc
 %%PYTHON_SITELIBDIR%%/dvdvideo/udf/__init__.py
-%%PYTHON_SITELIBDIR%%/dvdvideo/udf/general.pyc
+%%PYTHON_SITELIBDIR%%/dvdvideo/udf/%%PYC_CACHE%%general.%%PYC_MULTI%%pyc
 %%PYTHON_SITELIBDIR%%/dvdvideo/udf/filesystem.py
-%%PYTHON_SITELIBDIR%%/dvdvideo/udf/__init__.pyo
-%%PYTHON_SITELIBDIR%%/dvdvideo/udf/media.pyc
-%%PYTHON_SITELIBDIR%%/dvdvideo/udf/general.pyo
-%%PYTHON_SITELIBDIR%%/dvdvideo/udf/volume.pyc
-%%PYTHON_SITELIBDIR%%/dvdvideo/udf/filesystem.pyo
+%%PYTHON_SITELIBDIR%%/dvdvideo/udf/%%PYC_CACHE%%__init__.%%PYC_MULTI%%pyo
+%%PYTHON_SITELIBDIR%%/dvdvideo/udf/%%PYC_CACHE%%media.%%PYC_MULTI%%pyc
+%%PYTHON_SITELIBDIR%%/dvdvideo/udf/%%PYC_CACHE%%general.%%PYC_MULTI%%pyo
+%%PYTHON_SITELIBDIR%%/dvdvideo/udf/%%PYC_CACHE%%volume.%%PYC_MULTI%%pyc
+%%PYTHON_SITELIBDIR%%/dvdvideo/udf/%%PYC_CACHE%%filesystem.%%PYC_MULTI%%pyo
 %%PYTHON_SITELIBDIR%%/dvdvideo/udf/volume.py
 %%PYTHON_SITELIBDIR%%/dvdvideo/udf/media.py
-%%PYTHON_SITELIBDIR%%/dvdvideo/libdvdcss.pyo
-%%PYTHON_SITELIBDIR%%/dvdvideo/vob.pyo
+%%PYTHON_SITELIBDIR%%/dvdvideo/%%PYC_CACHE%%libdvdcss.%%PYC_MULTI%%pyo
+%%PYTHON_SITELIBDIR%%/dvdvideo/%%PYC_CACHE%%vob.%%PYC_MULTI%%pyo
 %%PYTHON_SITELIBDIR%%/dvdvideo/__init__.py
 %%PYTHON_SITELIBDIR%%/dvdvideo/media.py
 %%PYTHON_SITELIBDIR%%/dvdvideo/utils.py
-%%PYTHON_SITELIBDIR%%/dvdvideo/utils.pyo
-%%PYTHON_SITELIBDIR%%/dvdvideo/__init__.pyc
-%%PYTHON_SITELIBDIR%%/dvdvideo/media.pyo
-%%PYTHON_SITELIBDIR%%/dvdvideo/ifo.pyo
+%%PYTHON_SITELIBDIR%%/dvdvideo/%%PYC_CACHE%%utils.%%PYC_MULTI%%pyo
+%%PYTHON_SITELIBDIR%%/dvdvideo/%%PYC_CACHE%%__init__.%%PYC_MULTI%%pyc
+%%PYTHON_SITELIBDIR%%/dvdvideo/%%PYC_CACHE%%media.%%PYC_MULTI%%pyo
+%%PYTHON_SITELIBDIR%%/dvdvideo/%%PYC_CACHE%%ifo.%%PYC_MULTI%%pyo
+%%PYC_CACHE_DIR%%@dirrm %%PYTHON_SITELIBDIR%%/dvdvideo/udf/%%PYC_CACHE%%
+%%PYC_CACHE_DIR%%@dirrm %%PYTHON_SITELIBDIR%%/dvdvideo/%%PYC_CACHE%%
 @dirrm %%PYTHON_SITELIBDIR%%/dvdvideo/udf
 @dirrm %%PYTHON_SITELIBDIR%%/dvdvideo
 @dirrmtry %%PYTHON_SITELIBDIR%%