Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Mar 2022 10:29:18 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: dbb6ff22e43f - main - textproc/py-libxml2: Fix PLIST for py37 flavor
Message-ID:  <202203301029.22UATIer085538@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=dbb6ff22e43fd044b38e42c06a65237eda34302c

commit dbb6ff22e43fd044b38e42c06a65237eda34302c
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-03-30 10:26:45 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-03-30 10:26:45 +0000

    textproc/py-libxml2: Fix PLIST for py37 flavor
    
    - While I'm here:
      - Merge post-install: into do-install: since this port uses a custom do-install:
      - Fix indent
    
    Approved by:    portmgr (blanket)
---
 textproc/py-libxml2/Makefile | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile
index a7c1a4e62d20..fa8aaffa0b7e 100644
--- a/textproc/py-libxml2/Makefile
+++ b/textproc/py-libxml2/Makefile
@@ -24,24 +24,22 @@ LIBXML2_SLAVE=	python
 DESCR=		${.CURDIR}/pkg-descr
 # Don't append pkg-plist from master port
 PLIST=
-PLIST_FILES=	${PYTHON_SITELIBDIR}/__pycache__/drv_libxml2${PYTHON_EXT_SUFFIX}.opt-1.pyc \
-		${PYTHON_SITELIBDIR}/__pycache__/drv_libxml2${PYTHON_EXT_SUFFIX}.pyc \
-		${PYTHON_SITELIBDIR}/__pycache__/libxml2${PYTHON_EXT_SUFFIX}.opt-1.pyc \
-		${PYTHON_SITELIBDIR}/__pycache__/libxml2${PYTHON_EXT_SUFFIX}.pyc \
+PLIST_FILES=	${PYTHON_SITELIBDIR}/__pycache__/drv_libxml2.cpython-${PYTHON_SUFFIX}.opt-1.pyc \
+		${PYTHON_SITELIBDIR}/__pycache__/drv_libxml2.cpython-${PYTHON_SUFFIX}.pyc \
+		${PYTHON_SITELIBDIR}/__pycache__/libxml2.cpython-${PYTHON_SUFFIX}.opt-1.pyc \
+		${PYTHON_SITELIBDIR}/__pycache__/libxml2.cpython-${PYTHON_SUFFIX}.pyc \
 		${PYTHON_SITELIBDIR}/drv_libxml2.py \
 		${PYTHON_SITELIBDIR}/libxml2.py \
 		${PYTHON_SITELIBDIR}/libxml2mod.so \
 		${PYTHON_SITELIBDIR}/libxml2mod.so.${DISTVERSION}
 
 do-install:
-		${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
-		${INSTALL_SCRIPT} ${WRKSRC}/python/drv_libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR}
-		${INSTALL_SCRIPT} ${BUILD_WRKSRC}/libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR}
-		${INSTALL_LIB} ${BUILD_WRKSRC}/libxml2mod.so ${STAGEDIR}${PYTHON_SITELIBDIR}
-		${RLN} ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so.${DISTVERSION}
-
-post-install:
-		${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
-		${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
+	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/python/drv_libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR}
+	${INSTALL_SCRIPT} ${BUILD_WRKSRC}/libxml2.py ${STAGEDIR}${PYTHON_SITELIBDIR}
+	${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
+	${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
+	${INSTALL_LIB} ${BUILD_WRKSRC}/libxml2mod.so ${STAGEDIR}${PYTHON_SITELIBDIR}
+	${RLN} ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so.${DISTVERSION}
 
 .include "${MASTERDIR}/Makefile"



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