From f29d569cd33a73da5ad675f43a34ad53c5cc9bc6 Mon Sep 17 00:00:00 2001
From: davidovski <david@davidovski.xyz>
Date: Thu, 2 Feb 2023 14:10:02 +0000
Subject: Work

---
 .../01_fix_static_datadir_evaluation.patch         | 19 -----
 ...418703_dont_use_abbreviated_sfnet_address.patch | 27 -------
 ...3_fix_420153_filename_whitespace_handling.patch | 43 -----------
 ...ix_442782_preprocessor_declaration_syntax.patch | 90 ----------------------
 .../05_fix_439214_error_on_missing_refentry.patch  | 33 --------
 repo/docbook2x/06_fix_man_typo.patch               | 24 ------
 repo/docbook2x/docbook2x.xibuild                   | 39 ----------
 7 files changed, 275 deletions(-)
 delete mode 100644 repo/docbook2x/01_fix_static_datadir_evaluation.patch
 delete mode 100644 repo/docbook2x/02_fix_418703_dont_use_abbreviated_sfnet_address.patch
 delete mode 100644 repo/docbook2x/03_fix_420153_filename_whitespace_handling.patch
 delete mode 100644 repo/docbook2x/04_fix_442782_preprocessor_declaration_syntax.patch
 delete mode 100644 repo/docbook2x/05_fix_439214_error_on_missing_refentry.patch
 delete mode 100644 repo/docbook2x/06_fix_man_typo.patch
 delete mode 100644 repo/docbook2x/docbook2x.xibuild

(limited to 'repo/docbook2x')

