Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1643974130121130"
MIME-Version: 1.0
Date: Fri, 4 Feb 2022 11:28:50 +0000
From: "Hauke Fath" <hauke@netbsd.org>
Subject: CVS commit: pkgsrc/textproc/py-lxml
To: pkgsrc-changes@NetBSD.org
Reply-To: hauke@netbsd.org
Message-Id: <20220204112850.14DA7FB24@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1643974130121130
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	hauke
Date:		Fri Feb  4 11:28:50 UTC 2022

Modified Files:
	pkgsrc/textproc/py-lxml: Makefile PLIST

Log Message:
For reasons unknown, the Solarish build (OmniOSCE here) installs one
file less than the others. Tweak the PLIST generation to make it so.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 pkgsrc/textproc/py-lxml/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/py-lxml/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1643974130121130
Content-Disposition: inline
Content-Length: 2597
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/textproc/py-lxml/Makefile
diff -u pkgsrc/textproc/py-lxml/Makefile:1.79 pkgsrc/textproc/py-lxml/Makefile:1.80
--- pkgsrc/textproc/py-lxml/Makefile:1.79	Tue Jan  4 20:54:58 2022
+++ pkgsrc/textproc/py-lxml/Makefile	Fri Feb  4 11:28:49 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.79 2022/01/04 20:54:58 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2022/02/04 11:28:49 hauke Exp $
 
 DISTNAME=	lxml-4.7.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc python
 MASTER_SITES=	${MASTER_SITE_PYPI:=l/lxml/}
 
@@ -14,10 +14,21 @@ LICENSE=	modified-bsd
 TEST_DEPENDS+=	${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
 TEST_DEPENDS+=	${PYPKGPREFIX}-cssselect>=0.7:../../textproc/py-cssselect
 
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_VARS+=		nosunos
+.if ${OPSYS} != "SunOS"
+PLIST.nosunos=		yes
+.endif
+
 PYSETUPTESTARGS=	--run-tests
 
 .include "../../devel/zlib/buildlink3.mk"
+
 .include "../../lang/python/egg.mk"
+# Needs to happen after the PYSITELIB substitution to prefix the line
+PRINT_PLIST_AWK+=	{ gsub(/.*\/iso_schematron_skeleton_for_xslt1\.xsl$$/, "$${PLIST.nosunos}&"); }
+
 BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.9.12
 .include "../../textproc/libxml2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libxslt+=	libxslt>=1.1.34

Index: pkgsrc/textproc/py-lxml/PLIST
diff -u pkgsrc/textproc/py-lxml/PLIST:1.12 pkgsrc/textproc/py-lxml/PLIST:1.13
--- pkgsrc/textproc/py-lxml/PLIST:1.12	Fri Jan  4 21:50:31 2019
+++ pkgsrc/textproc/py-lxml/PLIST	Fri Feb  4 11:28:49 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2019/01/04 21:50:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2022/02/04 11:28:49 hauke Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -99,7 +99,7 @@ ${PYSITELIB}/lxml/isoschematron/resource
 ${PYSITELIB}/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_abstract_expand.xsl
 ${PYSITELIB}/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_dsdl_include.xsl
 ${PYSITELIB}/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl
-${PYSITELIB}/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_skeleton_for_xslt1.xsl
+${PLIST.nosunos}${PYSITELIB}/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_skeleton_for_xslt1.xsl
 ${PYSITELIB}/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_svrl_for_xslt1.xsl
 ${PYSITELIB}/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/readme.txt
 ${PYSITELIB}/lxml/lxml.etree.h


--_----------=_1643974130121130--