From owner-svn-ports-all@freebsd.org  Sun Sep  6 15:35:54 2020
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9C9303D4727;
 Sun,  6 Sep 2020 15:35:54 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4BkwVJ00ghz42mv;
 Sun,  6 Sep 2020 15:35:51 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4DEE510A45;
 Sun,  6 Sep 2020 15:35:51 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 086FZpS0082002;
 Sun, 6 Sep 2020 15:35:51 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 086FZoP2082000;
 Sun, 6 Sep 2020 15:35:50 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <202009061535.086FZoP2082000@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to
 sunpoet@FreeBSD.org using -f
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sun, 6 Sep 2020 15:35:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r547804 - in head/textproc/asciidoc: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: sunpoet
X-SVN-Commit-Paths: in head/textproc/asciidoc: . files
X-SVN-Commit-Revision: 547804
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Sep 2020 15:35:54 -0000

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'