update doclifter to 2.19 and switch to python3

This commit is contained in:
daniel 2021-03-07 21:09:06 +00:00
parent e3b81429a8
commit b9994f5efa
3 changed files with 16 additions and 15 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2021/02/23 19:39:44 sthen Exp $
# $OpenBSD: Makefile,v 1.6 2021/03/07 21:09:06 daniel Exp $
COMMENT = troff to DocBook converter
DISTNAME = doclifter-2.17
DISTNAME = doclifter-2.19
CATEGORIES = textproc
@ -14,7 +14,7 @@ PERMIT_PACKAGE = Yes
MASTER_SITES = http://www.catb.org/~esr/doclifter/
MODULES = lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
MODPY_BUILDDEP = No
MODPY_ADJ_FILES = doclifter manlifter

View File

@ -1,2 +1,2 @@
SHA256 (doclifter-2.17.tar.gz) = u0405f2hv1rXGA67AzIJCrTIMwv1TIITrexzRJd0HtU=
SIZE (doclifter-2.17.tar.gz) = 355349
SHA256 (doclifter-2.19.tar.gz) = Qgu5JHFpo/SdUPTjJCvj+/u9fMGBVB2n4DNn2er5Rqs=
SIZE (doclifter-2.19.tar.gz) = 361031

View File

@ -1,12 +1,13 @@
$OpenBSD: patch-manlifter,v 1.2 2015/06/02 17:02:09 ajacoutot Exp $
--- manlifter.orig Thu Apr 2 14:46:23 2015
+++ manlifter Tue Jun 2 19:01:14 2015
@@ -70,7 +70,7 @@ def fetch_page(file, localcopy, patch):
$OpenBSD: patch-manlifter,v 1.3 2021/03/07 21:09:06 daniel Exp $
Index: manlifter
--- manlifter.orig
+++ manlifter
@@ -88,7 +88,7 @@ def fetch_page(file, localcopy, patch):
return (1, output + "manlifter: copy failed, status %d", cstat)
if os.path.exists(patch):
here = os.getcwd()
os.chdir(outdir)
- patch = commands.getoutput("patch --version-control=never <%s" % (patch,))
+ patch = commands.getoutput("patch <%s" % (patch,))
stem = os.path.basename(localcopy)
os.system("rm -f %s.orig %s.rej" % (stem, stem))
os.chdir(here)
- patch = getoutput("patch -d%s --version-control=never <%s" % (outdir, patch,))
+ patch = getoutput("patch -d%s <%s" % (outdir, patch,))
os.system("rm -f %s/%s.orig %s/%s.rej" % (outdir, stem, outdir, stem))
if patch:
output += patch + "\n"