From owner-svn-doc-head@freebsd.org Sat Oct 31 17:45:13 2015 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 62304A21E0C; Sat, 31 Oct 2015 17:45:13 +0000 (UTC) (envelope-from wblock@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 mx1.freebsd.org (Postfix) with ESMTPS id 0FAEB18F7; Sat, 31 Oct 2015 17:45:12 +0000 (UTC) (envelope-from wblock@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9VHjCEc038356; Sat, 31 Oct 2015 17:45:12 GMT (envelope-from wblock@FreeBSD.org) Received: (from wblock@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9VHjCKe038355; Sat, 31 Oct 2015 17:45:12 GMT (envelope-from wblock@FreeBSD.org) Message-Id: <201510311745.t9VHjCKe038355@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wblock set sender to wblock@FreeBSD.org using -f From: Warren Block Date: Sat, 31 Oct 2015 17:45:12 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r47714 - head/share/mk 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.20 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Oct 2015 17:45:13 -0000 Author: wblock Date: Sat Oct 31 17:45:11 2015 New Revision: 47714 URL: https://svnweb.freebsd.org/changeset/doc/47714 Log: Use the English catalog files to avoid problems with pre-translated entities. Tested by rene@ and RayCherng Yu . Well, and me, obviously. Reviewed by: rene Modified: head/share/mk/doc.docbook.mk Modified: head/share/mk/doc.docbook.mk ============================================================================== --- head/share/mk/doc.docbook.mk Sat Oct 31 12:08:21 2015 (r47713) +++ head/share/mk/doc.docbook.mk Sat Oct 31 17:45:11 2015 (r47714) @@ -278,9 +278,17 @@ TRAN_DIR?= ${MASTERDOC:H} EN_DIR?= ${TRAN_DIR:S/${LANGCODE}/en_US.ISO8859-1/} PO_LANG?= ${LANGCODE:C/\..*$//} PO_CHARSET?= ${LANGCODE:tl:C/^.*\.//:S/^iso/iso-/:S/utf-8/UTF-8/} -EN_XMLLINT?= ${XMLLINT:S/${PO_LANG}/en_US/g} CLEANFILES+= ${DOC}.translate.xml ${PO_LANG}.mo +PO_CATALOG_FILES= file://${EN_DIR}/catalog-cwd.xml \ + file://${EN_DIR:H:H}/share/xml/catalog.xml \ + file://${DOC_PREFIX}/share/xml/catalog.xml \ + file://${LOCALBASE}/share/xml/catalog +.if defined(EXTRA_CATALOGS) +PO_CATALOG_FILES+= ${EXTRA_CATALOGS} +.endif +PO_XMLLINT= env XML_CATALOG_FILES="${PO_CATALOG_FILES}" ${PREFIX}/bin/xmllint + # fix settings in PO file POSET_CMD= ${SED} -i '' -e '1s,^,\#$$FreeBSD$$\${.newline},' \ -e 's,^\(\"Language-Team:.*\\n\"\),\1\${.newline}\"Language: ${PO_LANG}\\n\",' \ @@ -297,9 +305,9 @@ ${DOC}.translate.xml: ${EN_SRCS} exit 1 ; \ fi # normalize the English original into a single file - @${EN_XMLLINT} --nonet --noent --valid --xinclude ${MASTERDOC_EN} > ${.TARGET}.tmp + @${PO_XMLLINT} --nonet --noent --valid --xinclude ${MASTERDOC_EN} > ${.TARGET}.tmp # remove redundant namespace attributes - @${EN_XMLLINT} --nsclean ${.TARGET}.tmp > ${.TARGET} + @${PO_XMLLINT} --nsclean ${.TARGET}.tmp > ${.TARGET} @${RM} ${.TARGET}.tmp po: ${PO_LANG}.po