From owner-svn-doc-head@FreeBSD.ORG  Fri Oct 17 18:06:06 2014
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 35DCB81A;
 Fri, 17 Oct 2014 18:06:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 089579AD;
 Fri, 17 Oct 2014 18:06:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9HI65Lp087367;
 Fri, 17 Oct 2014 18:06:05 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9HI65Fj087366;
 Fri, 17 Oct 2014 18:06:05 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201410171806.s9HI65Fj087366@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 17 Oct 2014 18:06:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r45846 - head/share/examples
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Oct 2014 18:06:06 -0000

Author: gjb
Date: Fri Oct 17 18:06:05 2014
New Revision: 45846
URL: https://svnweb.freebsd.org/changeset/doc/45846

Log:
  Add a few tweaks to missing-manrefs.sh:
  
   - In build_manpages(), specify -DNO_ROOT to suppress
     false errors when the 'hier' target gets kicked.
  
     While here, create a tgz package containing the
     /usr/share/man and /usr/share/openssl to make it
     easier to refresh the man.cgi backend.
  
   - In add_manref(), work around a recurring issue where
     the add-manref.sh script thinks 'atf-c++-api' is
     a valid entity entry.
  
     Also fix the section ID passed to add-manref.sh,
     which by the looks of it, should have never worked
     in the first place.
  
     Use realpath(1) to when passing the target file,
     manual page, and section to add-manref.sh so using
     '.' to specify the current working directory for
     either the path to src/ or doc/ are valid.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/share/examples/missing-manrefs.sh

Modified: head/share/examples/missing-manrefs.sh
==============================================================================
--- head/share/examples/missing-manrefs.sh	Fri Oct 17 17:56:34 2014	(r45845)
+++ head/share/examples/missing-manrefs.sh	Fri Oct 17 18:06:05 2014	(r45846)
@@ -62,22 +62,29 @@ build_manpages() {
 	make -s -C ${srcs} DESTDIR=${outdir} \
 		SRCCONF=/dev/null __MAKE_CONF=/dev/null \
 		MANOWN=$USER MANGRP=$USER MANMODE=0666 \
-		NO_MLINKS=1 obj hier all-man maninstall
+		NO_MLINKS=1 -DNO_ROOT obj hier all-man maninstall
+	echo "Packaging manual pages..."
+	tar -zcvf ${outdir}.tgz -C ${outdir} \
+		usr/share/man usr/share/openssl
 }
 
 build_cleanup() {
 	make -s -C ${srcs} DESTDIR=${outdir} \
 		SRCCONF=/dev/null __MAKE_CONF=/dev/null \
-		NO_MLINKS=1 cleandir
+		NO_MLINKS=1 -DNO_ROOT cleandir
 }
 
 add_manref() {
 	_man=${_m}
 	_man=$(echo ${_man} | sed -e 's/\./_/g')
+	# Ugly fix to the atf-c++-api manual; I'm still not sure
+	# why add-manref.sh insists the entity should contain the '+'
+	# characters.
+	_man=$(echo ${_man} | sed -e 's/\+\+/../g')
 	_man=${_man%%_[0-9]}
-	_sec=${_man##*_}
-	yes | sh ${docs}/share/examples/add-manref.sh \
-		${docs}/share/xml/man-refs.ent ${_man} ${_sec}
+	_sec=${_m##*.}
+	yes | sh $(realpath ${docs})/share/examples/add-manref.sh \
+		$(realpath ${docs})/share/xml/man-refs.ent ${_man} ${_sec}
 }
 
 main() {
@@ -95,6 +102,7 @@ main() {
 	done
 	build_cleanup
 	rm -vr ${outdir} ${objdir}
+	echo "Packaged manual pages are in: ${outdir}.tgz"
 }
 
 main "$@"