Date: Fri, 2 Feb 2001 20:38:38 +0200 From: Neil Blakey-Milner <nbm@mithrandr.moria.org> To: Hiroki Sato <hrs@eos.ocn.ne.jp> Cc: doc@FreeBSD.org Subject: Re: www/ better obj support patch Message-ID: <20010202203838.A22673@rapier.smartspace.co.za> In-Reply-To: <20010203.005416.112626215.hrs@eos.ocn.ne.jp>; from hrs@eos.ocn.ne.jp on Sat, Feb 03, 2001 at 12:54:16AM %2B0900 References: <20010202172839.A14179@rapier.smartspace.co.za> <20010203.005416.112626215.hrs@eos.ocn.ne.jp>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Sat 2001-02-03 (00:54), Hiroki Sato wrote:
> Neil Blakey-Milner <nbm@mithrandr.moria.org> wrote
> in <20010202172839.A14179@rapier.smartspace.co.za>:
>
> nbm> This patch should improve obj support in the web tree - I've tested a
> nbm> full build and install with it, and it produces the expected web site.
> nbm>
> nbm> Any comments/review? (I'll put it in on Monday or so if I don't get anything)
>
> Where is the patch?
Erg, sorry about that, silly me.
Here it is.
Neil
--
Neil Blakey-Milner
nbm@mithrandr.moria.org
[-- Attachment #2 --]
Index: en/copyright/Makefile
===================================================================
RCS file: /home/ncvs/www/en/copyright/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- en/copyright/Makefile 2000/11/07 04:05:13 1.10
+++ en/copyright/Makefile 2001/02/02 14:09:55
@@ -21,7 +21,9 @@
.endif
-DATA+= COPYING COPYING.LIB ${LEGAL}
+DATA+= COPYING COPYING.LIB
+
+_ALLINSTALL=${LEGAL}
# FreeBSD Ports redistribution restrictions
LEGAL= LEGAL
Index: en/ports/Makefile.inc
===================================================================
RCS file: /home/ncvs/www/en/ports/Makefile.inc,v
retrieving revision 1.5
diff -u -r1.5 Makefile.inc
--- en/ports/Makefile.inc 2001/01/04 22:12:42 1.5
+++ en/ports/Makefile.inc 2001/02/02 14:11:17
@@ -13,5 +13,6 @@
cvsindex= $${CVSROOT}/${PINDEX},v
-_ALLINSTALL= packages.exists ${INDEX} categories
+_ALLINSTALL= packages.exists ${INDEX}
+DATA= categories
Index: en/ports/portindex
===================================================================
RCS file: /home/ncvs/www/en/ports/portindex,v
retrieving revision 1.34
diff -u -r1.34 portindex
--- en/ports/portindex 2001/01/01 12:33:23 1.34
+++ en/ports/portindex 2001/02/02 13:34:47
@@ -40,7 +40,7 @@
$today = &getdate;
&packages_exist('packages.exists', *packages);
-&category_description(($ARGV[2] || '.') . '/categories', *category_description);
+&category_description(($ARGV[1] || '.') . '/categories', *category_description);
&main;
sub getdate {
Index: es/Makefile
===================================================================
RCS file: /home/ncvs/www/es/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- es/Makefile 2000/11/29 23:56:55 1.9
+++ es/Makefile 2001/02/02 14:24:18
@@ -30,7 +30,7 @@
# These will be directly installed.
#DATA= COPYING COPYING.LIB README.mirror robots.txt index.html
-DATA= robots.txt index.html
+DATA= robots.txt
# Subdirectories
# SGML
Index: es/ports/portindex
===================================================================
RCS file: /home/ncvs/www/es/ports/portindex,v
retrieving revision 1.6
diff -u -r1.6 portindex
--- es/ports/portindex 2001/01/02 01:49:05 1.6
+++ es/ports/portindex 2001/02/02 13:42:48
@@ -40,7 +40,7 @@
$today = &getdate;
&packages_exist('packages.exists', *packages);
-&category_description(($ARGV[2] || '.') . '/categories', *category_description);
+&category_description(($ARGV[1] || '.') . '/categories', *category_description);
&main;
sub getdate {
Index: ja/ports/portindex
===================================================================
RCS file: /home/ncvs/www/ja/ports/portindex,v
retrieving revision 1.23
diff -u -r1.23 portindex
--- ja/ports/portindex 2001/01/02 02:22:50 1.23
+++ ja/ports/portindex 2001/02/02 13:35:59
@@ -42,7 +42,7 @@
$today = &getdate;
&packages_exist('packages.exists', *packages);
-&category_description(($ARGV[2] || '.') . '/categories', *category_description);
+&category_description(($ARGV[1] || '.') . '/categories', *category_description);
&main;
sub getdate {
Index: ru/Makefile
===================================================================
RCS file: /home/ncvs/www/ru/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- ru/Makefile 2000/12/29 13:37:57 1.16
+++ ru/Makefile 2001/02/02 15:24:46
@@ -33,7 +33,6 @@
# These will be directly installed.
#DATA= COPYING COPYING.LIB README.mirror robots.txt index.html
-DATA= index.html
# Subdirectories
# SGML
Index: ru/ports/portindex
===================================================================
RCS file: /home/ncvs/www/ru/ports/portindex,v
retrieving revision 1.2
diff -u -r1.2 portindex
--- ru/ports/portindex 2000/10/27 12:14:11 1.2
+++ ru/ports/portindex 2001/02/02 13:43:33
@@ -45,7 +45,7 @@
$today = &getdate;
&packages_exist('packages.exists', *packages);
-&category_description(($ARGV[2] || '.') . '/categories', *category_description);
+&category_description(($ARGV[1] || '.') . '/categories', *category_description);
&y2k_statements;
&main;
Index: share/mk/web.site.mk
===================================================================
RCS file: /home/ncvs/www/share/mk/web.site.mk,v
retrieving revision 1.36
diff -u -r1.36 web.site.mk
--- share/mk/web.site.mk 2000/11/22 02:35:42 1.36
+++ share/mk/web.site.mk 2001/02/02 14:09:11
@@ -158,7 +158,7 @@
afterinstall:
.endif
-_ALLINSTALL+= ${GENDOCS} ${DATA} ${LOCAL}
+_ALLINSTALL+= ${GENDOCS} ${LOCAL}
realinstall: ${COOKIE} ${GENDOCS} ${DATA} ${LOCAL} ${CGI} _PROGSUBDIR
.if !empty(_ALLINSTALL)
@@ -171,11 +171,18 @@
(cd ${DOCINSTALLDIR}; ln -s -f ${INDEXLINK} index.html)
.endif
.endif
+.if defined(DATA) && !empty(DATA)
+ @mkdir -p ${DOCINSTALLDIR}
+ for entry in ${DATA}; do \
+ ${INSTALL} ${COPY} -o ${WEBOWN} -g ${WEBGRP} -m ${WEBMODE} \
+ ${INSTALLFLAGS} ${.CURDIR}/$${entry} ${DOCINSTALLDIR}; \
+ done
+.endif
.if defined(CGI) && !empty(CGI)
@mkdir -p ${CGIINSTALLDIR}
for entry in ${CGI}; do \
${INSTALL} ${COPY} -o ${CGIOWN} -g ${CGIGRP} -m ${CGIMODE} \
- ${INSTALLFLAGS} $${entry} ${CGIINSTALLDIR}; \
+ ${INSTALLFLAGS} ${.CURDIR}/$${entry} ${CGIINSTALLDIR}; \
done
.endif
.if defined(DOCSUBDIR) && !empty(DOCSUBDIR)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010202203838.A22673>