Date: Sun, 5 May 2002 02:47:53 +0400 From: "Andrey A. Chernov" <ache@nagual.pp.ru> To: Jens Rehsack <rehsack@liwing.de> Cc: Dominic Marks <dominic_marks@btinternet.com>, ports@freebsd.org Subject: Re: FreeBSD Port: apache-1.3.24_2 Message-ID: <20020504224752.GA14170@nagual.pp.ru> In-Reply-To: <3CD439E0.C491F808@liwing.de> References: <3CD30C9C.BBFA5DC5@liwing.de> <20020504023109.B921@host217-41-52-202.in-addr.btope> <20020504023327.D921@host217-41-52-202.in-addr.btope> <3CD3C006.DCB42156@liwing.de> <20020504181251.GA11045@nagual.pp.ru> <3CD439E0.C491F808@liwing.de>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, May 04, 2002 at 21:43:28 +0200, Jens Rehsack wrote: > > I attach the new one (Makefile + Makefile.diff) And please rename all variables using APACHE_* and WITH_APACHE_* prefixes not only to eliminate potential conflicts but to allow all Apache port variables appearse as single block in /etc/make.conf > This must not be - I send a possible solution. Jails may be another one. You create bug with /var/run/httpd.pid and /var/run/httpd.lock.* processing using that way. Also please remove all /var/log/httpd*log touching from apache.sh. Log file names can be easily changed in httpd.conf and we can't just force users to fix them additionly in another place in apache.sh too. Also please note that lower user pid is 1000 for FreeBSD, not 100 > # Date created: Fri Aug 25 16:42:36 CDT 1995 > # Whom: ache@freebsd.org > # > # $FreeBSD: ports/www/apache13/Makefile,v 1.111 2002/04/24 13:41:36 ache Exp $ > # > > PORTNAME= apache > PORTVERSION= 1.3.24 > PORTREVISION= 2 > CATEGORIES= www > MASTER_SITES= http://www.apache.org/dist/httpd/ \ > ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \ > ftp://ftp.rge.com/pub/infosystems/apache/dist/httpd/ \ > ftp://apache.compuex.com/pub/apache/dist/httpd/ \ > ftp://apache.arctic.org/pub/apache/dist/httpd/ \ > ftp://ftp.epix.net/pub/apache/dist/httpd/ \ > ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/httpd/ \ > ftp://ftp.connectnet.com/pub/www/apache/httpd/ \ > ftp://apache.technomancer.com/mirrors/apache/dist/httpd/ \ > ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \ > ftp://www3.service.digital.com/apache/dist/httpd/ \ > ftp://galileo.galilei.com/pub/apache/httpd/ \ > ftp://ftp.mtnranch.net/pub/apache/dist/httpd/ \ > ftp://ftp.iodynamics.com/pub/mirror/apache/dist/httpd/ \ > ftp://apache.nextpath.com/pub/apache/dist/httpd/ > DISTNAME= apache_${PORTVERSION} > > #PATCH_SITES= ${MASTER_SITES} > #PATCHFILES= apache_${PORTVERSION}-fix.diff > > MAINTAINER= ache@freebsd.org > > DATADIR?= ${PREFIX}/www > DOCUMENT_ROOT?= ${DATADIR}/data > SUEXEC_ROOT?= ${DATADIR} > SYSCONF_DIR?= ${PREFIX}/etc/apache > > .if defined(WITH_SUEXEC) && ${WITH_SUEXEC} == YES > SUEXEC_UID_MIN?=100 > SUEXEC_GID_MIN?=100 > > SUEXEC_CONF= --enable-suexec \ > --suexec-docroot=${SUEXEC_ROOT} \ > --suexec-caller=www \ > --suexec-uidmin=${SUEXEC_UID_MIN} \ > --suexec-gidmin=${SUEXEC_GID_MIN} > > .if defined(SUEXEC_UMASK) > SUEXEC_CONF+= --suexec-umask=${SUEXEC_UMASK} > .endif > > .if defined(SUEXEC_SAFEPATH) > SUEXEC_CONF+= --suexec-safepath=${SUEXEC_SAFEPATH} > .endif > > .else > SUEXEC_CONF= --suexec-docroot=${SUEXEC_ROOT} > .endif > > HAS_CONFIGURE= yes > # += for child ports > CONFIGURE_ARGS+= \ > --prefix=${PREFIX} \ > --server-uid=www \ > --server-gid=www \ > --with-perl=${PERL} \ > --with-layout=FreeBSD \ > --without-confadjust \ > --enable-module=most \ > --enable-module=auth_db \ > --enable-module=mmap_static \ > --disable-module=auth_dbm \ > --enable-shared=max \ > --datadir=${DATADIR} \ > --htdocsdir=${DOCUMENT_ROOT} \ > ${SUEXEC_CONF} > > > OPTIM= -DDOCUMENT_LOCATION=\\"${DOCUMENT_ROOT}\\" \ > -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" > > # > # Set APACHE_HARD_SERVER_LIMIT env. variable to desired value > # > .if defined(APACHE_HARD_SERVER_LIMIT) > OPTIM+= -DHARD_SERVER_LIMIT=${APACHE_HARD_SERVER_LIMIT} > .else > OPTIM+= -DHARD_SERVER_LIMIT=512 > .endif > > # required by www/mod_perl > .if defined(LARGEFILE_SOURCE) > CFLAGS+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 > .endif > > .if defined(LISTEN_PORT) > CONFIGURE_ARGS+= \ > --with-port=${LISTEN_PORT} > .endif > > .if defined(SYSCONF_DIR) > CONFIGURE_ARGS+= \ > --sysconfdir=${SYSCONF_DIR} > #OPTIM+= -DSERVER_CONFIG_FILE=\\"${SYSCONF_DIR}/httpd.conf\\" > .endif > > # > # Set WITH_APACHE_PERF_TUNING env. variable to YES to get maximum performance > # > .if defined(WITH_APACHE_PERF_TUNING) && ${WITH_APACHE_PERF_TUNING} == YES > OPTIM+= -DBUFFERED_LOGS > CFLAGS+= -O6 -fomit-frame-pointer > .endif > > CONFIGURE_ENV= OPTIM='${OPTIM}' LD_SHLIB='${CC}' > > MAN1= dbmmanage.1 htdigest.1 htpasswd.1 > MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 > > post-extract: > @${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/apache.sh \ > > ${WRKSRC}/apache.sh > > pre-install: > PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL > > post-install: > @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ > ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ > ${INSTALL_SCRIPT} -m 751 ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \ > fi > @${CAT} ${PKGMESSAGE} > > .include <bsd.port.mk> > --- Makefile.port Thu Apr 25 05:31:30 2002 > +++ Makefile Sat May 4 19:27:26 2002 > @@ -31,6 +31,33 @@ > > MAINTAINER= ache@freebsd.org > > +DATADIR?= ${PREFIX}/www > +DOCUMENT_ROOT?= ${DATADIR}/data > +SUEXEC_ROOT?= ${DATADIR} > +SYSCONF_DIR?= ${PREFIX}/etc/apache > + > +.if defined(WITH_SUEXEC) && ${WITH_SUEXEC} == YES > +SUEXEC_UID_MIN?=100 > +SUEXEC_GID_MIN?=100 > + > +SUEXEC_CONF= --enable-suexec \ > + --suexec-docroot=${SUEXEC_ROOT} \ > + --suexec-caller=www \ > + --suexec-uidmin=${SUEXEC_UID_MIN} \ > + --suexec-gidmin=${SUEXEC_GID_MIN} > + > +.if defined(SUEXEC_UMASK) > +SUEXEC_CONF+= --suexec-umask=${SUEXEC_UMASK} > +.endif > + > +.if defined(SUEXEC_SAFEPATH) > +SUEXEC_CONF+= --suexec-safepath=${SUEXEC_SAFEPATH} > +.endif > + > +.else > +SUEXEC_CONF= --suexec-docroot=${SUEXEC_ROOT} > +.endif > + > HAS_CONFIGURE= yes > # += for child ports > CONFIGURE_ARGS+= \ > @@ -39,15 +66,18 @@ > --server-gid=www \ > --with-perl=${PERL} \ > --with-layout=FreeBSD \ > - --suexec-docroot=${PREFIX}/www/data \ > --without-confadjust \ > --enable-module=most \ > --enable-module=auth_db \ > --enable-module=mmap_static \ > --disable-module=auth_dbm \ > - --enable-shared=max > + --enable-shared=max \ > + --datadir=${DATADIR} \ > + --htdocsdir=${DOCUMENT_ROOT} \ > + ${SUEXEC_CONF} > > -OPTIM= -DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \ > + > +OPTIM= -DDOCUMENT_LOCATION=\\"${DOCUMENT_ROOT}\\" \ > -DDEFAULT_PATH=\\"/bin:/usr/bin:${PREFIX}/bin\\" > > # > @@ -57,6 +87,22 @@ > OPTIM+= -DHARD_SERVER_LIMIT=${APACHE_HARD_SERVER_LIMIT} > .else > OPTIM+= -DHARD_SERVER_LIMIT=512 > +.endif > + > +# required by www/mod_perl > +.if defined(LARGEFILE_SOURCE) > +CFLAGS+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 > +.endif > + > +.if defined(LISTEN_PORT) > +CONFIGURE_ARGS+= \ > + --with-port=${LISTEN_PORT} > +.endif > + > +.if defined(SYSCONF_DIR) > +CONFIGURE_ARGS+= \ > + --sysconfdir=${SYSCONF_DIR} > +#OPTIM+= -DSERVER_CONFIG_FILE=\\"${SYSCONF_DIR}/httpd.conf\\" > .endif > > # -- Andrey A. Chernov http://ache.pp.ru/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020504224752.GA14170>