Date: Sat, 04 May 2002 13:03:34 +0200 From: Jens Rehsack <rehsack@liwing.de> To: Dominic Marks <dominic_marks@btinternet.com> Cc: ache@freebsd.org, ports@FreeBSD.org Subject: Re: FreeBSD Port: apache-1.3.24_2 Message-ID: <3CD3C006.DCB42156@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>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------941E2D5852FCC8951206B6C2
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
I decided to resend the unified diff's now, because I'm supposable a
little bit tired around 3am CET:-)
Jens
Dominic Marks wrote:
>
> On Sat, May 04, 2002 at 02:31:09AM +0100, Dominic Marks wrote:
> > On Sat, May 04, 2002 at 12:18:04AM +0200, Jens Rehsack wrote:
> >
> > <snip/>
> >
> > TIP:
> > Use of unified diff format is to be encouraged. diff -u, cvs diff -u.
> >
> > <snip/>
> >
> > --
> > Dominic
> >
> > To Unsubscribe: send mail to majordomo@FreeBSD.org
> > with "unsubscribe freebsd-ports" in the body of the message
>
> Sorry, meant to send this just to Jens.
>
> --
> Dominic
--
L i W W W i Jens Rehsack
L W W W
L i W W W W i nnn gggg LiWing IT-Services
L i W W W W i n n g g
LLLL i W W i n n g g Friesenstraße 2
gggg 06112 Halle
g
g g
Tel.: +49 - 3 45 - 5 17 05 91 ggg e-Mail: <rehsack@liwing.de>
Fax: +49 - 3 45 - 5 17 05 92 http://www.liwing.de/
--------------941E2D5852FCC8951206B6C2
Content-Type: text/plain; charset=us-ascii;
name="Makefile.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="Makefile.diff"
--- Makefile.port Thu Apr 25 05:31:30 2002
+++ Makefile.new Sat May 4 00:14:24 2002
@@ -31,6 +31,33 @@
MAINTAINER= ache@freebsd.org
+DATADIR?= ${PREFIX}/www
+DOCUMENT_ROOT?= ${DATADIR}/htdocs
+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=${PORT}
+.endif
+
+.if defined(SYSCONF_DIR)
+CONFIGURE_ARGS+= \
+ --sysconfdir=${SYSCONF_DIR}
+#OPTIM+= -DSERVER_CONFIG_FILE=\\"${SYSCONF_DIR}/httpd.conf\\"
.endif
#
--------------941E2D5852FCC8951206B6C2
Content-Type: text/plain; charset=us-ascii;
name="apache.sh.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="apache.sh.diff"
--- apache.sh.old Mon Apr 22 03:26:12 2002
+++ apache.sh Sat May 4 00:18:01 2002
@@ -2,10 +2,23 @@
case "$1" in
start)
- [ -x %%PREFIX%%/sbin/apachectl ] && %%PREFIX%%/sbin/apachectl start > /dev/null && echo -n ' apache'
+ touch /var/log/httpd-access.log
+ chmod 600 /var/log/httpd-access.log
+ chown www:www /var/log/httpd-access.log
+ touch /var/log/httpd-error.log
+ chmod 600 /var/log/httpd-error.log
+ chown www:www /var/log/httpd-error.log
+ touch /var/run/httpd.pid
+ chmod 600 /var/run/httpd.pid
+ chown www:www /var/run/httpd.pid
+ [ -x /usr/local/sbin/apachectl ] && {
+ su -m www -c \
+ '/usr/local/sbin/apachectl start > /dev/null'
+ echo -n ' apache'
+ }
;;
stop)
- [ -r /var/run/httpd.pid ] && %%PREFIX%%/sbin/apachectl stop > /dev/null && echo -n ' apache'
+ [ -r /var/run/httpd.pid ] && /usr/local/sbin/apachectl stop > /dev/null && echo -n ' apache'
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2
--------------941E2D5852FCC8951206B6C2--
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?3CD3C006.DCB42156>