Re: update textproc/xml2rfc

Updated based on feedback from sthen@, specifically converting
LIB_DEPENDS into BUILD+RUN depends, and making sure the plist won't be
broken if we bump the REVISION.

OKs?

Jakob: should I keep you as MAINTAINER?

-peter

Index: textproc/xml2rfc/Makefile
===================================================================
RCS file: /cvs/openbsd/ports/textproc/xml2rfc/Makefile,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 Makefile
--- textproc/xml2rfc/Makefile 10 Aug 2014 09:58:06 -0000 1.38
+++ textproc/xml2rfc/Makefile 30 Apr 2017 13:10:29 -0000
@@ -2,31 +2,22 @@

COMMENT= convert memos written in XML to the RFC format

-DISTNAME= xml2rfc-1.36
+MODPY_EGG_VERSION = 2.5.2
+DISTNAME= xml2rfc-${MODPY_EGG_VERSION}
CATEGORIES= textproc

-EXTRACT_SUFX= .tgz
-MASTER_SITES= http://xml.resource.org/authoring/
-HOMEPAGE= http://xml.resource.org/
-
MAINTAINER= Jakob Schlyter <jakob@openbsd.org>

# BSD
PERMIT_PACKAGE_CDROM= Yes

-MODULES+= x11/tk
-RUN_DEPENDS+= ${MODTK_RUN_DEPENDS}
-NO_BUILD= Yes
-NO_TEST= Yes
-PKG_ARCH= *
+MASTER_SITES = ${MASTER_SITE_PYPI:=x/xml2rfc/}
+
+MODULES = lang/python
+MODPY_SETUPTOOLS = Yes

-do-install:
- @${SUBST_PROGRAM} ${FILESDIR}/xml2rfc ${PREFIX}/bin/xml2rfc
- @${INSTALL_DATA_DIR} ${PREFIX}/share/xml2rfc
- @${INSTALL_DATA} ${WRKSRC}/xml2rfc.tcl ${PREFIX}/share/xml2rfc
- @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xml2rfc
-.for file in *.html *.txt *.xml *.dtd *.xsd *.rnc
- @${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/xml2rfc
-.endfor
+RUN_DEPENDS = textproc/py-lxml${MODPY_FLAVOR} \
+ www/py-requests${MODPY_FLAVOR}
+BUILD_DEPENDS += ${RUN_DEPENDS}

.include <bsd.port.mk>
Index: textproc/xml2rfc/distinfo
===================================================================
RCS file: /cvs/openbsd/ports/textproc/xml2rfc/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- textproc/xml2rfc/distinfo 7 Feb 2013 14:21:04 -0000 1.10
+++ textproc/xml2rfc/distinfo 1 Dec 2016 21:53:46 -0000
@@ -1,2 +1,2 @@
-SHA256 (xml2rfc-1.36.tgz) = 6xxZWX/LQFdb9W4tBOHI1+Gz6WXDLiCAE1TXQE4fJww=
-SIZE (xml2rfc-1.36.tgz) = 1525517
+SHA256 (xml2rfc-2.5.2.tar.gz) = pyg1cof39iovnxaS0DGAMN8w+2u0673BMDrY8QFnrsQ=
+SIZE (xml2rfc-2.5.2.tar.gz) = 1091059
Index: textproc/xml2rfc/files/xml2rfc
===================================================================
RCS file: textproc/xml2rfc/files/xml2rfc
diff -N textproc/xml2rfc/files/xml2rfc
--- textproc/xml2rfc/files/xml2rfc 16 Jan 2013 20:25:30 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# $Id: xml2rfc,v 1.5 2013/01/16 20:25:30 sthen Exp $
-
-wish=${MODTK_BIN}
-tclsh=${MODTCL_BIN}
-xml2rfc=${TRUEPREFIX}/share/xml2rfc/xml2rfc.tcl
-
-if [ $# -gt 0 ]; then
- exec $tclsh $xml2rfc xml2rfc $@
-else
- exec $wish $xml2rfc
-fi
Index: textproc/xml2rfc/pkg/PLIST
===================================================================
RCS file: /cvs/openbsd/ports/textproc/xml2rfc/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 PLIST
--- textproc/xml2rfc/pkg/PLIST 7 Feb 2013 14:21:04 -0000 1.11
+++ textproc/xml2rfc/pkg/PLIST 30 Apr 2017 13:09:32 -0000
@@ -1,22 +1,43 @@
@comment $OpenBSD: PLIST,v 1.11 2013/02/07 14:21:04 stu Exp $
@pkgpath textproc/xml2rfc,no_x11
bin/xml2rfc
-share/doc/xml2rfc/
-share/doc/xml2rfc/README.html
-share/doc/xml2rfc/README.txt
-share/doc/xml2rfc/README.xml
-share/doc/xml2rfc/draft-mrose-writing-rfcs.html
-share/doc/xml2rfc/draft-mrose-writing-rfcs.txt
-share/doc/xml2rfc/example.html
-share/doc/xml2rfc/example.txt
-share/doc/xml2rfc/example.xml
-share/doc/xml2rfc/rfc2629.dtd
-share/doc/xml2rfc/rfc2629.html
-share/doc/xml2rfc/rfc2629.rnc
-share/doc/xml2rfc/rfc2629.xml
-share/doc/xml2rfc/rfc2629.xsd
-share/doc/xml2rfc/test.txt
-share/doc/xml2rfc/test.xml
-share/doc/xml2rfc/xml.xsd
-share/xml2rfc/
-share/xml2rfc/xml2rfc.tcl
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/
+lib/python${MODPY_VERSION}/site-packages/xml2rfc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/xml2rfc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/xml2rfc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/xml2rfc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/xml2rfc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/xml2rfc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/xml2rfc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/xml2rfc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/__init__.py
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/log.py
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/log.pyc
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/parser.py
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/parser.pyc
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/run.py
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/run.pyc
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/templates/
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/templates/address_card.html
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/templates/base.html
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/templates/rfc2629-other.ent
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/templates/rfc2629-xhtml.ent
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/templates/rfc2629.dtd
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/utils.py
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/utils.pyc
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/writers/
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/writers/__init__.py
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/writers/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/writers/base.py
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/writers/base.pyc
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/writers/expanded_xml.py
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/writers/expanded_xml.pyc
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/writers/html.py
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/writers/html.pyc
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/writers/nroff.py
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/writers/nroff.pyc
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/writers/paginated_txt.py
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/writers/paginated_txt.pyc
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/writers/raw_txt.py
+lib/python${MODPY_VERSION}/site-packages/xml2rfc/writers/raw_txt.pyc




On 2016 Dec 01 (Thu) at 23:09:52 +0100 (+0100), Peter Hessler wrote:
:The IETF expects RFCs to be originally written in an XML format, then
:coverted to all of the different forms that we know. They now require
:version 2 of the tool, so I updated our port.
:
:Looks like they re-wrote it all, so no more tk/tcl and it is now in
:python.
:
:OK?
:

--
Yes, but every time I try to see things your way, I get a headache.