From owner-cvs-doc@FreeBSD.ORG Thu Jul 21 04:04:39 2011 Return-Path: Delivered-To: cvs-doc@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 382771065673; Thu, 21 Jul 2011 04:04:39 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail.vlsi.ee.noda.tus.ac.jp (sekine00.ee.noda.sut.ac.jp [133.31.107.40]) by mx1.freebsd.org (Postfix) with ESMTP id C79488FC15; Thu, 21 Jul 2011 04:04:38 +0000 (UTC) Received: from alph.allbsd.org (p3028-ipbf608funabasi.chiba.ocn.ne.jp [125.175.94.28]) (user=hrs mech=DIGEST-MD5 bits=128) by mail.vlsi.ee.noda.tus.ac.jp (8.14.4/8.14.4) with ESMTP id p6L3WlE4085225 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 21 Jul 2011 12:32:59 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from localhost (localhost [IPv6:::1]) (authenticated bits=0) by alph.allbsd.org (8.14.4/8.14.4) with ESMTP id p6L3WgXC051393; Thu, 21 Jul 2011 12:32:43 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Thu, 21 Jul 2011 12:31:30 +0900 (JST) Message-Id: <20110721.123130.698363444164784046.hrs@allbsd.org> To: shaun@FreeBSD.org From: Hiroki Sato In-Reply-To: <201107202352.p6KNqCkN034366@repoman.freebsd.org> References: <201107202352.p6KNqCkN034366@repoman.freebsd.org> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart0(Thu_Jul_21_12_31_30_2011_292)--" Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.5 (mail.vlsi.ee.noda.tus.ac.jp [133.31.107.40]); Thu, 21 Jul 2011 12:32:59 +0900 (JST) X-Spam-Status: No, score=3.0 required=14.0 tests=BAYES_50, CONTENT_TYPE_PRESENT, QENCPTR2,RCVD_IN_RP_RNBL,SPF_SOFTFAIL,X_MAILER_PRESENT autolearn=no version=3.3.1 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.vlsi.ee.noda.tus.ac.jp Cc: doc-committers@FreeBSD.org, cvs-doc@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: www/en/cgi Makefile www/share/mk web.site.mk X-BeenThere: cvs-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the doc and www trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jul 2011 04:04:39 -0000 ----Security_Multipart0(Thu_Jul_21_12_31_30_2011_292)-- Content-Type: Multipart/Mixed; boundary="--Next_Part(Thu_Jul_21_12_31_30_2011_575)--" Content-Transfer-Encoding: 7bit ----Next_Part(Thu_Jul_21_12_31_30_2011_575)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Shaun Amott wrote in <201107202352.p6KNqCkN034366@repoman.freebsd.org>: sh> shaun 2011-07-20 23:52:12 UTC sh> sh> FreeBSD doc repository (ports committer) sh> sh> Modified files: sh> en/cgi Makefile sh> share/mk web.site.mk sh> Log: sh> Hook up files (Perl modules) for the new query-pr.cgi script. A bit of sh> extra code to handle the fact that the files are in subdirectories was sh> required. sh> sh> Revision Changes Path sh> 1.35 +14 -1 www/en/cgi/Makefile sh> 1.77 +9 -1 www/share/mk/web.site.mk sh> Thank you for updating the CGI script, but I do not think it is a good idea to add CGI_SUB{DIRS,FILES} into web.site.mk. Sub-directories are handled by bsd.subdir.mk, so it should be used in straightforward way instead of adding new variables/targets. What do you think about the attached patch? I did not notice these changes were submitted somewhere for review before the commit... -- Hiroki ----Next_Part(Thu_Jul_21_12_31_30_2011_575)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="www_cgi_GnatsPR-20110721-1.diff" Index: share/mk/web.site.mk =================================================================== RCS file: /home/ncvs/www/share/mk/web.site.mk,v retrieving revision 1.79 diff -d -u -I \$FreeBSD:.*\$ -I \$NetBSD:.*\$ -I \$OpenBSD:.*\$ -I \$DragonFly:.*\$ -I \$Id:.*\$ -I \$Translation:.*\$ -I \$hrs:.*\$ -r1.79 web.site.mk --- share/mk/web.site.mk 21 Jul 2011 00:42:50 -0000 1.79 +++ share/mk/web.site.mk 21 Jul 2011 03:05:01 -0000 @@ -358,14 +358,6 @@ .endif .if defined(CGI) && !empty(CGI) @${MKDIR} -p ${CGIINSTALLDIR} -.if defined(CGI_SUBDIRS) && !empty(CGI_SUBDIRS) -.for sd in ${CGI_SUBDIRS} - @${MKDIR} -p ${CGIINSTALLDIR}/${sd} -.endfor -.for sf in ${CGI_SUBFILES} - ${INSTALL_CGI} ${.CURDIR}/${sf} ${CGIINSTALLDIR}/${sf} -.endfor -.endif .for entry in ${CGI} ${INSTALL_CGI} ${.CURDIR}/${entry} ${CGIINSTALLDIR} .endfor Index: en/cgi/Makefile =================================================================== RCS file: /home/ncvs/www/en/cgi/Makefile,v retrieving revision 1.35 diff -d -u -I \$FreeBSD:.*\$ -I \$NetBSD:.*\$ -I \$OpenBSD:.*\$ -I \$DragonFly:.*\$ -I \$Id:.*\$ -I \$Translation:.*\$ -I \$hrs:.*\$ -r1.35 Makefile --- en/cgi/Makefile 20 Jul 2011 23:52:12 -0000 1.35 +++ en/cgi/Makefile 21 Jul 2011 03:03:54 -0000 @@ -16,18 +16,6 @@ DATA+= cvsweb.conf-freebsd DATA+= query-pr-lib.pl -CGI_SUBDIRS= GnatsPR GnatsPR/Section - -CGI_SUBFILES+= GnatsPR/MIMEIterator.pm -CGI_SUBFILES+= GnatsPR/Section.pm -CGI_SUBFILES+= GnatsPR/Section/Email.pm -CGI_SUBFILES+= GnatsPR/Section/FieldStart.pm -CGI_SUBFILES+= GnatsPR/Section/MIME.pm -CGI_SUBFILES+= GnatsPR/Section/Patch.pm -CGI_SUBFILES+= GnatsPR/Section/StateChange.pm -CGI_SUBFILES+= GnatsPR/Section/Text.pm -CGI_SUBFILES+= GnatsPR/SectionIterator.pm - CGI= CGI+= confirm-code.cgi CGI+= cvsweb.cgi @@ -46,6 +34,8 @@ CGI+= search.cgi CGI+= url.cgi +SUBDIR= GnatsPR + .SUFFIXES: .C .cgi .C.cgi: Index: en/cgi/Makefile.inc =================================================================== RCS file: en/cgi/Makefile.inc diff -N en/cgi/Makefile.inc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ en/cgi/Makefile.inc 21 Jul 2011 03:01:08 -0000 @@ -0,0 +1,4 @@ +# $FreeBSD$ + +WEBBASE?= /data/cgi +WEB_PREFIX?= ${.CURDIR}/../../.. Index: en/cgi/GnatsPR/Makefile =================================================================== RCS file: en/cgi/GnatsPR/Makefile diff -N en/cgi/GnatsPR/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ en/cgi/GnatsPR/Makefile 21 Jul 2011 02:55:20 -0000 @@ -0,0 +1,14 @@ +# $FreeBSD$ + +.if exists(../Makefile.conf) +.include "../Makefile.conf" +.endif +.if exists(../Makefile.inc) +.include "../Makefile.inc" +.endif + +SUBDIR= Section + +DATA= MIMEIterator.pm Section.pm + +.include "${WEB_PREFIX}/share/mk/web.site.mk" Index: en/cgi/GnatsPR/Makefile.inc =================================================================== RCS file: en/cgi/GnatsPR/Makefile.inc diff -N en/cgi/GnatsPR/Makefile.inc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ en/cgi/GnatsPR/Makefile.inc 21 Jul 2011 03:02:07 -0000 @@ -0,0 +1,4 @@ +# $FreeBSD$ + +WEBBASE?= /data/cgi/GnatsPR +WEB_PREFIX?= ${.CURDIR}/../../../.. Index: en/cgi/GnatsPR/Section/Makefile =================================================================== RCS file: en/cgi/GnatsPR/Section/Makefile diff -N en/cgi/GnatsPR/Section/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ en/cgi/GnatsPR/Section/Makefile 21 Jul 2011 03:03:00 -0000 @@ -0,0 +1,12 @@ +# $FreeBSD$ + +.if exists(../Makefile.conf) +.include "../Makefile.conf" +.endif +.if exists(../Makefile.inc) +.include "../Makefile.inc" +.endif + +DATA= Email.pm FieldStart.pm MIME.pm Patch.pm StateChange.pm Text.pm + +.include "${WEB_PREFIX}/share/mk/web.site.mk" ----Next_Part(Thu_Jul_21_12_31_30_2011_575)---- ----Security_Multipart0(Thu_Jul_21_12_31_30_2011_292)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEABECAAYFAk4nnZIACgkQTyzT2CeTzy2vyACfZSF0IjA7UGNDF//gFPr2pU0a SyUAn0jnejuPkPHMlp8yeALU91rPJWG/ =Mawx -----END PGP SIGNATURE----- ----Security_Multipart0(Thu_Jul_21_12_31_30_2011_292)----