Update: textproc/py-xmldiff 0.6.10 -> 2.3

classic Classic list List threaded Threaded
9 messages Options
Reply | Threaded
Open this post in threaded view
|

Update: textproc/py-xmldiff 0.6.10 -> 2.3

Kurt Mosiejczuk-9
Landry has asked me to spare the life of py-xmldiff. I will do one better
by updating it.

Upstream went to pure python with 2.x. So patches and much of the
Makefile go away.

I moved it to MODPY_PI and MODPY_SETUPTOOLS. Go with the default targets.

All regression tests pass on amd64 and sparc64 for both python 2.x and 3.x
flavors.

--Kurt

Reply | Threaded
Open this post in threaded view
|

Re: Update: textproc/py-xmldiff 0.6.10 -> 2.3

Kurt Mosiejczuk-9
On Mon, Aug 12, 2019 at 06:19:52PM -0400, Kurt Mosiejczuk wrote:

> Landry has asked me to spare the life of py-xmldiff. I will do one better
> by updating it.
>
> Upstream went to pure python with 2.x. So patches and much of the
> Makefile go away.
>
> I moved it to MODPY_PI and MODPY_SETUPTOOLS. Go with the default targets.
>
> All regression tests pass on amd64 and sparc64 for both python 2.x and 3.x
> flavors.

Now, for my next trick, I will *actually* include the diff.

--Kurt

Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/py-xmldiff/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 12 Jul 2019 20:50:14 -0000 1.8
+++ Makefile 12 Aug 2019 22:13:09 -0000
@@ -2,33 +2,25 @@
 
 COMMENT= show differences between XML files/DOM trees
 
-MODPY_EGG_VERSION= 0.6.10
+MODPY_EGG_VERSION= 2.3
 DISTNAME= xmldiff-${MODPY_EGG_VERSION}
 PKGNAME= py-xmldiff-${MODPY_EGG_VERSION}
-REVISION= 3
 CATEGORIES= textproc
 
-HOMEPAGE= http://www.logilab.org/859/
+HOMEPAGE= https://github.com/Shoobx/xmldiff
 
-# GPLv2
+# MIT
 PERMIT_PACKAGE= Yes
 
-WANTLIB += ${MODPY_WANTLIB}
-WANTLIB += pthread
-
 MODULES= lang/python
 
-MASTER_SITES= http://ftp.logilab.org/pub/xmldiff/
-
-RUN_DEPENDS= shells/bash \
- textproc/py-xml
-
+MODPY_PI= Yes
+MODPY_SETUPTOOLS= Yes
 
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/bin/{xmldiff,xmlrev}
+FLAVORS= python3
+FLAVOR?=
 
-do-test:
- @cd ${WRKSRC}/test/ && \
- ${MODPY_BIN} runtests.py
+RUN_DEPENDS= devel/py-six${MODPY_FLAVOR} \
+ textproc/py-lxml${MODPY_FLAVOR}
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/py-xmldiff/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 18 Jan 2015 03:15:30 -0000 1.2
+++ distinfo 12 Aug 2019 22:13:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (xmldiff-0.6.10.tar.gz) = g6uiUt8vdgyL8Ai5xdMICRHqstKznDcdO0f2er9LTsU=
-SIZE (xmldiff-0.6.10.tar.gz) = 45827
+SHA256 (xmldiff-2.3.tar.gz) = Jyf2KrWQwfyDToYDOYinaoamf1p4GWWEBJt6civZRGY=
+SIZE (xmldiff-2.3.tar.gz) = 95947
Index: patches/patch-bin_xmldiff
===================================================================
RCS file: patches/patch-bin_xmldiff
diff -N patches/patch-bin_xmldiff
--- patches/patch-bin_xmldiff 21 Sep 2010 20:31:13 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-bin_xmldiff,v 1.1.1.1 2010/09/21 20:31:13 jasper Exp $
---- bin/xmldiff.orig Tue Sep 21 20:30:40 2010
-+++ bin/xmldiff Tue Sep 21 20:30:48 2010
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!${MODPY_BIN}
-
- from xmldiff import main
- main.run()
Index: patches/patch-bin_xmlrev
===================================================================
RCS file: patches/patch-bin_xmlrev
diff -N patches/patch-bin_xmlrev
--- patches/patch-bin_xmlrev 21 Sep 2010 20:31:13 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-bin_xmlrev,v 1.1.1.1 2010/09/21 20:31:13 jasper Exp $
---- bin/xmlrev.orig Tue Sep 21 20:31:30 2010
-+++ bin/xmlrev Tue Sep 21 20:31:39 2010
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!${LOCALBASE}/bin/bash
- #
- # (c) 2001-2004 Nicolas Chauvat <[hidden email]> - License is GPL
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/py-xmldiff/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 21 Sep 2010 20:31:13 -0000 1.1.1.1
+++ pkg/PLIST 12 Aug 2019 22:13:09 -0000
@@ -1,87 +1,33 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2010/09/21 20:31:13 jasper Exp $
 bin/xmldiff
