Bug 11108

Summary: new port: russian/rapache
Product: Ports & Packages Reporter: Vladimir N.Silyaev <vns>
Component: Individual Port(s)Assignee: freebsd-ports (Nobody) <ports>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   

Description Vladimir N.Silyaev 1999-04-13 07:10:01 UTC 
Russian Apache is an HTTP server designed to work on a Russian market.

How-To-Repeat: 
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	.
#	./files
#	./files/md5
#	./pkg
#	./pkg/COMMENT
#	./pkg/DESCR
#	./pkg/PLIST
#	./Makefile
#	./patches
#	./patches/patch-ab
#	./patches/patch-ag
#	./patches/patch-ak
#	./patches/patch-al
#	./patches/patch-aa
#	./patches/patch-ac
#
echo c - .
mkdir -p . > /dev/null 2>&1
echo c - ./files
mkdir -p ./files > /dev/null 2>&1
echo x - ./files/md5
sed 's/^X//' >./files/md5 << 'END-of-./files/md5'
XMD5 (apache_1.3.6.tar.gz) = b4114ed78f296bfe424c4ba05dccc643
XMD5 (patches_1.3.6rusPL28.14.tar.gz) = 1bd6e2f53f961bae97a5f6047cbfbbbc
END-of-./files/md5
echo c - ./pkg
mkdir -p ./pkg > /dev/null 2>&1
echo x - ./pkg/COMMENT
sed 's/^X//' >./pkg/COMMENT << 'END-of-./pkg/COMMENT'
XThe extremely popular Apache http server.  Very fast, very clean.
END-of-./pkg/COMMENT
echo x - ./pkg/DESCR
sed 's/^X//' >./pkg/DESCR << 'END-of-./pkg/DESCR'
X                                Russian Apache
X                             Version 28.14 (and up)
X
XWhat is it?
X-----------
X
XRussian Apache is an HTTP server designed to work on a Russian market.
X
XDocumentation
X-------------
X
XAll the documentation is on-line on the WWW, via the URL http://apache.lexa.ru
END-of-./pkg/DESCR
echo x - ./pkg/PLIST
sed 's/^X//' >./pkg/PLIST << 'END-of-./pkg/PLIST'
Xbin/dbmmanage
Xbin/htdigest
Xbin/htpasswd
Xetc/apache/access.conf.default
Xetc/apache/httpd.conf.default
Xetc/apache/magic.default
Xetc/apache/mime.types.default
Xetc/apache/srm.conf.default
Xetc/apache/tables/russian/alt-alt.tab
Xetc/apache/tables/russian/alt-iso.tab
Xetc/apache/tables/russian/alt-koi.tab
Xetc/apache/tables/russian/alt-mac.tab
Xetc/apache/tables/russian/alt-win.tab
Xetc/apache/tables/russian/iso-alt.tab
Xetc/apache/tables/russian/iso-iso.tab
Xetc/apache/tables/russian/iso-koi.tab
Xetc/apache/tables/russian/iso-mac.tab
Xetc/apache/tables/russian/iso-win.tab
Xetc/apache/tables/russian/koi-alt.tab
Xetc/apache/tables/russian/koi-iso.tab
Xetc/apache/tables/russian/koi-koi.tab
Xetc/apache/tables/russian/koi-mac.tab
Xetc/apache/tables/russian/koi-tran.tab
Xetc/apache/tables/russian/koi-win.tab
Xetc/apache/tables/russian/koi-utf8.tab
Xetc/apache/tables/russian/mac-alt.tab
Xetc/apache/tables/russian/mac-iso.tab
Xetc/apache/tables/russian/mac-koi.tab
Xetc/apache/tables/russian/mac-mac.tab
Xetc/apache/tables/russian/mac-win.tab
Xetc/apache/tables/russian/win-alt.tab
Xetc/apache/tables/russian/win-iso.tab
Xetc/apache/tables/russian/win-koi.tab
Xetc/apache/tables/russian/win-mac.tab
Xetc/apache/tables/russian/win-tran.tab
Xetc/apache/tables/russian/win-win.tab
Xetc/apache/tables/russian2/alt-mac.tab
Xetc/apache/tables/russian2/koi-mac.tab
Xetc/apache/tables/russian2/iso-alt.tab
Xetc/apache/tables/russian2/koi-win.tab
Xetc/apache/tables/russian2/iso-mac.tab
Xetc/apache/tables/russian2/win-alt.tab
Xetc/apache/tables/russian2/koi-alt.tab
Xetc/apache/tables/russian2/win-iso.tab
Xetc/apache/tables/russian2/koi-iso.tab
Xetc/apache/tables/russian2/win-mac.tab
Xetc/apache/tables/czech/cp1250-8859-1.tab
Xetc/apache/tables/czech/cp1250-8859-2.tab
Xetc/apache/tables/czech/cp1250-cmac.tab
Xetc/apache/tables/czech/cp1250-cp1250.tab
Xetc/apache/tables/czech/cp1250-cp437.tab
Xetc/apache/tables/czech/cp1250-cp895.tab
Xetc/apache/tables/czech/cp1250-koi8cs.tab
Xetc/apache/tables/czech/cp1250-latin2.tab
Xetc/rc.d/apache.sh
Xinclude/apache/alloc.h
Xinclude/apache/ap.h
Xinclude/apache/ap_compat.h
Xinclude/apache/ap_config.h
Xinclude/apache/ap_config_auto.h
Xinclude/apache/ap_ctype.h
Xinclude/apache/ap_md5.h
Xinclude/apache/ap_mmn.h
Xinclude/apache/buff.h
Xinclude/apache/compat.h
Xinclude/apache/conf.h
Xinclude/apache/explain.h
Xinclude/apache/fnmatch.h
Xinclude/apache/hsregex.h
Xinclude/apache/http_conf_globals.h
Xinclude/apache/http_config.h
Xinclude/apache/http_core.h
Xinclude/apache/http_log.h
Xinclude/apache/http_main.h
Xinclude/apache/http_protocol.h
Xinclude/apache/http_request.h
Xinclude/apache/http_vhost.h
Xinclude/apache/httpd.h
Xinclude/apache/multithread.h
Xinclude/apache/os-inline.c
Xinclude/apache/os.h
Xinclude/apache/rfc1413.h
Xinclude/apache/scoreboard.h
Xinclude/apache/util_date.h
Xinclude/apache/util_md5.h
Xinclude/apache/util_script.h
Xinclude/apache/util_uri.h
Xlibexec/apache/libproxy.so
Xlibexec/apache/mod_auth_anon.so
Xlibexec/apache/mod_auth_db.so
Xlibexec/apache/mod_cern_meta.so
Xlibexec/apache/mod_digest.so
Xlibexec/apache/mod_expires.so
Xlibexec/apache/mod_headers.so
Xlibexec/apache/mod_info.so
Xlibexec/apache/mod_mime_magic.so
Xlibexec/apache/mod_rewrite.so
Xlibexec/apache/mod_speling.so
Xlibexec/apache/mod_unique_id.so
Xlibexec/apache/mod_usertrack.so
Xsbin/ab
Xsbin/apachectl
Xsbin/apxs
Xsbin/httpd
Xsbin/logresolve
Xsbin/rotatelogs
Xshare/doc/apache/apache_pb.gif
Xshare/doc/apache/ra-powered.gif
X@exec mkdir -p %D/www
X@exec ln -fs %B %D/www/data.default
X@unexec rm -f %D/www/data.default
Xshare/doc/apache/index.html
Xshare/doc/apache/manual/LICENSE
Xshare/doc/apache/manual/bind.html
Xshare/doc/apache/manual/cgi_path.html
Xshare/doc/apache/manual/content-negotiation.html
Xshare/doc/apache/manual/custom-error.html
Xshare/doc/apache/manual/dns-caveats.html
Xshare/doc/apache/manual/dso.html
Xshare/doc/apache/manual/ebcdic.html
Xshare/doc/apache/manual/env.html
Xshare/doc/apache/manual/footer.html
Xshare/doc/apache/manual/handler.html
Xshare/doc/apache/manual/header.html
Xshare/doc/apache/manual/images/custom_errordocs.gif
Xshare/doc/apache/manual/images/home.gif
Xshare/doc/apache/manual/images/index.gif
Xshare/doc/apache/manual/images/mod_rewrite_fig1.fig
Xshare/doc/apache/manual/images/mod_rewrite_fig1.gif
Xshare/doc/apache/manual/images/mod_rewrite_fig2.fig
Xshare/doc/apache/manual/images/mod_rewrite_fig2.gif
Xshare/doc/apache/manual/images/sub.gif
Xshare/doc/apache/manual/index.html
Xshare/doc/apache/manual/install-tpf.html
Xshare/doc/apache/manual/install.html
Xshare/doc/apache/manual/invoking.html
Xshare/doc/apache/manual/keepalive.html
Xshare/doc/apache/manual/location.html
Xshare/doc/apache/manual/man-template.html
Xshare/doc/apache/manual/misc/API.html
Xshare/doc/apache/manual/misc/FAQ.html
Xshare/doc/apache/manual/misc/HTTP_Features.tsv
Xshare/doc/apache/manual/misc/client_block_api.html
Xshare/doc/apache/manual/misc/compat_notes.html
Xshare/doc/apache/manual/misc/custom_errordocs.html
Xshare/doc/apache/manual/misc/descriptors.html
Xshare/doc/apache/manual/misc/fin_wait_2.html
Xshare/doc/apache/manual/misc/footer.html
Xshare/doc/apache/manual/misc/header.html
Xshare/doc/apache/manual/misc/howto.html
Xshare/doc/apache/manual/misc/index.html
Xshare/doc/apache/manual/misc/known_client_problems.html
Xshare/doc/apache/manual/misc/nopgp.html
Xshare/doc/apache/manual/misc/perf-bsd44.html
Xshare/doc/apache/manual/misc/perf-dec.html
Xshare/doc/apache/manual/misc/perf-hp.html
Xshare/doc/apache/manual/misc/perf-tuning.html
Xshare/doc/apache/manual/misc/perf.html
Xshare/doc/apache/manual/misc/security_tips.html
Xshare/doc/apache/manual/misc/vif-info.html
Xshare/doc/apache/manual/misc/windoz_keepalive.html
Xshare/doc/apache/manual/mod/core.html
Xshare/doc/apache/manual/mod/directive-dict.html
Xshare/doc/apache/manual/mod/directives.html
Xshare/doc/apache/manual/mod/footer.html
Xshare/doc/apache/manual/mod/header.html
Xshare/doc/apache/manual/mod/index.html
Xshare/doc/apache/manual/mod/mod_access.html
Xshare/doc/apache/manual/mod/mod_actions.html
Xshare/doc/apache/manual/mod/mod_alias.html
Xshare/doc/apache/manual/mod/mod_asis.html
Xshare/doc/apache/manual/mod/mod_auth.html
Xshare/doc/apache/manual/mod/mod_auth_anon.html
Xshare/doc/apache/manual/mod/mod_auth_db.html
Xshare/doc/apache/manual/mod/mod_auth_dbm.html
Xshare/doc/apache/manual/mod/mod_autoindex.html
Xshare/doc/apache/manual/mod/mod_browser.html
Xshare/doc/apache/manual/mod/mod_cern_meta.html
Xshare/doc/apache/manual/mod/mod_cgi.html
Xshare/doc/apache/manual/mod/mod_cookies.html
Xshare/doc/apache/manual/mod/mod_digest.html
Xshare/doc/apache/manual/mod/mod_dir.html
Xshare/doc/apache/manual/mod/mod_dld.html
Xshare/doc/apache/manual/mod/mod_dll.html
Xshare/doc/apache/manual/mod/mod_env.html
Xshare/doc/apache/manual/mod/mod_example.html
Xshare/doc/apache/manual/mod/mod_expires.html
Xshare/doc/apache/manual/mod/mod_headers.html
Xshare/doc/apache/manual/mod/mod_imap.html
Xshare/doc/apache/manual/mod/mod_include.html
Xshare/doc/apache/manual/mod/mod_info.html
Xshare/doc/apache/manual/mod/mod_isapi.html
Xshare/doc/apache/manual/mod/mod_log_agent.html
Xshare/doc/apache/manual/mod/mod_log_common.html
Xshare/doc/apache/manual/mod/mod_log_config.html
Xshare/doc/apache/manual/mod/mod_log_referer.html
Xshare/doc/apache/manual/mod/mod_mime.html
Xshare/doc/apache/manual/mod/mod_mime_magic.html
Xshare/doc/apache/manual/mod/mod_mmap_static.html
Xshare/doc/apache/manual/mod/mod_negotiation.html
Xshare/doc/apache/manual/mod/mod_proxy.html
Xshare/doc/apache/manual/mod/mod_rewrite.html
Xshare/doc/apache/manual/mod/mod_setenvif.html
Xshare/doc/apache/manual/mod/mod_so.html
Xshare/doc/apache/manual/mod/mod_speling.html
Xshare/doc/apache/manual/mod/mod_status.html
Xshare/doc/apache/manual/mod/mod_unique_id.html
Xshare/doc/apache/manual/mod/mod_userdir.html
Xshare/doc/apache/manual/mod/mod_usertrack.html
Xshare/doc/apache/manual/multilogs.html
Xshare/doc/apache/manual/new_features_1_0.html
Xshare/doc/apache/manual/new_features_1_1.html
Xshare/doc/apache/manual/new_features_1_2.html
Xshare/doc/apache/manual/new_features_1_3.html
Xshare/doc/apache/manual/process-model.html
Xshare/doc/apache/manual/readme-tpf.html
Xshare/doc/apache/manual/search/manual-index.cgi
Xshare/doc/apache/manual/sections.html
Xshare/doc/apache/manual/sourcereorg.html
Xshare/doc/apache/manual/stopping.html
Xshare/doc/apache/manual/suexec.html
Xshare/doc/apache/manual/suexec_1_2.html
Xshare/doc/apache/manual/unixware.html
Xshare/doc/apache/manual/upgrading_to_1_3.html
Xshare/doc/apache/manual/vhosts/details.html
Xshare/doc/apache/manual/vhosts/details_1_2.html
Xshare/doc/apache/manual/vhosts/examples.html
Xshare/doc/apache/manual/vhosts/fd-limits.html
Xshare/doc/apache/manual/vhosts/footer.html
Xshare/doc/apache/manual/vhosts/header.html
Xshare/doc/apache/manual/vhosts/host.html
Xshare/doc/apache/manual/vhosts/index.html
Xshare/doc/apache/manual/vhosts/ip-based.html
Xshare/doc/apache/manual/vhosts/mass.html
Xshare/doc/apache/manual/vhosts/name-based.html
Xshare/doc/apache/manual/vhosts/vhosts-in-depth.html
Xshare/doc/apache/manual/vhosts/virtual-host.html
Xshare/doc/apache/manual/windows.html
Xwww/cgi-bin.default/printenv
Xwww/cgi-bin.default/test-cgi
Xwww/icons/README
Xwww/icons/a.gif
Xwww/icons/alert.black.gif
Xwww/icons/alert.red.gif
Xwww/icons/apache_pb.gif
Xwww/icons/back.gif
Xwww/icons/ball.gray.gif
Xwww/icons/ball.red.gif
Xwww/icons/binary.gif
Xwww/icons/binhex.gif
Xwww/icons/blank.gif
Xwww/icons/bomb.gif
Xwww/icons/box1.gif
Xwww/icons/box2.gif
Xwww/icons/broken.gif
Xwww/icons/burst.gif
Xwww/icons/c.gif
Xwww/icons/comp.blue.gif
Xwww/icons/comp.gray.gif
Xwww/icons/compressed.gif
Xwww/icons/continued.gif
Xwww/icons/dir.gif
Xwww/icons/down.gif
Xwww/icons/dvi.gif
Xwww/icons/f.gif
Xwww/icons/folder.gif
Xwww/icons/folder.open.gif
Xwww/icons/folder.sec.gif
Xwww/icons/forward.gif
Xwww/icons/generic.gif
Xwww/icons/generic.red.gif
Xwww/icons/generic.sec.gif
Xwww/icons/hand.right.gif
Xwww/icons/hand.up.gif
Xwww/icons/icon.sheet.gif
Xwww/icons/image1.gif
Xwww/icons/image2.gif
Xwww/icons/image3.gif
Xwww/icons/index.gif
Xwww/icons/layout.gif
Xwww/icons/left.gif
Xwww/icons/link.gif
Xwww/icons/movie.gif
Xwww/icons/p.gif
Xwww/icons/patch.gif
Xwww/icons/pdf.gif
Xwww/icons/pie0.gif
Xwww/icons/pie1.gif
Xwww/icons/pie2.gif
Xwww/icons/pie3.gif
Xwww/icons/pie4.gif
Xwww/icons/pie5.gif
Xwww/icons/pie6.gif
Xwww/icons/pie7.gif
Xwww/icons/pie8.gif
Xwww/icons/portal.gif
Xwww/icons/ps.gif
Xwww/icons/quill.gif
Xwww/icons/right.gif
Xwww/icons/screw1.gif
Xwww/icons/screw2.gif
Xwww/icons/script.gif
Xwww/icons/small/README.txt
Xwww/icons/small/back.gif
Xwww/icons/small/binary.gif
Xwww/icons/small/binhex.gif
Xwww/icons/small/blank.gif
Xwww/icons/small/broken.gif
Xwww/icons/small/burst.gif
Xwww/icons/small/comp1.gif
Xwww/icons/small/comp2.gif
Xwww/icons/small/compressed.gif
Xwww/icons/small/continued.gif
Xwww/icons/small/dir.gif
Xwww/icons/small/dir2.gif
Xwww/icons/small/forward.gif
Xwww/icons/small/generic.gif
Xwww/icons/small/generic2.gif
Xwww/icons/small/generic3.gif
Xwww/icons/small/image.gif
Xwww/icons/small/image2.gif
Xwww/icons/small/index.gif
Xwww/icons/small/key.gif
Xwww/icons/small/movie.gif
Xwww/icons/small/rainbow.gif
Xwww/icons/small/sound.gif
Xwww/icons/small/sound2.gif
Xwww/icons/small/tar.gif
Xwww/icons/small/text.gif
Xwww/icons/small/transfer.gif
Xwww/icons/small/unknown.gif
Xwww/icons/small/uu.gif
Xwww/icons/small/ps.gif
Xwww/icons/small/patch.gif
Xwww/icons/small/doc.gif
Xwww/icons/sound1.gif
Xwww/icons/sound2.gif
Xwww/icons/sphere1.gif
Xwww/icons/sphere2.gif
Xwww/icons/tar.gif
Xwww/icons/tex.gif
Xwww/icons/text.gif
Xwww/icons/transfer.gif
Xwww/icons/unknown.gif
Xwww/icons/up.gif
Xwww/icons/uu.gif
Xwww/icons/uuencoded.gif
Xwww/icons/world1.gif
Xwww/icons/world2.gif
X@exec mkdir -p %D/www/proxy
X@dirrm etc/apache/tables/russian
X@dirrm etc/apache/tables/russian2
X@dirrm etc/apache/tables/czech
X@dirrm etc/apache/tables
X@dirrm etc/apache
X@dirrm include/apache
X@dirrm libexec/apache
X@dirrm share/doc/apache/manual/images
X@dirrm share/doc/apache/manual/misc
X@dirrm share/doc/apache/manual/mod
X@dirrm share/doc/apache/manual/search
X@dirrm share/doc/apache/manual/vhosts
X@dirrm share/doc/apache/manual
X@dirrm share/doc/apache
X@dirrm www/cgi-bin.default
X@dirrm www/icons/small
X@dirrm www/icons
X@dirrm www/proxy
X@dirrm www
END-of-./pkg/PLIST
echo x - ./Makefile
sed 's/^X//' >./Makefile << 'END-of-./Makefile'
X# New ports collection makefile for:    apache HTTPD
X# Version required:     1.3*
X# Date created:         Sat Apr 10 22:30:36 EEST 1999
X# Whom:                 vns@delta.odessa.ua
X#
X# $Id:$
X#
X
XDISTNAME=       apache_1.3.6
XPKGNAME=        rapache-1.3.6
XCATEGORIES=	russian
XMASTER_SITES=   http://www.apache.org/dist/ \
X		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
X		ftp://ftp.rge.com/pub/infosystems/apache/dist/ \
X		ftp://apache.compuex.com/pub/apache/dist/ \
X		ftp://apache.arctic.org/pub/apache/dist/ \
X		ftp://ftp.epix.net/pub/apache/dist/ \
X		ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/ \
X		ftp://ftp.connectnet.com/pub/www/apache/ \
X		ftp://apache.technomancer.com/mirrors/apache/dist/ \
X		ftp://ftp.raver.net/pub/ftp.apache.org/ \
X		ftp://www3.service.digital.com/apache/dist/ \
X		ftp://galileo.galilei.com/pub/apache/ \
X		ftp://ftp.mtnranch.net/pub/apache/dist/ \
X		ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
X		ftp://apache.nextpath.com/pub/apache/dist/
XRA_VERSION=	28.14		
XPATCHFILES=	patches_1.3.6rusPL${RA_VERSION}.tar.gz
XPATCH_SITES=	ftp://ftp.lexa.ru/pub/apache-rus/
XMAINTAINER=     vns@delta.odessa.ua
XY2K=		http://www.apache.org/docs/misc/FAQ.html#year2000
X
X# 
X# Small hack for alternate processing patchfiles
X#
XGZCAT=sh -c 'tar -zxf $$0 -C ${WRKSRC};cat ${WRKSRC}/RA-1.3rusPL${RA_VERSION}.patch'
X
X#
X# Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
X#
X
XHAS_CONFIGURE=  yes
XCONFIGURE_ARGS= \
X		 --prefix=${PREFIX} \
X		 --with-layout=GNU \
X		 --sysconfdir=${PREFIX}/etc/apache \
X		 --includedir=${PREFIX}/include/apache \
X		 --localstatedir=/var \
X		 --datadir=${PREFIX}/www \
X		 --suexec-docroot=${PREFIX}/www/data \
X		 --proxycachedir=${PREFIX}/www/proxy \
X		 --libexecdir=${PREFIX}/libexec/apache \
X		 --without-confadjust \
X		 --enable-shared=remain \
X		 --enable-module=most \
X		 --enable-module=auth_db \
X		 --disable-module=auth_dbm
X
X# Currently perl version don't matter
X#                 --with-perl=${PERL5}
X
XOPTIM=-DHARD_SERVER_LIMIT=512 \
X-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
X-DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\"
X
X.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
XOPTIM+= -DBUFFERED_LOGS
XCFLAGS+= -O6 -fomit-frame-pointer
X.endif
X
XCONFIGURE_ENV= OPTIM='${OPTIM}'
X
XMAN1= dbmmanage.1 htdigest.1 htpasswd.1
XMAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
X
Xpre-install:
X	@if [ -f ${WRKSRC}/htdocs/index.html.orig ]; then \
X		rm  ${WRKSRC}/htdocs/index.html.orig;
X	fi
X
Xpost-install:
X	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
X		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
X		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \
X		echo "[ -x /usr/local/sbin/apachectl ] && /usr/local/sbin/apachectl start > /dev/null && echo -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \
X		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
X	fi
X
X.include <bsd.port.mk>
END-of-./Makefile
echo c - ./patches
mkdir -p ./patches > /dev/null 2>&1
echo x - ./patches/patch-ab
sed 's/^X//' >./patches/patch-ab << 'END-of-./patches/patch-ab'
X--- Makefile.tmpl.orig	Sun Apr 11 10:49:30 1999
X+++ Makefile.tmpl	Sun Apr 11 10:54:15 1999
X@@ -113,13 +113,14 @@
X sysconfdir      = @sysconfdir@
X datadir         = @datadir@
X iconsdir        = $(datadir)/icons
X-htdocsdir       = $(datadir)/htdocs
X+htdocsdir       = $(datadir)/data
X cgidir          = $(datadir)/cgi-bin
X includedir      = @includedir@
X localstatedir   = @localstatedir@
X runtimedir      = @runtimedir@
X logfiledir      = @logfiledir@
X proxycachedir   = @proxycachedir@
X+doc_prefix      = $(prefix)/share/doc/apache
X 
X libexecdir_relative   = @libexecdir_relative@
X 
X@@ -250,9 +251,9 @@
X 	$(MKDIR) $(root)$(mandir)/man8
X 	$(MKDIR) $(root)$(sysconfdir)
X 	$(MKDIR) $(root)$(sysconfdir)/tables
X-	$(MKDIR) $(root)$(htdocsdir)
X+	$(MKDIR) $(root)$(doc_prefix)
X 	$(MKDIR) $(root)$(iconsdir)
X-	$(MKDIR) $(root)$(cgidir)
X+	$(MKDIR) $(root)$(cgidir).default
X 	$(MKDIR) $(root)$(includedir)
X 	$(MKDIR) $(root)$(runtimedir)
X 	$(MKDIR) $(root)$(logfiledir)
X@@ -380,26 +381,34 @@
X #   icons and distributed CGI scripts.
X install-data:
X 	@echo "===> [data: Installing initial data files]"
X-	-@if [ -f $(root)$(htdocsdir)/index.html ]; then \
X-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
X-	else \
X-		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
X+#       -@if [ -f $(root)$(htdocsdir)/index.html ]; then \
X+#               echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
X+#       else \
X+		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \
X 		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
X-		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
X-		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
X-		find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
X+		(cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \
X+		find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \
X+		find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \
X+#       fi
X+	if [ ! -d $(root)$(htdocsdir) ]; then \
X+	       $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \
X 	fi
X-	-@if [ -f $(root)$(cgidir)/printenv ]; then \
X-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
X-	else \
X+	$(RM) $(root)$(htdocsdir).default
X+	$(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default
X+#       -@if [ -f $(root)$(cgidir)/printenv ]; then \
X+#               echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
X+#       else \
X 		for script in printenv test-cgi; do \
X 			cat $(TOP)/cgi-bin/$${script} |\
X 			sed -e 's;^#!/.*perl;#!$(PERL);' \
X 			> $(TOP)/$(SRC)/.apaci.install.tmp; \
X-			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
X-			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
X+			echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \
X+			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \
X 		done; \
X-	fi
X+#       fi
X+	if [ ! -d $(root)$(cgidir) ]; then \
X+		$(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \
X+  	fi
X 	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
X 	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
X 	(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
X@@ -439,10 +448,10 @@
X 			-e 's;logs/accept.lock;$(runtimedir)/$(TARGET).lock;' \
X 			-e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
X 			-e 's;logs/httpd.pid;$(runtimedir)/$(TARGET).pid;' \
X-			-e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \
X-			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \
X-			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \
X-			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \
X+			-e "s;logs/access_log;$(logfiledir)/httpd-access.log;" \
X+			-e "s;logs/error_log;$(logfiledir)/httpd-error.log;" \
X+			-e "s;logs/referer_log;$(logfiledir)/httpd-referer.log;" \
X+			-e "s;logs/agent_log;$(logfiledir)/httpd-agent.log;" \
X 			-e 's;conf/tables/;$(sysconfdir)/tables/;' \
X 			-e 's;conf/magic;$(sysconfdir)/magic;' \
X 			-e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
END-of-./patches/patch-ab
echo x - ./patches/patch-ag
sed 's/^X//' >./patches/patch-ag << 'END-of-./patches/patch-ag'
X--- conf/httpd.conf-dist.orig	Sat Dec 12 20:04:29 1998
X+++ conf/httpd.conf-dist	Fri Jan 15 01:08:36 1999
X@@ -241,7 +241,7 @@
X #  don't use Group #-1 on these systems!
X #
X User nobody
X-Group #-1
X+Group nogroup
X 
X #
X # ServerAdmin: Your address, where problems with the server should be
X@@ -459,7 +459,7 @@
X # define per-<VirtualHost> access logfiles, transactions will be
X # logged therein and *not* in this file.
X #
X-CustomLog logs/access_log common
X+#CustomLog logs/access_log common
X 
X #
X # If you would like to have agent and referer logfiles, uncomment the
X@@ -472,7 +472,7 @@
X # If you prefer a single logfile with access, agent, and referer information
X # (Combined Logfile Format) you can use the following directive.
X #
X-#CustomLog logs/access_log combined
X+CustomLog logs/access_log combined
X 
X #
X # Optionally add a line containing the server version and virtual host
END-of-./patches/patch-ag
echo x - ./patches/patch-ak
sed 's/^X//' >./patches/patch-ak << 'END-of-./patches/patch-ak'
X--- src/support/apachectl.orig	Tue Feb  9 21:00:34 1999
X+++ src/support/apachectl	Fri Mar 26 00:08:20 1999
X@@ -39,6 +39,8 @@
X # --------------------                              --------------------
X # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
X 
X+eval `limits -e -C daemon` >/dev/null 2>&1
X+
X ERROR=0
X ARGV="$@"
X if [ "x$ARGV" = "x" ] ; then 
X@@ -50,7 +52,7 @@
X     # check for pidfile
X     if [ -f $PIDFILE ] ; then
X 	PID=`cat $PIDFILE`
X-	if [ ! "x$PID" = "x" ] && kill -0 $PID; then
X+	if [ ! "x$PID" = "x" ] && kill -0 $PID > /dev/null 2>&1; then
X 	    STATUS="httpd (pid $PID) running"
X 	    RUNNING=1
X 	else
X@@ -82,6 +84,7 @@
X 	fi
X 	if kill $PID ; then
X 	    echo "$0 $ARG: httpd stopped"
X+	    rm $PIDFILE
X 	else
X 	    echo "$0 $ARG: httpd could not be stopped"
X 	    ERROR=4
END-of-./patches/patch-ak
echo x - ./patches/patch-al
sed 's/^X//' >./patches/patch-al << 'END-of-./patches/patch-al'
X*** src/support/log_server_status.orig	Tue Mar 31 16:53:50 1998
X--- src/support/log_server_status	Tue Apr 21 17:18:10 1998
X***************
X*** 67,76 ****
X  #
X  require 'sys/socket.ph';
X  
X! $wherelog = "/var/log/graph/";  # Logs will be like "/var/log/graph/960312"
X  $server = "localhost";          # Name of server, could be "www.foo.com"
X  $port = "80";                   # Port on server
X! $request = "/status/?auto";     # Request to send
X  
X  sub tcp_connect
X  {
X--- 67,76 ----
X  #
X  require 'sys/socket.ph';
X  
X! $wherelog = "/var/log/httpd-status-";  # Logs will be like "/var/log/graph/960312"
X  $server = "localhost";          # Name of server, could be "www.foo.com"
X  $port = "80";                   # Port on server
X! $request = "/server-status/?auto";     # Request to send
X  
X  sub tcp_connect
X  {
X***************
X*** 93,103 ****
X  ### Main
X  
X  {
X! 	$date=`date +%y%m%d:%H%M%S`;
X  	chop($date);
X  	($day,$time)=split(/:/,$date);
X  	$res=&tcp_connect($server,$port);
X! 	open(OUT,">>$wherelog$day");
X  	if ($res) {
X  		print OUT "$time:-1:-1:-1:-1:$res\n";
X  		exit 1;
X--- 93,103 ----
X  ### Main
X  
X  {
X! 	$date=`LC_TIME=C date +%y%m%d:%H%M%S`;
X  	chop($date);
X  	($day,$time)=split(/:/,$date);
X  	$res=&tcp_connect($server,$port);
X! 	open(OUT,">>$wherelog$day.log");
X  	if ($res) {
X  		print OUT "$time:-1:-1:-1:-1:$res\n";
X  		exit 1;
END-of-./patches/patch-al
echo x - ./patches/patch-aa
sed 's/^X//' >./patches/patch-aa << 'END-of-./patches/patch-aa'
X--- configure.orig	Sat Jan  2 16:19:41 1999
X+++ configure	Fri Jan 15 00:44:01 1999
X@@ -1012,8 +1012,8 @@
X     echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
X     echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
X     echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
X-    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
X-    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
X+    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log"
X+    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
X     echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
X     echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
X     echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
X@@ -1091,8 +1091,8 @@
X echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
X echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
X echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
X-echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
X-echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
X+echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci
X+echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
X echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
X echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
X echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
END-of-./patches/patch-aa
echo x - ./patches/patch-ac
sed 's/^X//' >./patches/patch-ac << 'END-of-./patches/patch-ac'
X--- src/Configure.orig	Sun Mar 21 08:07:24 1999
X+++ src/Configure	Fri Mar 26 00:57:25 1999
X@@ -454,7 +454,7 @@
X     	PLATOSVERS=`echo $PLAT | sed 's/^.*freebsd//'`
X 	OS="FreeBSD $PLATOSVERS"
X 	case "$PLATOSVERS" in
X-	    [23]*)
X+	    [234]*)
X 		DEF_WANTHSREGEX=no
X 		CFLAGS="$CFLAGS -funsigned-char"
X 		;;
X@@ -955,7 +955,7 @@
X 	    LDFLAGS_SHLIB_EXPORT=""
X 	    SHLIB_SUFFIX_DEPTH=2
X 	    ;;
X-	*-freebsd3*)
X+	*-freebsd[34]*)
X 	    CFLAGS_SHLIB="-fpic"
X 	    LDFLAGS_SHLIB="-Bshareable"
X 	    OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` 
END-of-./patches/patch-ac
exit
Comment 1 Steve Price freebsd_committer freebsd_triage 1999-05-03 04:55:47 UTC 
State Changed
From-To: open->closed

New port committed, thanks!