From owner-freebsd-ports Fri Feb 25 21:20: 9 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 77BF337BE74 for ; Fri, 25 Feb 2000 21:20:03 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id VAA64326; Fri, 25 Feb 2000 21:20:03 -0800 (PST) (envelope-from gnats@FreeBSD.org) Date: Fri, 25 Feb 2000 21:20:03 -0800 (PST) Message-Id: <200002260520.VAA64326@freefall.freebsd.org> To: freebsd-ports@FreeBSD.org Cc: From: "Scot W. Hetzel" Subject: Re: ports/16974: Upgrade www/apache13-fp to 1.3.11" i Reply-To: "Scot W. Hetzel" Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org The following reply was made to PR ports/16974; it has been noted by GNATS. From: "Scot W. Hetzel" To: freebsd-gnats-submit@FreeBSD.org Cc: Subject: Re: ports/16974: Upgrade www/apache13-fp to 1.3.11" i Date: Fri, 25 Feb 2000 23:11:58 -0600 (CST) After applying the first patch, apply this patch for Apache 1.3.12 server. Also remove patch-as. Added are patch-lang.ja.jis, patch-lang.po.iso-pl, patch-lang.pt-br. Should I have the port install all 17 "Test Page for Apache Installation" translated index.html pages. Or should I modify the Apache Makefile.tmpl to only install the index.html.en page as index.html? NOTE: I haven't translated the patches for all 17 languages. diff -ruN --exclude patch-as apache13-fp.orig/Makefile apache13-fp/Makefile --- apache13-fp.orig/Makefile Thu Feb 24 21:14:43 2000 +++ apache13-fp/Makefile Fri Feb 25 19:32:27 2000 @@ -33,10 +33,9 @@ MAINTAINER= hetzels@westbend.net #PATCH_SITES= http://www.apache.org/dist/patches/apply_to_${AP_VERS}/ -PATCH_SITES= http://www.apache.org/info/css-security/ -PATCHFILES= apache_1.3.11_css_patch.txt +#PATCHFILES= -AP_VERS= 1.3.11 +AP_VERS= 1.3.12 APACHE= ${DISTNAME}${EXTRACT_SUFX} FRONTPAGE= fp40.bsdi.tar.Z diff -ruN --exclude patch-as apache13-fp.orig/files/md5 apache13-fp/files/md5 --- apache13-fp.orig/files/md5 Sun Feb 20 15:31:23 2000 +++ apache13-fp/files/md5 Fri Feb 25 19:28:21 2000 @@ -1,4 +1,4 @@ -MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1 +MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2 MD5 (fp40.bsdi.tar.Z) = 2fb460f64fe1853eb791654851be208b MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62 MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6 diff -ruN --exclude patch-as apache13-fp.orig/patches/patch-ab apache13-fp/patches/patch-ab --- apache13-fp.orig/patches/patch-ab Thu Feb 24 22:03:08 2000 +++ apache13-fp/patches/patch-ab Fri Feb 25 22:38:46 2000 @@ -89,7 +89,7 @@ - echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ - else \ + (cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \ -+ for lang in ca cz de dk ee en es fr it lu nl pt se; do \ ++ for lang in ca cz de dk ee en es fr it ja.jis lu nl po.iso-pl pt pt-br se; do \ + mv $(root)$(doc_prefix)/index.html.$${lang} \ + $(root)$(doc_prefix)/index.html.$${lang}-dist ; \ + done; \ diff -ruN --exclude patch-as apache13-fp.orig/patches/patch-lang.ja apache13-fp/patches/patch-lang.ja --- apache13-fp.orig/patches/patch-lang.ja Wed Dec 31 18:00:00 1969 +++ apache13-fp/patches/patch-lang.ja Fri Feb 25 19:51:58 2000 @@ -0,0 +1,27 @@ +--- htdocs/index.html.ja.jis.orig Sun Jan 30 10:18:35 2000 ++++ htdocs/index.html.ja.jis Fri Feb 25 19:46:09 2000 +@@ -30,13 +30,20 @@ + + +

+-Apache に関する文書 は、この web サーバ配布物の中に含まれています。 ++Apache に関する文書 は、この web サーバ配布物の中に含まれています。 +

++

The FrontPage 2000 Extentions (mod_frontpage) has been installed, read the ++FrontPage 2000 documentation carefully.

++

Information on the FreeBSD operating system can be found on the FreeBSD Home Page.

+

+ 以下の画像は、Apache を利用している web サーバで自由に使うことができます。Apache をご利用いただき、ありがとうございます! +

+-
+- +-
++
++ Powered by Apache ++ ++ Site driven by FreeBSD - FreeBSD: The Power to Server! ++ ++ Created with Microsoft FrontPage 2000 ++
+ + diff -ruN --exclude patch-as apache13-fp.orig/patches/patch-lang.pt apache13-fp/patches/patch-lang.pt --- apache13-fp.orig/patches/patch-lang.pt Thu Feb 24 22:16:53 2000 +++ apache13-fp/patches/patch-lang.pt Fri Feb 25 19:39:38 2000 @@ -1,28 +1,25 @@ ---- htdocs/index.html.pt.orig Thu Aug 19 08:13:44 1999 -+++ htdocs/index.html.pt Sun Feb 20 17:23:10 2000 -@@ -41,15 +41,22 @@ - -
-

-- O Apache documentation -+ O Apache documentation - foi incluido com esta distribuicao. -