-bin/xmlrev
+bin/xmlpatch
 lib/python${MODPY_VERSION}/site-packages/xmldiff/
-lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/xmldiff/__init__.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/__pkginfo__.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/__pkginfo__.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/ezs.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/ezs.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/fmes.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/fmes.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/format.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/format.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/input.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/input.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}_diff_match_patch_py2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}_diff_match_patch_py3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}actions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}diff.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}diff_match_patch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}formatting.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}patch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/_diff_match_patch_py2.py
+lib/python${MODPY_VERSION}/site-packages/xmldiff/_diff_match_patch_py3.py
+lib/python${MODPY_VERSION}/site-packages/xmldiff/actions.py
+lib/python${MODPY_VERSION}/site-packages/xmldiff/diff.py
+lib/python${MODPY_VERSION}/site-packages/xmldiff/diff_match_patch.py
+lib/python${MODPY_VERSION}/site-packages/xmldiff/formatting.py
 lib/python${MODPY_VERSION}/site-packages/xmldiff/main.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/main.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/maplookup.so
-lib/python${MODPY_VERSION}/site-packages/xmldiff/misc.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/misc.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/mydifflib.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/mydifflib.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/objects.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/objects.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/parser.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/parser.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/dir1/
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/dir1/inbothdir.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/dir1/onlyindir1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/dir2/
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/dir2/inbothdir.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/dir2/onlyindir2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test00_--xupdate_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test00_1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test00_2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test00_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test01_--xupdate_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test01_1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test01_2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test01_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test02_--xupdate_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test02_1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test02_2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test02_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test03_--xupdate_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test03_1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test03_2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test03_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test04_--xupdate_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test04_1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test04_2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test04_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test05_--xupdate_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test05_1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test05_2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test05_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test06_--xupdate_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test06_1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test06_2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test06_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test07_--xupdate_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test07_1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test07_2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test07_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test08_--xupdate_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test08_1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test08_2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test08_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/regrtest.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/regrtest.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/runtests.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/runtests.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/unittest_difflib.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/unittest_difflib.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/unittest_options.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/unittest_options.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/unittest_parser.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/unittest_parser.pyc
-share/sgml/
-share/sgml/stylesheet/
-share/sgml/stylesheet/xmldiff/
-share/sgml/stylesheet/xmldiff/docbook_rev.xsl
-share/sgml/stylesheet/xmldiff/xmlrev.xslt
+lib/python${MODPY_VERSION}/site-packages/xmldiff/patch.py
+lib/python${MODPY_VERSION}/site-packages/xmldiff/utils.py

Reply | Threaded
Open this post in threaded view
|

Re: Update: textproc/py-xmldiff 0.6.10 -> 2.3

Daniel Jakots-6
On Mon, 12 Aug 2019 18:32:16 -0400, Kurt Mosiejczuk <[hidden email]>
wrote:

> +FLAVORS= python3
> +FLAVOR?=

Isn't it just a tool? Maybe it's more meaningful to just provide a py3
version. What's your opinion?

Cheers,
Daniel

Reply | Threaded
Open this post in threaded view
|

Re: Update: textproc/py-xmldiff 0.6.10 -> 2.3

Kurt Mosiejczuk-9
On Mon, Aug 12, 2019 at 06:44:46PM -0400, Daniel Jakots wrote:
> On Mon, 12 Aug 2019 18:32:16 -0400, Kurt Mosiejczuk <[hidden email]>
> wrote:

> > +FLAVORS= python3
> > +FLAVOR?=