diff --git a/repo/docbook2x/01_fix_static_datadir_evaluation.patch b/repo/docbook2x/01_fix_static_datadir_evaluation.patch
deleted file mode 100644
index 5241dc3..0000000
--- a/repo/docbook2x/01_fix_static_datadir_evaluation.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description:
- 01_fix_static_datadir_evaluation.dpatch by Daniel Leidert (dale) <daniel.leidert@wgdd.de>
- All lines beginning with `## DP:' are a description of the patch.
- The evaluation of datadir results in "${prefix}/share" without
- evaluation of the ${prefix} variable with autoconf 2.60.
-
-Index: docbook2X-0.8.8/configure.ac
-===================================================================
---- docbook2X-0.8.8.orig/configure.ac
-+++ docbook2X-0.8.8/configure.ac
-@@ -148,7 +148,7 @@
- dnl they will reside and should use these static_* values.
- dnl Ensure that all static_* are fully expanded.
- 
--eval static_datadir="$datadir"
-+eval eval static_datadir="$datadir"
- 
- eval static_bindir="$bindir"
- old_val=""
diff --git a/repo/docbook2x/02_fix_418703_dont_use_abbreviated_sfnet_address.patch b/repo/docbook2x/02_fix_418703_dont_use_abbreviated_sfnet_address.patch
deleted file mode 100644
index 681047a..0000000
--- a/repo/docbook2x/02_fix_418703_dont_use_abbreviated_sfnet_address.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_418703_dont_use_abbreviated_sfnet_address.dpatch by Daniel Leidert (dale) <daniel.leidert@wgdd.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Ondrej Certik reported a resolver issue: http://bugs.debian.org/418703.
-## DP: The error seems to be caused by using the abbreviated sf.net URLs. But
-## DP: it is possible, that this issue only occurs together with the issue
-## DP: described in 01_fix_static_datadir_evaluation.dpatch, because the path
-## DP: to the catalog also suffers from this issue.
-
-@DPATCH@
-diff -urNad docbook2x-0.8.8~/perl/db2x_xsltproc.pl docbook2x-0.8.8/perl/db2x_xsltproc.pl
---- docbook2x-0.8.8~/perl/db2x_xsltproc.pl	2004-08-18 16:21:52.000000000 +0200
-+++ docbook2x-0.8.8/perl/db2x_xsltproc.pl	2007-04-12 16:07:20.000000000 +0200
-@@ -110,10 +110,10 @@
-     
-     if($options->{'stylesheet'} eq 'texi') {
-         $options->{'stylesheet'} = 
--            "http://docbook2x.sf.net/latest/xslt/texi/docbook.xsl";
-+            "http://docbook2x.sourceforge.net/latest/xslt/texi/docbook.xsl";
-     } elsif($options->{'stylesheet'} eq 'man') {
-         $options->{'stylesheet'} = 
--            "http://docbook2x.sf.net/latest/xslt/man/docbook.xsl";
-+            "http://docbook2x.sourceforge.net/latest/xslt/man/docbook.xsl";
-     }
- 
-     if(scalar(@argv) != 1) {
diff --git a/repo/docbook2x/03_fix_420153_filename_whitespace_handling.patch b/repo/docbook2x/03_fix_420153_filename_whitespace_handling.patch
deleted file mode 100644
index 26cdf8e..0000000
--- a/repo/docbook2x/03_fix_420153_filename_whitespace_handling.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_fix_420153_filename_whitespace_handling.dpatch by
-##     Daniel Leidert (dale) <daniel.leidert@wgdd.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Peter Eisentraut reported a regression in the whitespace handling of
-## DP: refentrytitle content during filename creation:
-## DP: http://bugs.debian.org/420153. The problem is, that upstream first
-## DP: replaces all spaces (but not linebreaks btw) with underlines and then
-## DP: it tries to normalize the result. This means, that a linebreak with
-## DP: additional whitespaces results in manpage names like 'foo_ ____bar.9'.
-## DP: So what we basically do in this patch is, that we first normalize the
-## DP: refentrytitle and then replace any spaces left with underlines.
-
-@DPATCH@
-diff -urNad docbook2x-0.8.8~/xslt/man/manpage.xsl docbook2x-0.8.8/xslt/man/manpage.xsl
---- docbook2x-0.8.8~/xslt/man/manpage.xsl	2006-04-20 15:45:55.000000000 +0200
-+++ docbook2x-0.8.8/xslt/man/manpage.xsl	2007-04-20 16:19:28.000000000 +0200
-@@ -30,7 +30,7 @@
- 
- <xsl:template name="manpage-filename">
-   <xsl:param name="filename" />
--  <xsl:value-of select="normalize-space(translate($filename, &quot; /&quot;, &quot;__&quot;))" />
-+  <xsl:value-of select="translate(normalize-space($filename), ' /', '__')" />
- </xsl:template>
- 
- 
-diff -urNad docbook2x-0.8.8~/xslt/man/refentry.xsl docbook2x-0.8.8/xslt/man/refentry.xsl
---- docbook2x-0.8.8~/xslt/man/refentry.xsl	2006-04-21 04:39:55.000000000 +0200
-+++ docbook2x-0.8.8/xslt/man/refentry.xsl	2007-04-20 16:21:53.000000000 +0200
-@@ -38,7 +38,11 @@
- <xsl:template name="refentry-filename">
-   <xsl:param name="title" />
- 
--  <xsl:variable name="title2" select="translate($title, &quot; /&quot;, &quot;__&quot;)" />
-+  <xsl:variable name="title2">
-+    <xsl:call-template name="manpage-filename">
-+      <xsl:with-param name="filename" select="$title" />
-+    </xsl:call-template>
-+  </xsl:variable>
- 
-   <!-- not using gentext here since man page names tend not to have
-        accented chars / non-Latin chars ...
diff --git a/repo/docbook2x/04_fix_442782_preprocessor_declaration_syntax.patch b/repo/docbook2x/04_fix_442782_preprocessor_declaration_syntax.patch
deleted file mode 100644
index b6ddbfa..0000000
--- a/repo/docbook2x/04_fix_442782_preprocessor_declaration_syntax.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_fix_442782_preprocessor_declaration_syntax.dpatch by Colin Watson <cjwatson@debian.org>.
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Conventionally, preprocessor declarations should start with
-## DP:       '\"
-## DP:   rather than
-## DP:       .\"
-## DP:   Current man-db only supports the first (and recommended) syntax. So
-## DP:   Colin Watson provided this patch to fix docbook2x.
-## DP:
-## DP: <URL:http://bugs.debian.org/442782>
-## DP: <URL:http://lists.gnu.org/archive/html/groff/2007-11/msg00023.html>
-
-@DPATCH@
-diff -urNad trunk~/perl/db2x_manxml.pl trunk/perl/db2x_manxml.pl
---- trunk~/perl/db2x_manxml.pl	2006-04-22 17:21:32.000000000 +0200
-+++ trunk/perl/db2x_manxml.pl	2007-11-24 01:27:37.000000000 +0100
-@@ -342,6 +342,25 @@
-     $self->{line_start} = 1;
- }
- 
-+#
-+# Print a comment in the output, without causing a break.
-+# Params: comment - the comment text.  
-+#                   May use any characters; they need not be escaped.
-+#
-+sub comment_nobreak
-+{
-+    my ($self, $comment) = @_;
-+    $self->write("\n") unless $self->{line_start};
-+
-+    foreach my $line (split(/\n/, $comment)) {
-+        $self->write('\'\" ');
-+        $self->write($line);
-+        $self->write("\n");
-+    }
-+
-+    $self->{line_start} = 1;
-+}
-+
- 
- #
- # Use a roff "escape" i.e. commands embedded in text starting with \
-@@ -510,16 +529,20 @@
- 
-     $self->{'adjust-stack'} = [ 'b' ];
- 
--    $self->{rw}->comment($elem->attr('preprocessors'))
--        if($elem->attr('preprocessors') ne '');
--
-+    my $preprocessors = $elem->attr('preprocessors');
-     # I've dug through the Internet to see if there was any
-     # standard way to specify encoding with man pages.
-     # The following seems to be a reasonable proposal:
-     # <URL:http://mail.nl.linux.org/linux-utf8/2001-04/msg00168.html>
-     my $encoding = $self->{options}->{'encoding'};
-     $encoding =~ s#//TRANSLIT$##i;
--    $self->{rw}->comment("-*- coding: $encoding -*-");
-+    $encoding = "-*- coding: $encoding -*-";
-+    if ($preprocessors eq '') {
-+        $preprocessors = $encoding;
-+    } else {
-+        $preprocessors = "$preprocessors $encoding";
-+    }
-+    $self->{rw}->comment_nobreak($preprocessors);
-     
-     # Define escapes for switching to and from monospace fonts (groff only)
-     $self->{rw}->request(qw{ .if \n(.g .ds T< \\\\FC});
-diff -urNad trunk~/xslt/backend/db2x_manxml.xsl trunk/xslt/backend/db2x_manxml.xsl
---- trunk~/xslt/backend/db2x_manxml.xsl	2006-04-23 16:44:52.000000000 +0200
-+++ trunk/xslt/backend/db2x_manxml.xsl	2007-11-24 01:27:37.000000000 +0100
-@@ -528,7 +528,7 @@
-       <exslt:document method="text" 
-                       encoding="{$encoding}" 
-                       href="{$path}">
--        <xsl:text>.\" -*- coding: </xsl:text>
-+        <xsl:text>'\" -*- coding: </xsl:text>
-         <xsl:value-of select="$encoding" />
-         <xsl:text> -*-&#10;</xsl:text>
-         <xsl:copy-of select="$content" />
-@@ -538,7 +538,7 @@
-       <saxon:output method="text" 
-                     encoding="{$encoding}" 
-                     href="{$path}">
--        <xsl:text>.\" -*- coding: </xsl:text>
-+        <xsl:text>'\" -*- coding: </xsl:text>
-         <xsl:value-of select="$encoding" />
-         <xsl:text> -*-&#10;</xsl:text>
-         <xsl:copy-of select="$content" />
diff --git a/repo/docbook2x/05_fix_439214_error_on_missing_refentry.patch b/repo/docbook2x/05_fix_439214_error_on_missing_refentry.patch
deleted file mode 100644
index b8a493b..0000000
--- a/repo/docbook2x/05_fix_439214_error_on_missing_refentry.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_fix_439214_error_on_missing_refentry.dpatch by Daniel Leidert <daniel.leidert@wgdd.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: If there is no refentry element, the manpage stylesheets silently
-## DP:   "ignores" this. It has been requested to print at least a
-## DP:   warning.
-## DP:
-## DP: <URL:http://bugs.debian.org/439214>
-## DP: <URL:http://lists.gnu.org/archive/html/groff/2007-11/msg00023.html>
-
-@DPATCH@
-diff -urNad trunk~/xslt/man/docbook.xsl trunk/xslt/man/docbook.xsl
---- trunk~/xslt/man/docbook.xsl	2006-04-11 21:00:19.000000000 +0200
-+++ trunk/xslt/man/docbook.xsl	2008-02-05 03:31:48.000000000 +0100
-@@ -111,11 +111,15 @@
-     <xsl:when test="child::refentry">
-       <xsl:apply-templates />
-     </xsl:when>
--
--    <xsl:otherwise>
-+    <xsl:when test="descendant-or-self::refentry">
-       <manpageset>
-         <xsl:apply-templates select="descendant-or-self::refentry" />
-       </manpageset>
-+    </xsl:when>
-+    <xsl:otherwise>
-+      <xsl:message terminate="no">
-+        <xsl:text>WARNING: Sorry, but I cannot find a refentry element in your source!</xsl:text>
-+      </xsl:message>
-     </xsl:otherwise>
-   </xsl:choose>
- </xsl:template>
diff --git a/repo/docbook2x/06_fix_man_typo.patch b/repo/docbook2x/06_fix_man_typo.patch
deleted file mode 100644
index 5be21bd..0000000
--- a/repo/docbook2x/06_fix_man_typo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-
---- docbook2x-0.8.8.orig/doc/docbook2man.1
-+++ docbook2x-0.8.8/doc/docbook2man.1
-@@ -187,7 +187,7 @@ parameter instead.
- 
- However, inside a custom stylesheet 
- (\fInot on the command-line\fR)
--this paramter can be set to the XPath expression
-+this parameter can be set to the XPath expression
- \*(T<document('')\*(T>,
- which will cause the custom translations 
- directly embedded inside the custom stylesheet to be read.
---- docbook2x-0.8.8.orig/doc/docbook2texi.1
-+++ docbook2x-0.8.8/doc/docbook2texi.1
-@@ -230,7 +230,7 @@ parameter instead.
- 
- However, inside a custom stylesheet 
- (\fInot on the command-line\fR)
--this paramter can be set to the XPath expression
-+this parameter can be set to the XPath expression
- \*(T<document('')\*(T>,
- which will cause the custom translations 
- directly embedded inside the custom stylesheet to be read.
diff --git a/repo/docbook2x/docbook2x.xibuild b/repo/docbook2x/docbook2x.xibuild
deleted file mode 100644
index 22a1f11..0000000
--- a/repo/docbook2x/docbook2x.xibuild
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-NAME="docbook2x"
-DESC="DocBook converter to UNIX manpage and GNU Texinfo format"
-
-MAKEDEPS="autoconf automake perl-xml-sax"
-
-PKG_VER=0.8.8
-SOURCE="https://downloads.sourceforge.net/docbook2x/docbook2X-$PKG_VER.tar.gz"
-
-ADDITIONAL="
-01_fix_static_datadir_evaluation.patch
-02_fix_418703_dont_use_abbreviated_sfnet_address.patch
-03_fix_420153_filename_whitespace_handling.patch
-04_fix_442782_preprocessor_declaration_syntax.patch
-05_fix_439214_error_on_missing_refentry.patch
-06_fix_man_typo.patch
-"
-
-prepare() {
-    apply_patches
-	autoreconf --install
-}
-
-build() {
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--program-transform-name 's/docbook2/docbook2x-/' \
-	make
-}
-
-package() {
-	make DESTDIR="$PKG_DEST" install || return 1
-}
-
-- 
cgit v1.2.1