Import of pkgsrc-2013Q2

textproc/doclifter/patches/patch-aa

@@ -0,0 +1,46 @@
+$NetBSD: patch-aa,v 1.3 2007/01/15 23:40:46 wiz Exp $
+
+--- manlifter.orig	2006-12-25 07:43:35.000000000 +0000
++++ manlifter
+@@ -316,7 +316,8 @@ def massrun(files, options):
+     signal.signal(signal.SIGUSR2, report)
+     signal.signal(signal.SIGHUP, bailout)
+     signal.signal(signal.SIGINT, bailout)
+-    signal.signal(signal.SIGPWR, bailout)
++    if sys.platform != 'darwin':
++         signal.signal(signal.SIGPWR, bailout)
+     signal.signal(signal.SIGTERM, bailout)
+     print "%Test started", time.ctime(), "\n"
+     try:
+@@ -584,22 +585,17 @@ def doclifter_driver(options, arguments)
+         fp.close()
+ 
+ if __name__ == "__main__":
+-    # Find a copy of doclifter
+-    for pathdir in ["."] + os.environ["PATH"].split(":"):
+-        where = os.path.join(pathdir, "doclifter")
+-        if os.path.exists(where):
+-            break
+-    else:
+-        sys.stderr.write("manlifter: can't find doclifter!\n")
+-        sys.exit(1)
+-    # Import it, so we can modify it while the test is running without
+-    # screwing up the results
++    import imp
++    fp = open('@@BIN_PATH@@/doclifter')
+     try:
+-        os.system("cp %s doclifter_test%s.py" % (where, os.getpid()))
+-        exec 'import doclifter_test%s' % os.getpid()
+-        exec "doclifter=doclifter_test%s" % os.getpid()
++	try:
++	    doclifter = imp.load_module('doclifter', fp, '@@BIN_PATH@@/doclifter', ('.py', 'U', 1))
++	except ImportError:
++	    sys.stderr.write("manlifter: can't find doclifter!")
++	    sys.exit(1)
+     finally:
+-        os.system("rm -f doclifter_test%s.py*" % os.getpid())
++	if fp:
++	    fp.close()
+     # Gather options
+     (options, arguments) = getopt.getopt(sys.argv[1:], "d:ef:hI:p:qs:Sv")
+     # Do the real work

textproc/doclifter/patches/patch-doclifter.1

@@ -0,0 +1,36 @@
+$NetBSD: patch-doclifter.1,v 1.1 2012/03/22 21:43:35 wiz Exp $
+
+Avoid confusion with real macro calls.
+
+--- doclifter.1.orig	2006-12-25 07:43:35.000000000 +0000
++++ doclifter.1
+@@ -102,8 +102,7 @@ Troff and macro\-package special charact
+ .PP
+ When
+ \fBdoclifter\fR
+-encounters a
+-.so
++encounters a .so
+ directive, it searches for the file. If it can get read access to the file, and open it, and the file consists entirely of command lines and comments, then it is included. If any of these conditions fails, an entity reference for it is generated.
+ .PP
+ \fBdoclifter\fR
+@@ -637,8 +636,7 @@ The
+ .nf
+ and
+ .fi
+-macros are interpreted as literal\-layout boundaries. Calls to the
+-.so
++macros are interpreted as literal\-layout boundaries. Calls to the .so
+ macro either cause inclusion or are translated into XML entity inclusions (see above). Calls to the
+ .ul
+ and
+@@ -782,8 +780,7 @@ cannot be certain how subsections should
+ If you're translating a page that uses user\-defined macros and you get bad output, the first thing to do is simplify or eliminate the user\-defined macros. Replace them with stock requests where possible.
+ .SH "RETURN VALUES"
+ .PP
+-On successful completion, the program returns status 0. It returns 1 if some file or standard input could not be translated. It returns 2 if one of the input sources was a
+-.so
++On successful completion, the program returns status 0. It returns 1 if some file or standard input could not be translated. It returns 2 if one of the input sources was a .so
+ inclusion. It returns 3 if there is an error in reading or writing files. It returns 4 to indicate an internal error. It returns 5 when aborted by a keyboard interrupt.
+ .PP
+ Note that a zero return does not guarantee that the output is valid DocBook. It will almost always (as in, more than 96% of cases) be syntactically valid XML, but in some rare cases fixups by hand may be necessary to meet the semantics of the DocBook DTD. Validation problems are most likely to occur with complicated list markup.

textproc/doclifter/patches/patch-manlifter.1

@@ -0,0 +1,16 @@
+$NetBSD: patch-manlifter.1,v 1.1 2012/03/22 21:43:35 wiz Exp $
+
+Avoid confusion with real macro calls.
+
+--- manlifter.1.orig	2006-12-25 07:43:35.000000000 +0000
++++ manlifter.1
+@@ -29,8 +29,7 @@ For each source file examined, if the de
+ \fBmanlifter\fR
+ do the least work needed to keep the target XML tree up to date. Likewise, in \-h mode derived HTML files are only made when necessary.
+ .PP
+-Stub pages that are just
+-.so
++Stub pages that are just .so
+ redirections are translated to corresponding symlinks of XML files (and, with \-h, HTML files).
+ .PP
+ \fBmanlifter\fR