> Isn't it just a tool? Maybe it's more meaningful to just provide a py3
> version. What's your opinion?

That is actually an excellent point. It had been python 2 only so I was
more concerned with adding python3.

Actually, going one flavor is required as it is. It installs plain binaries
(xmldiff, xmlpatch) and I didn't throw a suffix on them.

I'll rework it to be python3 only and then have a quirks diff to migrate
folks from py-xmldiff to py3-xmldiff.

--Kurt

Reply | Threaded
Open this post in threaded view
|

Re: Update: textproc/py-xmldiff 0.6.10 -> 2.3

Kurt Mosiejczuk-9
On Mon, Aug 12, 2019 at 08:03:16PM -0400, Kurt Mosiejczuk wrote:
> On Mon, Aug 12, 2019 at 06:44:46PM -0400, Daniel Jakots wrote:
> > On Mon, 12 Aug 2019 18:32:16 -0400, Kurt Mosiejczuk <[hidden email]>
> > wrote:

> > > +FLAVORS= python3
> > > +FLAVOR?=

> > Isn't it just a tool? Maybe it's more meaningful to just provide a py3
> > version. What's your opinion?

> That is actually an excellent point. It had been python 2 only so I was
> more concerned with adding python3.

> Actually, going one flavor is required as it is. It installs plain binaries
> (xmldiff, xmlpatch) and I didn't throw a suffix on them.

> I'll rework it to be python3 only and then have a quirks diff to migrate
> folks from py-xmldiff to py3-xmldiff.

Here's a new version of the diff making it python3 only.  I'm also including
a quirks diff at the end that will migrate folks from py-xmldiff to
py3-xmldiff.

--Kurt

Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/py-xmldiff/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 12 Jul 2019 20:50:14 -0000 1.8
+++ Makefile 13 Aug 2019 01:02:40 -0000
@@ -2,33 +2,24 @@
 
 COMMENT= show differences between XML files/DOM trees
 
-MODPY_EGG_VERSION= 0.6.10
+MODPY_EGG_VERSION= 2.3
 DISTNAME= xmldiff-${MODPY_EGG_VERSION}
 PKGNAME= py-xmldiff-${MODPY_EGG_VERSION}
-REVISION= 3
 CATEGORIES= textproc
 
-HOMEPAGE= http://www.logilab.org/859/
+HOMEPAGE= https://github.com/Shoobx/xmldiff
 
-# GPLv2
+# MIT
 PERMIT_PACKAGE= Yes
 
-WANTLIB += ${MODPY_WANTLIB}
-WANTLIB += pthread
-
 MODULES= lang/python
 
-MASTER_SITES= http://ftp.logilab.org/pub/xmldiff/
-
-RUN_DEPENDS= shells/bash \
- textproc/py-xml
-
+MODPY_PI= Yes
+MODPY_SETUPTOOLS= Yes
 
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/bin/{xmldiff,xmlrev}
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
 
-do-test:
- @cd ${WRKSRC}/test/ && \
- ${MODPY_BIN} runtests.py
+RUN_DEPENDS= devel/py-six${MODPY_FLAVOR} \
+ textproc/py-lxml${MODPY_FLAVOR}
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/py-xmldiff/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 18 Jan 2015 03:15:30 -0000 1.2
+++ distinfo 13 Aug 2019 01:02:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (xmldiff-0.6.10.tar.gz) = g6uiUt8vdgyL8Ai5xdMICRHqstKznDcdO0f2er9LTsU=
-SIZE (xmldiff-0.6.10.tar.gz) = 45827
+SHA256 (xmldiff-2.3.tar.gz) = Jyf2KrWQwfyDToYDOYinaoamf1p4GWWEBJt6civZRGY=
+SIZE (xmldiff-2.3.tar.gz) = 95947
Index: patches/patch-bin_xmldiff
===================================================================
RCS file: patches/patch-bin_xmldiff
diff -N patches/patch-bin_xmldiff
--- patches/patch-bin_xmldiff 21 Sep 2010 20:31:13 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-bin_xmldiff,v 1.1.1.1 2010/09/21 20:31:13 jasper Exp $
---- bin/xmldiff.orig Tue Sep 21 20:30:40 2010
-+++ bin/xmldiff Tue Sep 21 20:30:48 2010
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!${MODPY_BIN}
-
- from xmldiff import main
- main.run()
Index: patches/patch-bin_xmlrev
===================================================================
RCS file: patches/patch-bin_xmlrev
diff -N patches/patch-bin_xmlrev
--- patches/patch-bin_xmlrev 21 Sep 2010 20:31:13 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-bin_xmlrev,v 1.1.1.1 2010/09/21 20:31:13 jasper Exp $
---- bin/xmlrev.orig Tue Sep 21 20:31:30 2010
-+++ bin/xmlrev Tue Sep 21 20:31:39 2010
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!${LOCALBASE}/bin/bash
- #
- # (c) 2001-2004 Nicolas Chauvat <[hidden email]> - License is GPL
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/py-xmldiff/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 21 Sep 2010 20:31:13 -0000 1.1.1.1
+++ pkg/PLIST 13 Aug 2019 01:02:40 -0000
@@ -1,87 +1,33 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2010/09/21 20:31:13 jasper Exp $
 bin/xmldiff
