From 61e47211ef72556cdbfb91c96bbcda9e56b2e1d4 Mon Sep 17 00:00:00 2001 From: Jun Kuriyama Date: Wed, 29 Nov 2000 23:57:09 +0000 Subject: [PATCH] Switch web.mk to share/mk/web.site.mk in Spanish version. (with "obj" fixes) Submitted by: nbm --- es/Makefile | 7 +++++-- es/Makefile.inc | 3 ++- es/alpha/Makefile | 7 +++++-- es/copyright/Makefile | 7 +++++-- es/docproj/Makefile | 7 +++++-- es/internal/Makefile | 7 +++++-- es/news/Makefile | 9 ++++----- es/ports/Makefile | 11 +++++++---- es/ports/Makefile.inc0 | 7 +++++-- es/ports/portindex | 2 +- es/projects/Makefile | 7 +++++-- es/releases/1.1.5/Makefile | 3 ++- es/releases/1.1/Makefile | 3 ++- es/releases/2.0.5R/Makefile | 3 ++- es/releases/2.0/Makefile | 3 ++- es/releases/2.1.5R/Makefile | 3 ++- es/releases/2.1.6R/Makefile | 3 ++- es/releases/2.1.7R/Makefile | 3 ++- es/releases/2.1R/Makefile | 3 ++- es/releases/2.2.1R/Makefile | 3 ++- es/releases/2.2.2R/Makefile | 3 ++- es/releases/2.2.5R/Makefile | 3 ++- es/releases/2.2.6R/Makefile | 3 ++- es/releases/2.2.7R/Makefile | 3 ++- es/releases/2.2.8R/Makefile | 3 ++- es/releases/2.2R/Makefile | 3 ++- es/releases/3.0R/Makefile | 3 ++- es/releases/3.1R/Makefile | 3 ++- es/releases/3.2R/Makefile | 3 ++- es/releases/3.3R/Makefile | 3 ++- es/releases/3.4R/Makefile | 3 ++- es/releases/Makefile | 7 +++++-- es/releases/Makefile.inc | 4 ++-- es/search/Makefile | 14 ++++++++------ es/security/Makefile | 7 +++++-- 35 files changed, 109 insertions(+), 57 deletions(-) diff --git a/es/Makefile b/es/Makefile index 965ddca120..bd39395244 100644 --- a/es/Makefile +++ b/es/Makefile @@ -1,8 +1,11 @@ -# $FreeBSD: www/es/Makefile,v 1.7 1999/09/06 07:02:59 peter Exp $ +# $FreeBSD: www/es/Makefile,v 1.8 2000/02/28 12:43:08 phantom Exp $ .if exists(Makefile.conf) .include "Makefile.conf" .endif +.if exists(../Makefile.inc) +.include "../Makefile.inc" +.endif # These are turned into validated, normalized HTML files. @@ -68,5 +71,5 @@ SGMLOPTS+= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr WEBDIR= data/es -.include "web.mk" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/Makefile.inc b/es/Makefile.inc index 3af49d1f5e..5c43ffa85f 100644 --- a/es/Makefile.inc +++ b/es/Makefile.inc @@ -1,3 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: www/es/Makefile.inc,v 1.2 1999/09/06 07:02:59 peter Exp $ WEBBASE?= /data/es +WEB_PREFIX?= ${.CURDIR}/../.. diff --git a/es/alpha/Makefile b/es/alpha/Makefile index 3861e49ce6..ca11c45f4c 100644 --- a/es/alpha/Makefile +++ b/es/alpha/Makefile @@ -1,11 +1,14 @@ -# $FreeBSD$ +# $FreeBSD: www/es/alpha/Makefile,v 1.2 1999/09/06 07:03:01 peter Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" .endif +.if exists(../Makefile.inc) +.include "../Makefile.inc" +.endif DOCS= alpha.sgml INDEXLINK=alpha.html -.include "../web.mk" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/copyright/Makefile b/es/copyright/Makefile index c58931a6bd..53aaffc73c 100644 --- a/es/copyright/Makefile +++ b/es/copyright/Makefile @@ -1,8 +1,11 @@ -# $FreeBSD$ +# $FreeBSD: www/es/copyright/Makefile,v 1.2 1999/09/06 07:03:01 peter Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" .endif +.if exists(../Makefile.inc) +.include "../Makefile.inc" +.endif DOCS= license.sgml DOCS+= freebsd-license.sgml @@ -19,4 +22,4 @@ DATA+= COPYING COPYING.LIB ${LEGAL} #${LEGAL}: $${CVSROOT}/ports/LEGAL,v # co -q -p ${.ALLSRC} > ${.TARGET} -.include "../web.mk" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/docproj/Makefile b/es/docproj/Makefile index 94b946e148..e8c03b13cc 100644 --- a/es/docproj/Makefile +++ b/es/docproj/Makefile @@ -1,8 +1,11 @@ -# $FreeBSD$ +# $FreeBSD: www/es/docproj/Makefile,v 1.2 1999/09/06 07:03:01 peter Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" .endif +.if exists(../Makefile.inc) +.include "../Makefile.inc" +.endif DOCS= current.sgml DOCS+= doc-set.sgml @@ -14,4 +17,4 @@ DOCS+= docproj.sgml INDEXLINK= docproj.html -.include "../web.mk" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/internal/Makefile b/es/internal/Makefile index ba85abe8e6..f65a51074e 100644 --- a/es/internal/Makefile +++ b/es/internal/Makefile @@ -1,8 +1,11 @@ -# $FreeBSD$ +# $FreeBSD: www/es/internal/Makefile,v 1.7 1999/09/06 07:03:02 peter Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" .endif +.if exists(../Makefile.inc) +.include "../Makefile.inc" +.endif DOCS= photos.sgml DOCS+= internal.sgml @@ -16,4 +19,4 @@ INDEXLINK= internal.html DATA+= README.mirror -.include "../web.mk" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/news/Makefile b/es/news/Makefile index e573e06543..ba5c229811 100644 --- a/es/news/Makefile +++ b/es/news/Makefile @@ -1,11 +1,10 @@ -# $FreeBSD$ +# $FreeBSD: www/es/news/Makefile,v 1.5 1999/09/06 07:03:03 peter Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" .endif - -.if exists("../Makefile.conf") -.include "../Makefile.conf" +.if exists(../Makefile.inc) +.include "../Makefile.inc" .endif # quick news letter @@ -33,4 +32,4 @@ DOCS+= press-rel-3.sgml INDEXLINK= news.html -.include "../web.mk" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/ports/Makefile b/es/ports/Makefile index e21092ebbb..c3bd1281d8 100644 --- a/es/ports/Makefile +++ b/es/ports/Makefile @@ -1,8 +1,11 @@ -# $FreeBSD: www/es/ports/Makefile,v 1.6 1999/09/06 07:03:04 peter Exp $ +# $FreeBSD: www/es/ports/Makefile,v 1.7 1999/11/15 20:37:56 jesusr Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" .endif +.if exists(../Makefile.inc) +.include "../Makefile.inc" +.endif .if exists(Makefile.inc) .include "Makefile.inc" .endif @@ -47,11 +50,11 @@ Makefile.gen: index.sgml .NOTMAIN index.sgml: ${INDEX} ${Y2K} packages.exists portindex ports.inc .NOTMAIN rm -f *.sgml - ${PORTINDEX} ${INDEX} ${Y2K} + ${PORTINDEX} ${INDEX} ${Y2K} ${.CURDIR} install: all all install clean: - ${MAKE} ${MAKEFLAGS} -f Makefile.inc0 ${.TARGET} + (cd ${.CURDIR} &&${MAKE} ${MAKEFLAGS} -f ${.CURDIR}/Makefile.inc0 ${.TARGET}) -.include "../web.mk" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/ports/Makefile.inc0 b/es/ports/Makefile.inc0 index bb5bef7054..b89d62774f 100644 --- a/es/ports/Makefile.inc0 +++ b/es/ports/Makefile.inc0 @@ -1,8 +1,11 @@ -# $FreeBSD: www/en/ports/Makefile.inc0,v 1.2 1999/09/06 07:02:48 peter Exp $ +# $FreeBSD: www/es/ports/Makefile.inc0,v 1.1 1999/11/15 20:37:56 jesusr Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" .endif +.if exists(../Makefile.inc) +.include "../Makefile.inc" +.endif .if exists(Makefile.inc) .include "Makefile.inc" @@ -13,4 +16,4 @@ .endif -.include "../web.mk" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/ports/portindex b/es/ports/portindex index 11f2d6fb7e..900f324ac2 100755 --- a/es/ports/portindex +++ b/es/ports/portindex @@ -40,7 +40,7 @@ if ($urlcgi) { $today = &getdate; &packages_exist('packages.exists', *packages); -&category_description('categories', *category_description); +&category_description(($ARGV[2] || '.') . '/categories', *category_description); &y2k_statements; &main; diff --git a/es/projects/Makefile b/es/projects/Makefile index 39c334b8e1..01e0629264 100644 --- a/es/projects/Makefile +++ b/es/projects/Makefile @@ -1,8 +1,11 @@ -# $FreeBSD$ +# $FreeBSD: www/es/projects/Makefile,v 1.2 1999/09/06 07:03:05 peter Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" .endif +.if exists(../Makefile.inc) +.include "../Makefile.inc" +.endif DOCS= projects.sgml DOCS+= mozilla.sgml @@ -10,4 +13,4 @@ DOCS+= newbies.sgml INDEXLINK= projects.html -.include "../web.mk" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/1.1.5/Makefile b/es/releases/1.1.5/Makefile index 1340175acd..765d4f75bb 100644 --- a/es/releases/1.1.5/Makefile +++ b/es/releases/1.1.5/Makefile @@ -3,4 +3,5 @@ DATA+= COPYRIGHT.FreeBSD COPYRIGHT.USL KNOWNBUGS MIRROR.SITES DATA+= PERSONAL.ACKS REGISTER.FreeBSD RELNOTES.FreeBSD ROSTER.FreeBSD DATA+= SUPPORT.TXT TODO-1.1.5 -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/1.1/Makefile b/es/releases/1.1/Makefile index 39794b4e32..789a2ffb7c 100644 --- a/es/releases/1.1/Makefile +++ b/es/releases/1.1/Makefile @@ -1,4 +1,5 @@ DATA= CONTRIB.386BSD CONTRIB.FreeBSD COPYRIGHT.386BSD COPYRIGHT.FreeBSD DATA+= MIRROR.SITES PERSONAL.ACKS RELNOTES.FreeBSD SUPPORT.TXT -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/2.0.5R/Makefile b/es/releases/2.0.5R/Makefile index 517e40e9d3..7f9e4b0871 100644 --- a/es/releases/2.0.5R/Makefile +++ b/es/releases/2.0.5R/Makefile @@ -1,3 +1,4 @@ DOCS= announce.sgml notes.sgml -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/2.0/Makefile b/es/releases/2.0/Makefile index 8955b2ea3e..aa4da665ef 100644 --- a/es/releases/2.0/Makefile +++ b/es/releases/2.0/Makefile @@ -1,4 +1,5 @@ DOCS= announce.sgml credits.sgml install.sgml notes.sgml -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/2.1.5R/Makefile b/es/releases/2.1.5R/Makefile index 517e40e9d3..7f9e4b0871 100644 --- a/es/releases/2.1.5R/Makefile +++ b/es/releases/2.1.5R/Makefile @@ -1,3 +1,4 @@ DOCS= announce.sgml notes.sgml -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/2.1.6R/Makefile b/es/releases/2.1.6R/Makefile index e2e211d24f..d53942ab82 100644 --- a/es/releases/2.1.6R/Makefile +++ b/es/releases/2.1.6R/Makefile @@ -1,3 +1,4 @@ DOCS= announce.sgml notes.sgml security.sgml -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/2.1.7R/Makefile b/es/releases/2.1.7R/Makefile index 517e40e9d3..7f9e4b0871 100644 --- a/es/releases/2.1.7R/Makefile +++ b/es/releases/2.1.7R/Makefile @@ -1,3 +1,4 @@ DOCS= announce.sgml notes.sgml -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/2.1R/Makefile b/es/releases/2.1R/Makefile index 517e40e9d3..7f9e4b0871 100644 --- a/es/releases/2.1R/Makefile +++ b/es/releases/2.1R/Makefile @@ -1,3 +1,4 @@ DOCS= announce.sgml notes.sgml -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/2.2.1R/Makefile b/es/releases/2.2.1R/Makefile index 066f6801e4..2a0c94ae9e 100644 --- a/es/releases/2.2.1R/Makefile +++ b/es/releases/2.2.1R/Makefile @@ -1,3 +1,4 @@ DOCS= notes.sgml -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/2.2.2R/Makefile b/es/releases/2.2.2R/Makefile index b7057cf521..b9a6d3146a 100644 --- a/es/releases/2.2.2R/Makefile +++ b/es/releases/2.2.2R/Makefile @@ -1,3 +1,4 @@ DOCS= notes.sgml errata.sgml -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/2.2.5R/Makefile b/es/releases/2.2.5R/Makefile index 6aaa9ea536..b80fc864f7 100644 --- a/es/releases/2.2.5R/Makefile +++ b/es/releases/2.2.5R/Makefile @@ -1,3 +1,4 @@ DOCS= announce.sgml notes.sgml errata.sgml -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/2.2.6R/Makefile b/es/releases/2.2.6R/Makefile index 6aaa9ea536..b80fc864f7 100644 --- a/es/releases/2.2.6R/Makefile +++ b/es/releases/2.2.6R/Makefile @@ -1,3 +1,4 @@ DOCS= announce.sgml notes.sgml errata.sgml -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/2.2.7R/Makefile b/es/releases/2.2.7R/Makefile index 6aaa9ea536..b80fc864f7 100644 --- a/es/releases/2.2.7R/Makefile +++ b/es/releases/2.2.7R/Makefile @@ -1,3 +1,4 @@ DOCS= announce.sgml notes.sgml errata.sgml -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/2.2.8R/Makefile b/es/releases/2.2.8R/Makefile index 6aaa9ea536..b80fc864f7 100644 --- a/es/releases/2.2.8R/Makefile +++ b/es/releases/2.2.8R/Makefile @@ -1,3 +1,4 @@ DOCS= announce.sgml notes.sgml errata.sgml -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/2.2R/Makefile b/es/releases/2.2R/Makefile index 1ff5ac5fb6..b78e4dc09e 100644 --- a/es/releases/2.2R/Makefile +++ b/es/releases/2.2R/Makefile @@ -1,3 +1,4 @@ DOCS= announce.sgml install-media.sgml notes.sgml -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/3.0R/Makefile b/es/releases/3.0R/Makefile index 6aaa9ea536..b80fc864f7 100644 --- a/es/releases/3.0R/Makefile +++ b/es/releases/3.0R/Makefile @@ -1,3 +1,4 @@ DOCS= announce.sgml notes.sgml errata.sgml -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/3.1R/Makefile b/es/releases/3.1R/Makefile index 6aaa9ea536..b80fc864f7 100644 --- a/es/releases/3.1R/Makefile +++ b/es/releases/3.1R/Makefile @@ -1,3 +1,4 @@ DOCS= announce.sgml notes.sgml errata.sgml -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/3.2R/Makefile b/es/releases/3.2R/Makefile index 6aaa9ea536..b80fc864f7 100644 --- a/es/releases/3.2R/Makefile +++ b/es/releases/3.2R/Makefile @@ -1,3 +1,4 @@ DOCS= announce.sgml notes.sgml errata.sgml -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/3.3R/Makefile b/es/releases/3.3R/Makefile index 6aaa9ea536..b80fc864f7 100644 --- a/es/releases/3.3R/Makefile +++ b/es/releases/3.3R/Makefile @@ -1,3 +1,4 @@ DOCS= announce.sgml notes.sgml errata.sgml -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/3.4R/Makefile b/es/releases/3.4R/Makefile index 6aaa9ea536..b80fc864f7 100644 --- a/es/releases/3.4R/Makefile +++ b/es/releases/3.4R/Makefile @@ -1,3 +1,4 @@ DOCS= announce.sgml notes.sgml errata.sgml -.include "../../web.mk" +.include "../Makefile.inc" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/Makefile b/es/releases/Makefile index 300efb296b..ccede21deb 100644 --- a/es/releases/Makefile +++ b/es/releases/Makefile @@ -1,8 +1,11 @@ -# $FreeBSD: www/es/releases/Makefile,v 1.5 1999/09/27 21:09:59 jesusr Exp $ +# $FreeBSD: www/es/releases/Makefile,v 1.6 1999/12/30 13:44:01 jesusr Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" .endif +.if exists(../Makefile.inc) +.include "../Makefile.inc" +.endif DOCS?= index.sgml snapshots.sgml @@ -14,4 +17,4 @@ SUBDIR+= 3.3R 3.4R SUBDIR= .endif -.include "../web.mk" +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/releases/Makefile.inc b/es/releases/Makefile.inc index d8e9b10827..c992291cd9 100644 --- a/es/releases/Makefile.inc +++ b/es/releases/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: www/es/releases/Makefile.inc,v 1.2 1999/09/06 07:03:05 peter Exp $ WEBBASE?= /data/es/releases - +WEB_PREFIX?= ${.CURDIR}/../../.. diff --git a/es/search/Makefile b/es/search/Makefile index 7064d2fae8..5ed2d06fb9 100644 --- a/es/search/Makefile +++ b/es/search/Makefile @@ -1,8 +1,11 @@ -# $FreeBSD$ +# $FreeBSD: www/es/search/Makefile,v 1.2 1999/09/06 07:03:13 peter Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" .endif +.if exists(../Makefile.inc) +.include "../Makefile.inc" +.endif DOCS+= index-site.sgml DOCS+= search.sgml @@ -13,12 +16,11 @@ INDEXLINK= search.html CLEANFILES+=atoz.sgml site.sgml -index-site.sgml: atoz.sgml site.sgml +index-site.html: atoz.sgml site.sgml atoz.sgml: web.atoz - sort -fu web.atoz | perl atoz.pl > ${.TARGET} + sort -fu ${.ALLSRC} | ${PERL} ${.CURDIR}/atoz.pl > ${.TARGET} site.sgml: site.map - ./site.pl < ${.ALLSRC} > ${.TARGET} - -.include "../web.mk" + ${PERL} ${.CURDIR}/site.pl < ${.ALLSRC} > ${.TARGET} +.include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/es/security/Makefile b/es/security/Makefile index 1feefed238..69fb53679d 100644 --- a/es/security/Makefile +++ b/es/security/Makefile @@ -1,8 +1,11 @@ -# $FreeBSD$ +# $FreeBSD: www/es/security/Makefile,v 1.2 1999/09/06 07:03:14 peter Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" .endif +.if exists(../Makefile.inc) +.include "../Makefile.inc" +.endif DOCS= DOCS+= programmers.sgml @@ -11,4 +14,4 @@ DOCS+= secure.sgml INDEXLINK= security.html -.include "../web.mk" +.include "${WEB_PREFIX}/share/mk/web.site.mk"