From owner-svn-doc-projects@FreeBSD.ORG  Sun Feb  3 21:28:24 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id F348D9D6;
 Sun,  3 Feb 2013 21:28:23 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E5E3EAE6;
 Sun,  3 Feb 2013 21:28:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r13LSNRw048200;
 Sun, 3 Feb 2013 21:28:23 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r13LSNJW048199;
 Sun, 3 Feb 2013 21:28:23 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201302032128.r13LSNJW048199@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 3 Feb 2013 21:28:23 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r40878 - projects/xml-tools/share/mk
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Feb 2013 21:28:24 -0000

Author: gabor
Date: Sun Feb  3 21:28:23 2013
New Revision: 40878
URL: http://svnweb.freebsd.org/changeset/doc/40878

Log:
  - Include command macros
  - Drop some obsolete SGML constructs

Modified:
  projects/xml-tools/share/mk/web.site.mk

Modified: projects/xml-tools/share/mk/web.site.mk
==============================================================================
--- projects/xml-tools/share/mk/web.site.mk	Sun Feb  3 21:11:22 2013	(r40877)
+++ projects/xml-tools/share/mk/web.site.mk	Sun Feb  3 21:28:23 2013	(r40878)
@@ -11,6 +11,8 @@
 # clean -- remove anything generated by processing
 #
 
+.include "doc.commands.mk"
+
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
@@ -94,32 +96,6 @@ NO_SUBDIR=	YES
 .include "${DOC_PREFIX}/share/mk/doc.common.mk"
 .include "${DOC_PREFIX}/share/mk/doc.xml.mk"
 
-_INCLIST=	navibar.ent \
-		navibar.l10n.ent \
-		common.ent \
-		header.ent \
-		header.l10n.ent \
-		iso8879.ent \
-		l10n.ent \
-		release.ent
-_SGML_INCLUDES=	${SGML_INCLUDES}
-
-.for F in ${_INCLIST}
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/${F})
-_SGML_INCLUDES+=${DOC_PREFIX}/${LANGCODE}/share/xml/${F}
-.endif
-.if exists(${DOC_PREFIX}/share/xml/${F})
-_SGML_INCLUDES+=${DOC_PREFIX}/share/xml/${F}
-.endif
-.endfor
-
-CATALOG?=	${PREFIX}/share/xml/html/catalog \
-		${PREFIX}/share/xml/catalog
-.if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/catalog)
-CATALOG+=	${DOC_PREFIX}/${LANGCODE}/share/xml/catalog
-.endif
-CATALOG+=	${DOC_PREFIX}/share/xml/catalog
-
 ##################################################################
 # Transformation rules