-bin/xmlrev
+bin/xmlpatch
 lib/python${MODPY_VERSION}/site-packages/xmldiff/
-lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/xmldiff/__init__.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/__pkginfo__.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/__pkginfo__.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/ezs.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/ezs.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/fmes.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/fmes.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/format.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/format.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/input.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/input.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}_diff_match_patch_py2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}_diff_match_patch_py3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}actions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}diff.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}diff_match_patch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}formatting.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}patch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/xmldiff/_diff_match_patch_py2.py
+lib/python${MODPY_VERSION}/site-packages/xmldiff/_diff_match_patch_py3.py
+lib/python${MODPY_VERSION}/site-packages/xmldiff/actions.py
+lib/python${MODPY_VERSION}/site-packages/xmldiff/diff.py
+lib/python${MODPY_VERSION}/site-packages/xmldiff/diff_match_patch.py
+lib/python${MODPY_VERSION}/site-packages/xmldiff/formatting.py
 lib/python${MODPY_VERSION}/site-packages/xmldiff/main.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/main.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/maplookup.so
-lib/python${MODPY_VERSION}/site-packages/xmldiff/misc.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/misc.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/mydifflib.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/mydifflib.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/objects.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/objects.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/parser.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/parser.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/dir1/
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/dir1/inbothdir.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/dir1/onlyindir1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/dir2/
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/dir2/inbothdir.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/dir2/onlyindir2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test00_--xupdate_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test00_1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test00_2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test00_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test01_--xupdate_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test01_1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test01_2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test01_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test02_--xupdate_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test02_1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test02_2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test02_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test03_--xupdate_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test03_1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test03_2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test03_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test04_--xupdate_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test04_1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test04_2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test04_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test05_--xupdate_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test05_1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test05_2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test05_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test06_--xupdate_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test06_1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test06_2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test06_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test07_--xupdate_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test07_1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test07_2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test07_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test08_--xupdate_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test08_1.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test08_2.xml
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test08_result
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/regrtest.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/regrtest.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/runtests.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/runtests.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/unittest_difflib.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/unittest_difflib.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/unittest_options.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/unittest_options.pyc
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/unittest_parser.py
-lib/python${MODPY_VERSION}/site-packages/xmldiff/test/unittest_parser.pyc
-share/sgml/
-share/sgml/stylesheet/
-share/sgml/stylesheet/xmldiff/
-share/sgml/stylesheet/xmldiff/docbook_rev.xsl
-share/sgml/stylesheet/xmldiff/xmlrev.xslt
+lib/python${MODPY_VERSION}/site-packages/xmldiff/patch.py
+lib/python${MODPY_VERSION}/site-packages/xmldiff/utils.py

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.777
diff -u -p -r1.777 Makefile
--- Makefile 12 Aug 2019 15:21:30 -0000 1.777
+++ Makefile 13 Aug 2019 01:01:54 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME = quirks-3.168
+PKGNAME = quirks-3.169
 PKG_ARCH = *
 MAINTAINER = Marc Espie <[hidden email]>
 
