svn commit: r547804 - in head/textproc/asciidoc: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sun Sep  6 15:35:50 2020
New Revision: 547804
URL: https://svnweb.freebsd.org/changeset/ports/547804

Log:
  Avoid using /usr/local directly and stop false alarm in stage-qa:
  
  ====> Running Q/A tests (stage-qa)
  Warning: Possible REINPLACE_CMD issues:
  - - REINPLACE_CMD ran, but did not modify file contents: a2x.py

Modified:
  head/textproc/asciidoc/Makefile
  head/textproc/asciidoc/files/patch-a2x.py

Modified: head/textproc/asciidoc/Makefile
==============================================================================
--- head/textproc/asciidoc/Makefile	Sun Sep  6 15:35:45 2020	(r547803)
+++ head/textproc/asciidoc/Makefile	Sun Sep  6 15:35:50 2020	(r547804)
@@ -25,7 +25,7 @@ SHEBANG_GLOB=	*.py
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|python3 |${PYTHON_CMD} |' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/a2x.py
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/a2x.py
 	@${FIND} ${WRKSRC} -name '*.conf' | ${XARGS} -I % ${LN} % %.sample
 
 post-install:

Modified: head/textproc/asciidoc/files/patch-a2x.py
==============================================================================
--- head/textproc/asciidoc/files/patch-a2x.py	Sun Sep  6 15:35:45 2020	(r547803)
+++ head/textproc/asciidoc/files/patch-a2x.py	Sun Sep  6 15:35:50 2020	(r547804)
@@ -5,7 +5,7 @@
          for attr in self.attributes:
              self.asciidoc_opts += ' --attribute "%s"' % attr
 -#        self.xsltproc_opts += ' --nonet'
-+        self.xsltproc_opts += ' --nonet --path /usr/local/share/xsl/docbook/manpages/'
++        self.xsltproc_opts += ' --nonet --path %%LOCALBASE%%/share/xsl/docbook/manpages/'
          if self.verbose:
              self.asciidoc_opts += ' --verbose'
              self.dblatex_opts += ' -V'