summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/apache/Makefile14
-rw-r--r--www/apache6/Makefile54
-rw-r--r--www/apache6/distinfo4
-rw-r--r--www/apache6/files/apache.sh7
-rw-r--r--www/apache6/files/config.layout20
-rw-r--r--www/apache6/patches/patch-ab6
-rw-r--r--www/apache6/pkg/DEINSTALL6
-rw-r--r--www/apache6/pkg/DESCR4
8 files changed, 63 insertions, 52 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 20ee9a75eec..5799d5fe0bf 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2001/04/29 20:42:28 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2001/04/29 21:21:13 jlam Exp $
#
# This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
# code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -8,22 +8,22 @@ PKGNAME= apache-1.3.19nb1
CATEGORIES= www
MASTER_SITES= http://httpd.apache.org/dist/httpd/ \
http://www.apache.de/dist/httpd/ \
- http://www.modssl.org/source/ \
- ftp://ftp.uni-trier.de/pub/unix/security/mod_ssl/source/ \
http://www.netbsd.org/images/logos/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- ${MODSSL_DISTNAME}${EXTRACT_SUFX} \
sitedrivenby.gif
+MASTER_SITES+= http://www.modssl.org/source/ \
+ ftp://ftp.uni-trier.de/pub/unix/security/mod_ssl/source/
+DISTFILES+= ${MODSSL_DISTNAME}${EXTRACT_SUFX}
+MODSSL_DISTNAME= mod_ssl-2.8.2-1.3.19
+MODSSL_SRC= ${WRKDIR}/${MODSSL_DISTNAME}
+
MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://httpd.apache.org/
COMMENT= HTTP (Web) server
CONFLICTS= apache-*modssl-* apache6-*
-MODSSL_DISTNAME= mod_ssl-2.8.2-1.3.19
-MODSSL_SRC= ${WRKDIR}/${MODSSL_DISTNAME}
-
EXTRACT_ONLY= ${DISTFILES:N*.gif}
HAS_CONFIGURE= # defined
CONFIGURE_ARGS+= --with-layout="${WRKDIR}/config.layout:pkgsrc"
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 437ce8af2b3..c5514a8a02b 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,12 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2001/04/14 19:50:05 kim Exp $
-#
-# The fourth number in the PKGNAME version indicates a NetBSD pkg revision
-# (to indicate changes in the shipped third party patches such as the mod_ssl
-# EAPI when there has been no change to the Apache version number).
+# $NetBSD: Makefile,v 1.29 2001/04/29 21:21:13 jlam Exp $
#
# This package does not compile in mod_ssl support hooks, as it conflicts
-# with IPv6 enable patch.
-# IPv6 enable patch conflicts with third-party modules anyway, due to
+# with IPv6-enable patch.
+#
+# IPv6-enable patch conflicts with third-party modules anyway, due to
# sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs)
#
@@ -14,32 +11,26 @@ DISTNAME= apache_1.3.19
PKGNAME= apache6-1.3.19
CATEGORIES= www
MASTER_SITES= http://httpd.apache.org/dist/httpd/ \
+ http://www.apache.de/dist/httpd/ \
http://www.netbsd.org/images/logos/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
sitedrivenby.gif
-# IPv6 patch, needs -p1
+
MASTER_SITES+= ftp://ftp.kame.net/pub/kame/misc/
-DISTFILES+= apache-1.3.19-v6-20010301a.diff.gz
+DISTFILES+= ${IPV6_PATCH}
+IPV6_PATCH= apache-1.3.19-v6-20010301a.diff.gz
+PATCH_DIST_STRIP= -p1 # IPv6 patch needs -p1
-MAINTAINER= jlam@netbsd.org
+MAINTAINER= itojun@netbsd.org
HOMEPAGE= http://httpd.apache.org/
-COMMENT= HTTP (Web) server, with IPv6 support
+COMMENT= HTTP (Web) server with IPv6 support
-CONFLICTS= apache-*modssl-* apache6-*
-CONFLICTS= apache-*
+CONFLICTS= apache-* apache-*modssl-* apache6-*
EXTRACT_ONLY= ${DISTFILES:N*.gif:N*.diff.gz}
HAS_CONFIGURE= # defined
CONFIGURE_SCRIPT= ${WRKSRC}/configure.v6
-CONFIGURE_ARGS+= --prefix=${PREFIX} \
- --sbindir=${PREFIX}/sbin \
- --libexecdir=${PREFIX}/lib/httpd \
- --datadir=${PREFIX}/share/httpd \
- --cgidir=${PREFIX}/libexec/cgi-bin \
- --includedir=${PREFIX}/include/httpd \
- --runtimedir=/var/run \
- --logfiledir=/var/log/httpd \
- --proxycachedir=/var/spool/httpd/proxy
+CONFIGURE_ARGS+= --with-layout="${WRKDIR}/config.layout:pkgsrc"
CONFIGURE_ARGS+= --enable-module=most \
--enable-module=auth_db \
--disable-module=auth_dbm
@@ -56,7 +47,6 @@ IGNORE= "IPv6 only build"
.endif
APACHE_SYSCONFDIR?= ${LOCALBASE}/etc/httpd
-CONFIGURE_ARGS+= --sysconfdir=${APACHE_SYSCONFDIR}
BUILD_DEFS+= APACHE_SYSCONFDIR
.if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
@@ -105,19 +95,23 @@ pre-patch:
${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \;
post-patch:
- for i in apache-1.3.19-v6-20010301a.diff.gz; do \
- ${GZCAT} ${_DISTDIR}/$$i | \
- ${PATCH} ${PATCH_DIST_ARGS:C/-p0/-p1/} \
- || ( ${ECHO} Patch $$i failed ; exit 1 ) ; \
+ for file in ${IPV6_PATCH}; do \
+ ${GZCAT} ${_DISTDIR}/$${file} | \
+ ${PATCH} ${PATCH_DIST_ARGS} \
+ || ( ${ECHO} "Patch $${file} failed" ; exit 1 ) ; \
done
${CHMOD} +x ${CONFIGURE_SCRIPT}
-post-build:
- ${SED} -e "s,@PREFIX@,${PREFIX},g" \
- ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
+pre-configure:
+ ${SED} -e "s|@PREFIX@|${PREFIX}|g" \
+ -e "s|@APACHE_SYSCONFDIR@|${APACHE_SYSCONFDIR}|g" \
+ ${FILESDIR}/config.layout > ${WRKDIR}/config.layout
pre-install:
${FIND} ${WRKSRC}/htdocs -name '*.orig' -exec ${RM} -f {} \;
+ ${SED} -e "s|@PREFIX@|${PREFIX}|g" \
+ -e "s|@APACHE_SYSCONFDIR@|${APACHE_SYSCONFDIR}|g" \
+ ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
${SED} -e "s|@CAT@|${CAT}|g" \
-e "s|@RM@|${RM}|g" \
-e "s|@RMDIR@|${RMDIR}|g" \
diff --git a/www/apache6/distinfo b/www/apache6/distinfo
index 36fbc24cd3e..828229747c8 100644
--- a/www/apache6/distinfo
+++ b/www/apache6/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:02:33 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/04/29 21:21:13 jlam Exp $
SHA1 (apache_1.3.19.tar.gz) = 2cc8d431ef9eb1037f876394fef4aecb83948501
Size (apache_1.3.19.tar.gz) = 1928677 bytes
@@ -7,7 +7,7 @@ Size (sitedrivenby.gif) = 8519 bytes
SHA1 (apache-1.3.19-v6-20010301a.diff.gz) = 6a859aad911613f110bbb4a4572929da8d7758eb
Size (apache-1.3.19-v6-20010301a.diff.gz) = 57203 bytes
SHA1 (patch-aa) = 0048d2cc0c96626f84e44192aca29256e9f30f72
-SHA1 (patch-ab) = f98ae8a686f66f1c0488ae08278d0388211aebb0
+SHA1 (patch-ab) = 18c07600171218432ac9f4e510722d20f72d39a9
SHA1 (patch-ac) = 4c18bb80f3fbe8d44c941e403ff10fd92b820785
SHA1 (patch-ae) = 2e4e7aab1cff7ddc82697946eeb8d13cd3aa1df0
SHA1 (patch-af) = 78d0f26131c1000f45a072d55b1c82806c4e5ddf
diff --git a/www/apache6/files/apache.sh b/www/apache6/files/apache.sh
index 7606b04545a..5bb2bd66153 100644
--- a/www/apache6/files/apache.sh
+++ b/www/apache6/files/apache.sh
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: apache.sh,v 1.6 2001/02/07 15:11:18 tron Exp $
+# $NetBSD: apache.sh,v 1.7 2001/04/29 21:21:13 jlam Exp $
#
# PROVIDE: apache
# REQUIRE: DAEMON
@@ -9,14 +9,13 @@ name="apache"
ctl_command="@PREFIX@/sbin/apachectl"
command="@PREFIX@/sbin/httpd"
pidfile="/var/run/httpd.pid"
-conffile="@PREFIX@/etc/httpd/httpd.conf"
apache_start="start"
-if [ -f @PREFIX@/etc/httpd/apache_start.conf ]
+if [ -f @APACHE_SYSCONFDIR@/apache_start.conf ]
then
# This file can reset apache_start to "startssl"
- . @PREFIX@/etc/httpd/apache_start.conf
+ . @APACHE_SYSCONFDIR@/apache_start.conf
fi
cmd=${1:-start}
diff --git a/www/apache6/files/config.layout b/www/apache6/files/config.layout
new file mode 100644
index 00000000000..eb4fb4f8082
--- /dev/null
+++ b/www/apache6/files/config.layout
@@ -0,0 +1,20 @@
+# $NetBSD: config.layout,v 1.1 2001/04/29 21:21:14 jlam Exp $
+
+<Layout pkgsrc>
+prefix: @PREFIX@
+exec_prefix: @PREFIX@
+bindir: ${exec_prefix}/bin
+sbindir: ${exec_prefix}/sbin
+libexecdir: ${exec_prefix}/lib/httpd
+mandir: ${prefix}/man
+sysconfdir: @APACHE_SYSCONFDIR@
+datadir: ${prefix}/share/httpd
+iconsdir: ${prefix}/share/httpd/icons
+htdocsdir: ${prefix}/share/httpd/htdocs
+cgidir: ${exec_prefix}/libexec/cgi-bin
+includedir: ${prefix}/include/httpd
+localstatedir: /var/run
+runtimedir: /var/run
+logfiledir: /var/log/httpd
+proxycachedir: /var/spool/httpd/proxy
+</Layout>
diff --git a/www/apache6/patches/patch-ab b/www/apache6/patches/patch-ab
index 9ce3428f8b0..6becde22568 100644
--- a/www/apache6/patches/patch-ab
+++ b/www/apache6/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2001/02/06 10:58:18 itojun Exp $
+$NetBSD: patch-ab,v 1.4 2001/04/29 21:21:14 jlam Exp $
--- conf/httpd.conf-dist.orig Tue Feb 6 19:40:11 2001
+++ conf/httpd.conf-dist Tue Feb 6 19:42:15 2001
-@@ -204,7 +204,14 @@
+@@ -204,7 +204,12 @@
# the order below without expert advice.
#
# Example:
@@ -10,8 +10,6 @@ $NetBSD: patch-ab,v 1.3 2001/02/06 10:58:18 itojun Exp $
+# LoadModule foo_module lib/httpd/mod_foo.so
+
+<IfDefine SSL>
-+LoadFile !libcrypto.so
-+LoadFile !libssl.so
+LoadModule ssl_module lib/httpd/mod_ssl.so
+AddModule mod_ssl.c
+</IfDefine>
diff --git a/www/apache6/pkg/DEINSTALL b/www/apache6/pkg/DEINSTALL
index d8aaa0373a7..0c57cef7655 100644
--- a/www/apache6/pkg/DEINSTALL
+++ b/www/apache6/pkg/DEINSTALL
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: DEINSTALL,v 1.2 2001/04/14 19:42:54 kim Exp $
+# $NetBSD: DEINSTALL,v 1.3 2001/04/29 21:21:14 jlam Exp $
PKGNAME=$1
STAGE=$2
@@ -84,7 +84,7 @@ EOF
EOF
for file in ${modified_files}
do
- echo " ${file}"
+ echo " ${file}"
done
fi
if [ -n "${existing_dirs}" ]
@@ -96,7 +96,7 @@ EOF
EOF
for dir in ${existing_dirs}
do
- echo " ${dir}"
+ echo " ${dir}"
done
fi
${CAT} << EOF
diff --git a/www/apache6/pkg/DESCR b/www/apache6/pkg/DESCR
index 31caded3fc1..26ec3e1be49 100644
--- a/www/apache6/pkg/DESCR
+++ b/www/apache6/pkg/DESCR
@@ -2,5 +2,5 @@ The Apache HTTP Server Project is a collaborative software development
effort aimed at creating a robust, commercial-grade, featureful, and
freely-available source code implementation of an HTTP (Web) server.
-This package is IPv6 ready. Apache module API is slightly modified
-so some of third-party modules may not work.
+This package is IPv6 ready. The Apache module API is slightly modified,
+so some third-party modules may not work.
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 19:56:42 +0000