+--- htdocs/index.html.pt.orig Mon Jan 31 17:23:27 2000 ++++ htdocs/index.html.pt Fri Feb 25 19:39:00 2000 +@@ -33,10 +33,19 @@ +

+ + +-

A documentação foi incluída ++

A documentação foi incluída + juntamente com esta distribuição. +

The FrontPage 2000 Extentions (mod_frontpage) has been installed, read the +FrontPage 2000 documentation carefully.

+

Information on the FreeBSD operating system can be found on the FreeBSD Home Page.

-

- O Webmaster deste site e livre para utilizar a imagem abaixo num -- Web server instalado com o Apache. Obrigado por utilizar o Apache! -+ Web server instalado com o Apache. Obrigado por utilizar o Apache and FreeBSD! -

-
-- -+ Powered by Apache -+ -+ Site driven by FreeBSD - FreeBSD: The Power to Server! -+ -+ Created with Microsoft FrontPage 2000 -
- +

A imagem abaixo pode ser usada livremente em qualquer site presente num servidor +- com o Apache Web Server instalado. Obrigado por usar o Apache Web Server! +-

++ com o Apache Web Server instalado. Obrigado por usar o Apache Web Server and FreeBSD! ++
++ Powered by Apache ++ ++ Site driven by FreeBSD - FreeBSD: The Power to Server! ++ ++ Created with Microsoft FrontPage 2000 ++/DIV> + diff -ruN --exclude patch-as apache13-fp.orig/patches/patch-lang.pt-br apache13-fp/patches/patch-lang.pt-br --- apache13-fp.orig/patches/patch-lang.pt-br Wed Dec 31 18:00:00 1969 +++ apache13-fp/patches/patch-lang.pt-br Fri Feb 25 19:51:31 2000 @@ -0,0 +1,27 @@ +--- htdocs/index.html.pt-br.orig Sun Jan 30 13:59:38 2000 ++++ htdocs/index.html.pt-br Fri Feb 25 19:49:10 2000 +@@ -41,15 +41,22 @@ + +
+

+- O Apache documentation ++ O Apache documentation + foi incluido com esta distribuicao. +

++

The FrontPage 2000 Extentions (mod_frontpage) has been installed, read the ++FrontPage 2000 documentation carefully.

++

Information on the FreeBSD operating system can be found on the FreeBSD Home Page.

+

+ O Webmaster deste site e livre para utilizar a imagem abaixo num + Web server instalado com o Apache. Obrigado por utilizar o Apache! +

+
+- ++ Powered by Apache ++ ++ Site driven by FreeBSD - FreeBSD: The Power to Server! ++ ++ Created with Microsoft FrontPage 2000 +
+ + diff -ruN --exclude patch-as apache13-fp.orig/pkg/INSTALL apache13-fp/pkg/INSTALL --- apache13-fp.orig/pkg/INSTALL Thu Feb 24 19:42:37 2000 +++ apache13-fp/pkg/INSTALL Fri Feb 25 22:37:27 2000 @@ -22,7 +22,7 @@ /bin/mkdir -p ${AP_DATA} fi - for lang in ca cz de dk ee en es fr it lu nl pt se + for lang in ca cz de dk ee en es fr it ja.jis lu nl po.iso-pl pt pt-br se { /bin/cat ${AP_SHARE}/index.html.${lang}-dist | \ /usr/bin/sed -e 's;@@HOSTNAME@@;'${HOST_NAME}';' \ @@ -73,21 +73,6 @@ fi } -snap_frontpage_link () -{ - if [ "${PKG_PREFIX}/frontpage" != "/usr/local/frontpage" ]; then - if [ ! -d "/usr/local/frontpage" ]; then - if /bin/ln -s "${PKG_PREFIX}/frontpage" "/usr/local/frontpage" ; then - /bin/echo "Snapped link /usr/local/frontpage --> ${PKG_PREFIX}/frontpage" - else - /bin/echo "ERROR: Unable to snap link /usr/local/frontpage --> ${PKG_PREFIX}/frontpage!" - fi - else - /bin/echo "ERROR: Unable to snap link /usr/local/frontpage --> ${PKG_PREFIX}, /usr/local/frontpage already exists!" - fi - fi -} - case $2 in PRE-INSTALL) ;; @@ -96,7 +81,6 @@ if [ "${PKG_BATCH}" = "NO" ]; then create_apache_lang_doc fix_frontpage_scripts - snap_frontpage_link fix_httpd_conf ${FPINSTALL} comment_files diff -ruN --exclude patch-as apache13-fp.orig/pkg/PLIST apache13-fp/pkg/PLIST --- apache13-fp.orig/pkg/PLIST Thu Feb 24 22:32:25 2000 +++ apache13-fp/pkg/PLIST Fri Feb 25 22:35:58 2000 @@ -108,9 +108,12 @@ share/doc/apache/index.html.es-dist share/doc/apache/index.html.fr-dist share/doc/apache/index.html.it-dist +share/doc/apache/index.html.ja.jis-dist share/doc/apache/index.html.lu-dist share/doc/apache/index.html.nl-dist +share/doc/apache/index.html.po.iso-pl-dist share/doc/apache/index.html.pt-dist +share/doc/apache/index.html.pt-br-dist share/doc/apache/index.html.se-dist @unexec rm -rf %B/index.html.?? share/doc/apache/manual/LICENSE To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message