From owner-freebsd-doc@FreeBSD.ORG  Wed Aug 17 10:56:41 2005
Return-Path: <owner-freebsd-doc@FreeBSD.ORG>
X-Original-To: freebsd-doc@FreeBSD.org
Delivered-To: freebsd-doc@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5A1FA16A41F
	for <freebsd-doc@FreeBSD.org>; Wed, 17 Aug 2005 10:56:41 +0000 (GMT)
	(envelope-from pav@FreeBSD.org)
Received: from e0-a11.b1.lan.prg.vol.cz (e0-a11.b1.lan.prg.vol.cz
	[195.122.204.152])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8BE1143D45
	for <freebsd-doc@FreeBSD.org>; Wed, 17 Aug 2005 10:56:40 +0000 (GMT)
	(envelope-from pav@FreeBSD.org)
Received: from pav.hide.vol.cz (localhost [127.0.0.1])
	by e0-a11.b1.lan.prg.vol.cz (8.13.4/8.13.4) with ESMTP id
	j7HAucFR073256
	for <freebsd-doc@FreeBSD.org>; Wed, 17 Aug 2005 12:56:38 +0200 (CEST)
	(envelope-from pav@FreeBSD.org)
Received: (from pav@localhost)
	by pav.hide.vol.cz (8.13.4/8.13.4/Submit) id j7HAucUv073255
	for freebsd-doc@freebsd.org; Wed, 17 Aug 2005 12:56:38 +0200 (CEST)
	(envelope-from pav@FreeBSD.org)
X-Authentication-Warning: pav.hide.vol.cz: pav set sender to pav@FreeBSD.org
	using -f
From: Pav Lucistnik <pav@FreeBSD.org>
To: freebsd-doc@FreeBSD.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-UjkAgP+QMBBa4gYBYf0k"
Date: Wed, 17 Aug 2005 12:56:38 +0200
Message-Id: <1124276198.71805.10.camel@pav.hide.vol.cz>
Mime-Version: 1.0
X-Mailer: Evolution 2.2.3 FreeBSD GNOME Team Port 
Cc: 
Subject: openjade autodetection patch
X-BeenThere: freebsd-doc@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: pav@FreeBSD.org
List-Id: Documentation project <freebsd-doc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
	<mailto:freebsd-doc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-doc>
List-Post: <mailto:freebsd-doc@freebsd.org>
List-Help: <mailto:freebsd-doc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
	<mailto:freebsd-doc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Aug 2005 10:56:41 -0000


--=-UjkAgP+QMBBa4gYBYf0k
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Would anyone object to the attached patch? It automates the task of
setting SGMLNORM to openjade's equivalent for people who can't or don't
want to install jade.

As a side-effect it changes the behaviour for people who have both jade
and openjade installed. Is that a problem?

RCS file: /home/dcvs/www/share/mk/web.site.mk,v
retrieving revision 1.65
diff -a -u -r1.65 web.site.mk
--- web.site.mk 1 Mar 2005 23:04:59 -0000       1.65
+++ web.site.mk 17 Aug 2005 07:26:15 -0000
@@ -50,10 +50,10 @@
 LOCALBASE?=3D	/usr/local
 PREFIX?=3D	${LOCALBASE}

-.if !defined(OPENJADE)
-SGMLNORM?=3D	${PREFIX}/bin/sgmlnorm
-.else
+.if exists(${PREFIX}/bin/osgmlnorm)
 SGMLNORM?=3D	${PREFIX}/bin/osgmlnorm
+.else
+SGMLNORM?=3D	${PREFIX}/bin/sgmlnorm
 .endif
 CATALOG?=3D	${PREFIX}/share/sgml/html/catalog
 SGMLNORMOPTS?=3D	-d ${SGMLNORMFLAGS} -c ${CATALOG} -D ${.CURDIR}


--=20
Pav Lucistnik <pav@oook.cz>
              <pav@FreeBSD.org>

Fufie> snow should be on the tv and in the mountains, not here

--=-UjkAgP+QMBBa4gYBYf0k
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)

iD8DBQBDAxfmntdYP8FOsoIRAqd2AJ0aB6k5RqMuyHvYxUzlOIGFZEjWDwCgvy2D
UVbwuvHMqztTgBbsO46WrZ8=
=H1yL
-----END PGP SIGNATURE-----

--=-UjkAgP+QMBBa4gYBYf0k--