Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Sep 2012 09:10:22 +0000 (UTC)
From:      Ganael LAPLANCHE <martymac@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r304617 - head/sysutils/dvdvideo
Message-ID:  <201209210910.q8L9AMEx003050@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: martymac
Date: Fri Sep 21 09:10:22 2012
New Revision: 304617
URL: http://svn.freebsd.org/changeset/ports/304617

Log:
  Fix plist and remove BROKEN flag when building with python 3.2+

Modified:
  head/sysutils/dvdvideo/Makefile   (contents, props changed)

Modified: head/sysutils/dvdvideo/Makefile
==============================================================================
--- head/sysutils/dvdvideo/Makefile	Fri Sep 21 08:53:58 2012	(r304616)
+++ head/sysutils/dvdvideo/Makefile	Fri Sep 21 09:10:22 2012	(r304617)
@@ -33,10 +33,6 @@ DVDCSS_LIBVERSION=	3
 
 .include <bsd.port.pre.mk>
 
-.if ${PYTHON_REL} >= 323
-BROKEN=	bad plist with latest python
-.endif
-
 .if ${PORT_OPTIONS:MDVDCSS}
 LIB_DEPENDS+=	dvdcss:${PORTSDIR}/multimedia/libdvdcss
 .endif
@@ -45,4 +41,21 @@ post-patch:
 	@${REINPLACE_CMD} -E -e 's|(libdvdcss.so)\.2|\1.${DVDCSS_LIBVERSION}|' \
 		${WRKSRC}/dvdvideo/libdvdcss.py
 
+# When Python version is 3.2+ we rewrite all the filenames
+# of TMPPLIST that end with .py[co], so that they conform
+# to PEP 3147 (see http://www.python.org/dev/peps/pep-3147/)
+.if ${PYTHON_REL} >= 320
+PYMAGICTAG=	${PYTHON_CMD} -c 'import imp; print(imp.get_tag())'
+add-plist-post:
+	@${AWK} '\
+		/\.py[co]$$/ && !($$0 ~ "/" pc "/") {id = match($$0, /\/[^\/]+\.py[co]$$/); if (id != 0) {d = substr($$0, 1, RSTART - 1); dirs[d] = 1}; sub(/\.py[co]$$/,  "." mt "&"); sub(/[^\/]+\.py[co]$$/, pc "/&"); print; next} \
+		/^@dirrm / {d = substr($$0, 8); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \
+		{print} \
+		END {if (sp in dirs) {print "@dirrm " sp "/" pc}} \
+		' \
+		pc="__pycache__" mt="$$(${PYMAGICTAG})" sp="${PYTHON_SITELIBDIR:S,${PYTHONBASE}/,,g}" \
+		${TMPPLIST} > ${TMPPLIST}.pyc_tmp
+	@${MV} ${TMPPLIST}.pyc_tmp ${TMPPLIST}
+.endif
+
 .include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209210910.q8L9AMEx003050>