Index: files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.794
diff -u -p -r1.794 Quirks.pm
--- files/Quirks.pm 12 Aug 2019 15:21:30 -0000 1.794
+++ files/Quirks.pm 13 Aug 2019 01:01:54 -0000
@@ -332,6 +332,7 @@ my $stem_extensions = {
  'Xonotic-server' => 'xonotic-server',
  'gettext' => 'gettext-runtime',
  'kwebapp' => 'openradtool',
+ 'py-xmldiff' => 'py3-xmldiff',
 };
 
 my $obsolete_reason = {

Reply | Threaded
Open this post in threaded view
|

Re: Update: textproc/py-xmldiff 0.6.10 -> 2.3

Landry Breuil-5
On Mon, Aug 12, 2019 at 09:04:09PM -0400, Kurt Mosiejczuk wrote:

> On Mon, Aug 12, 2019 at 08:03:16PM -0400, Kurt Mosiejczuk wrote:
> > On Mon, Aug 12, 2019 at 06:44:46PM -0400, Daniel Jakots wrote:
> > > On Mon, 12 Aug 2019 18:32:16 -0400, Kurt Mosiejczuk <[hidden email]>
> > > wrote:
>
> > > > +FLAVORS= python3
> > > > +FLAVOR?=
>
> > > Isn't it just a tool? Maybe it's more meaningful to just provide a py3
> > > version. What's your opinion?
>
> > That is actually an excellent point. It had been python 2 only so I was
> > more concerned with adding python3.
>
> > Actually, going one flavor is required as it is. It installs plain binaries
> > (xmldiff, xmlpatch) and I didn't throw a suffix on them.
>
> > I'll rework it to be python3 only and then have a quirks diff to migrate
> > folks from py-xmldiff to py3-xmldiff.
>
> Here's a new version of the diff making it python3 only.  I'm also including
> a quirks diff at the end that will migrate folks from py-xmldiff to
> py3-xmldiff.

Reads good to me, and i also agree with the move to py3 only. thanks !

Landry

Reply | Threaded
Open this post in threaded view
|

Re: Update: textproc/py-xmldiff 0.6.10 -> 2.3

Stuart Henderson
In reply to this post by Kurt Mosiejczuk-9
On 2019/08/12 21:04, Kurt Mosiejczuk wrote:

> On Mon, Aug 12, 2019 at 08:03:16PM -0400, Kurt Mosiejczuk wrote:
> > On Mon, Aug 12, 2019 at 06:44:46PM -0400, Daniel Jakots wrote:
> > > On Mon, 12 Aug 2019 18:32:16 -0400, Kurt Mosiejczuk <[hidden email]>
> > > wrote:
>
> > > > +FLAVORS= python3
> > > > +FLAVOR?=
>
> > > Isn't it just a tool? Maybe it's more meaningful to just provide a py3
> > > version. What's your opinion?
>
> > That is actually an excellent point. It had been python 2 only so I was
> > more concerned with adding python3.
>
> > Actually, going one flavor is required as it is. It installs plain binaries
> > (xmldiff, xmlpatch) and I didn't throw a suffix on them.
>
> > I'll rework it to be python3 only and then have a quirks diff to migrate
> > folks from py-xmldiff to py3-xmldiff.
>
> Here's a new version of the diff making it python3 only.  I'm also including
> a quirks diff at the end that will migrate folks from py-xmldiff to
> py3-xmldiff.

Because the stem changes from py-xmldiff to py3-xmldiff, this will need more
work in order that the update is picked up.

Untested but I think it will need

@conflict py-xmldiff-*
@pkgpath textproc/py-xmldiff

If unsure, please test update paths:

- build new packages for the port itself + devel/quirks, move them to
a directory on their own e.g. /tmp/test

- install the old packages (e.g. uninstall the new packages after testing
and pkg_add the old ones from mirrors)

- "PKG_PATH=/tmp/test pkg_add -D unsigned -u" and check that the relevant
package/s were updated (there will be a bunch of "no update for XX" noise
for unrelated packages on the sytem of course that can be ignored)


> --Kurt
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/textproc/py-xmldiff/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile 12 Jul 2019 20:50:14 -0000 1.8
> +++ Makefile 13 Aug 2019 01:02:40 -0000
> @@ -2,33 +2,24 @@
>  
>  COMMENT= show differences between XML files/DOM trees
>  
> -MODPY_EGG_VERSION= 0.6.10
> +MODPY_EGG_VERSION= 2.3
>  DISTNAME= xmldiff-${MODPY_EGG_VERSION}
>  PKGNAME= py-xmldiff-${MODPY_EGG_VERSION}
> -REVISION= 3
>  CATEGORIES= textproc
>  
> -HOMEPAGE= http://www.logilab.org/859/
> +HOMEPAGE= https://github.com/Shoobx/xmldiff
>  
> -# GPLv2
> +# MIT
>  PERMIT_PACKAGE= Yes
>  
> -WANTLIB += ${MODPY_WANTLIB}
> -WANTLIB += pthread
> -
>  MODULES= lang/python
>  
> -MASTER_SITES= http://ftp.logilab.org/pub/xmldiff/
> -
> -RUN_DEPENDS= shells/bash \
> - textproc/py-xml
> -
> +MODPY_PI= Yes
> +MODPY_SETUPTOOLS= Yes
>  
> -pre-configure:
> - ${SUBST_CMD} ${WRKSRC}/bin/{xmldiff,xmlrev}
> +MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
>  
> -do-test:
> - @cd ${WRKSRC}/test/ && \
> - ${MODPY_BIN} runtests.py
> +RUN_DEPENDS= devel/py-six${MODPY_FLAVOR} \
> + textproc/py-lxml${MODPY_FLAVOR}
>  
>  .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/textproc/py-xmldiff/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 18 Jan 2015 03:15:30 -0000 1.2
> +++ distinfo 13 Aug 2019 01:02:40 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (xmldiff-0.6.10.tar.gz) = g6uiUt8vdgyL8Ai5xdMICRHqstKznDcdO0f2er9LTsU=
> -SIZE (xmldiff-0.6.10.tar.gz) = 45827
> +SHA256 (xmldiff-2.3.tar.gz) = Jyf2KrWQwfyDToYDOYinaoamf1p4GWWEBJt6civZRGY=
> +SIZE (xmldiff-2.3.tar.gz) = 95947
> Index: patches/patch-bin_xmldiff
> ===================================================================
> RCS file: patches/patch-bin_xmldiff
> diff -N patches/patch-bin_xmldiff
> --- patches/patch-bin_xmldiff 21 Sep 2010 20:31:13 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,9 +0,0 @@
> -$OpenBSD: patch-bin_xmldiff,v 1.1.1.1 2010/09/21 20:31:13 jasper Exp $
> ---- bin/xmldiff.orig Tue Sep 21 20:30:40 2010
> -+++ bin/xmldiff Tue Sep 21 20:30:48 2010
> -@@ -1,4 +1,4 @@
> --#!/usr/bin/python
> -+#!${MODPY_BIN}
> -
> - from xmldiff import main
> - main.run()
> Index: patches/patch-bin_xmlrev
> ===================================================================
> RCS file: patches/patch-bin_xmlrev
> diff -N patches/patch-bin_xmlrev
> --- patches/patch-bin_xmlrev 21 Sep 2010 20:31:13 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,9 +0,0 @@
> -$OpenBSD: patch-bin_xmlrev,v 1.1.1.1 2010/09/21 20:31:13 jasper Exp $
> ---- bin/xmlrev.orig Tue Sep 21 20:31:30 2010
> -+++ bin/xmlrev Tue Sep 21 20:31:39 2010
> -@@ -1,4 +1,4 @@
> --#!/bin/bash
> -+#!${LOCALBASE}/bin/bash
> - #
> - # (c) 2001-2004 Nicolas Chauvat <[hidden email]> - License is GPL
> -
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/textproc/py-xmldiff/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 21 Sep 2010 20:31:13 -0000 1.1.1.1
> +++ pkg/PLIST 13 Aug 2019 01:02:40 -0000
> @@ -1,87 +1,33 @@
>  @comment $OpenBSD: PLIST,v 1.1.1.1 2010/09/21 20:31:13 jasper Exp $
>  bin/xmldiff
> -bin/xmlrev
> +bin/xmlpatch
>  lib/python${MODPY_VERSION}/site-packages/xmldiff/
> -lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
> +lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> +lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> +lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
> +lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
> +lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
> +lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
> +lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
> +lib/python${MODPY_VERSION}/site-packages/xmldiff-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
>  lib/python${MODPY_VERSION}/site-packages/xmldiff/__init__.py
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/__init__.pyc
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/__pkginfo__.py
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/__pkginfo__.pyc
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/ezs.py
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/ezs.pyc
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/fmes.py
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/fmes.pyc
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/format.py
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/format.pyc
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/input.py
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/input.pyc
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}_diff_match_patch_py2.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}_diff_match_patch_py3.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}actions.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}diff.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}diff_match_patch.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}formatting.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}patch.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/xmldiff/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/xmldiff/_diff_match_patch_py2.py
> +lib/python${MODPY_VERSION}/site-packages/xmldiff/_diff_match_patch_py3.py
> +lib/python${MODPY_VERSION}/site-packages/xmldiff/actions.py
> +lib/python${MODPY_VERSION}/site-packages/xmldiff/diff.py
> +lib/python${MODPY_VERSION}/site-packages/xmldiff/diff_match_patch.py
> +lib/python${MODPY_VERSION}/site-packages/xmldiff/formatting.py
>  lib/python${MODPY_VERSION}/site-packages/xmldiff/main.py
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/main.pyc
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/maplookup.so
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/misc.py
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/misc.pyc
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/mydifflib.py
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/mydifflib.pyc
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/objects.py
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/objects.pyc
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/parser.py
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/parser.pyc
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/dir1/
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/dir1/inbothdir.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/dir1/onlyindir1.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/dir2/
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/dir2/inbothdir.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/dir2/onlyindir2.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test00_--xupdate_result
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test00_1.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test00_2.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test00_result
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test01_--xupdate_result
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test01_1.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test01_2.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test01_result
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test02_--xupdate_result
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test02_1.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test02_2.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test02_result
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test03_--xupdate_result
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test03_1.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test03_2.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test03_result
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test04_--xupdate_result
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test04_1.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test04_2.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test04_result
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test05_--xupdate_result
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test05_1.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test05_2.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test05_result
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test06_--xupdate_result
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test06_1.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test06_2.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test06_result
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test07_--xupdate_result
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test07_1.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test07_2.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test07_result
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test08_--xupdate_result
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test08_1.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test08_2.xml
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/data/test08_result
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/regrtest.py
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/regrtest.pyc
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/runtests.py
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/runtests.pyc
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/unittest_difflib.py
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/unittest_difflib.pyc
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/unittest_options.py
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/unittest_options.pyc
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/unittest_parser.py
> -lib/python${MODPY_VERSION}/site-packages/xmldiff/test/unittest_parser.pyc
> -share/sgml/
> -share/sgml/stylesheet/
> -share/sgml/stylesheet/xmldiff/
> -share/sgml/stylesheet/xmldiff/docbook_rev.xsl
> -share/sgml/stylesheet/xmldiff/xmlrev.xslt
> +lib/python${MODPY_VERSION}/site-packages/xmldiff/patch.py
> +lib/python${MODPY_VERSION}/site-packages/xmldiff/utils.py
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.777
> diff -u -p -r1.777 Makefile
> --- Makefile 12 Aug 2019 15:21:30 -0000 1.777
> +++ Makefile 13 Aug 2019 01:01:54 -0000
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
>  DISTFILES =
>  
>  # API.rev
> -PKGNAME = quirks-3.168
> +PKGNAME = quirks-3.169
>  PKG_ARCH = *
>  MAINTAINER = Marc Espie <[hidden email]>
>  
> Index: files/Quirks.pm
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.794
> diff -u -p -r1.794 Quirks.pm
> --- files/Quirks.pm 12 Aug 2019 15:21:30 -0000 1.794
> +++ files/Quirks.pm 13 Aug 2019 01:01:54 -0000
> @@ -332,6 +332,7 @@ my $stem_extensions = {
>   'Xonotic-server' => 'xonotic-server',
>   'gettext' => 'gettext-runtime',
>   'kwebapp' => 'openradtool',
> + 'py-xmldiff' => 'py3-xmldiff',
>  };
>  
>  my $obsolete_reason = {
>

Reply | Threaded
Open this post in threaded view
|

Re: Update: textproc/py-xmldiff 0.6.10 -> 2.3

Kurt Mosiejczuk-9
On Tue, Aug 13, 2019 at 03:17:58PM +0100, Stuart Henderson wrote:

> Because the stem changes from py-xmldiff to py3-xmldiff, this will need more
> work in order that the update is picked up.

> Untested but I think it will need

> @conflict py-xmldiff-*
> @pkgpath textproc/py-xmldiff

> If unsure, please test update paths:

> - build new packages for the port itself + devel/quirks, move them to
> a directory on their own e.g. /tmp/test

> - install the old packages (e.g. uninstall the new packages after testing
> and pkg_add the old ones from mirrors)

> - "PKG_PATH=/tmp/test pkg_add -D unsigned -u" and check that the relevant
> package/s were updated (there will be a bunch of "no update for XX" noise
> for unrelated packages on the sytem of course that can be ignored)

That does work. (I did have to install py3-six and py3-lxml first since
they are new dependencies).

Here's the diff. OK to commit?

--Kurt

Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/py-xmldiff/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 13 Aug 2019 13:04:54 -0000 1.9
+++ Makefile 13 Aug 2019 15:28:27 -0000
@@ -6,6 +6,7 @@ MODPY_EGG_VERSION= 2.3
 DISTNAME= xmldiff-${MODPY_EGG_VERSION}
 PKGNAME= py-xmldiff-${MODPY_EGG_VERSION}
 CATEGORIES= textproc
+REVISION= 0
 
 HOMEPAGE= https://github.com/Shoobx/xmldiff
 
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/py-xmldiff/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 13 Aug 2019 13:04:54 -0000 1.2
+++ pkg/PLIST 13 Aug 2019 15:28:27 -0000
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.2 2019/08/13 13:04:54 kmos Exp $
+@conflict py-xmldiff-*
+@pkgpath textproc/py-xmldiff
 bin/xmldiff
 bin/xmlpatch
 lib/python${MODPY_VERSION}/site-packages/xmldiff/

Reply | Threaded
Open this post in threaded view
|

Re: Update: textproc/py-xmldiff 0.6.10 -> 2.3

Stuart Henderson
On 2019/08/13 11:30, Kurt Mosiejczuk wrote:

> On Tue, Aug 13, 2019 at 03:17:58PM +0100, Stuart Henderson wrote:
>
> > Because the stem changes from py-xmldiff to py3-xmldiff, this will need more
> > work in order that the update is picked up.
>
> > Untested but I think it will need
>
> > @conflict py-xmldiff-*
> > @pkgpath textproc/py-xmldiff
>
> > If unsure, please test update paths:
>
> > - build new packages for the port itself + devel/quirks, move them to
> > a directory on their own e.g. /tmp/test
>
> > - install the old packages (e.g. uninstall the new packages after testing
> > and pkg_add the old ones from mirrors)
>
> > - "PKG_PATH=/tmp/test pkg_add -D unsigned -u" and check that the relevant
> > package/s were updated (there will be a bunch of "no update for XX" noise
> > for unrelated packages on the sytem of course that can be ignored)
>
> That does work. (I did have to install py3-six and py3-lxml first since
> they are new dependencies).
>
> Here's the diff. OK to commit?

Thanks, OK.

> --Kurt
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/textproc/py-xmldiff/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile 13 Aug 2019 13:04:54 -0000 1.9
> +++ Makefile 13 Aug 2019 15:28:27 -0000
> @@ -6,6 +6,7 @@ MODPY_EGG_VERSION= 2.3
>  DISTNAME= xmldiff-${MODPY_EGG_VERSION}
>  PKGNAME= py-xmldiff-${MODPY_EGG_VERSION}
>  CATEGORIES= textproc
> +REVISION= 0
>  
>  HOMEPAGE= https://github.com/Shoobx/xmldiff
>  
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/textproc/py-xmldiff/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST 13 Aug 2019 13:04:54 -0000 1.2
> +++ pkg/PLIST 13 Aug 2019 15:28:27 -0000
> @@ -1,4 +1,6 @@
>  @comment $OpenBSD: PLIST,v 1.2 2019/08/13 13:04:54 kmos Exp $
> +@conflict py-xmldiff-*
> +@pkgpath textproc/py-xmldiff
>  bin/xmldiff
>  bin/xmlpatch
>  lib/python${MODPY_VERSION}/site-packages/xmldiff/