summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorHye-Shik Chang <perky@FreeBSD.org>2002-06-27 00:22:40 +0000
committerHye-Shik Chang <perky@FreeBSD.org>2002-06-27 00:22:40 +0000
commitd1eb2ba3f9e53a854a88133003458e10460b19aa (patch)
tree23feb61a278fef459d15654c19fe517241f3f232 /www
parentFixed bad patch. Missed it when we moved to the rerolled tarball apparently. (diff)
o Fix the htpasswd logic bug around -c and -n options
o Take away WITH_BUNDLED_EXPAT option (use textproc/expat2) o Bump PORTREVISION Prompted by: Jon Noack <noackjr@rice.edu> (htpasswd) Obtained from: Apache Project's CVS (htpasswd)
Notes
Notes: svn path=/head/; revision=62064
Diffstat (limited to '')
-rw-r--r--www/apache2/Makefile16
-rw-r--r--www/apache2/files/patch-support:htpasswd.c11
-rw-r--r--www/apache2/pkg-plist6
-rw-r--r--www/apache20/Makefile16
-rw-r--r--www/apache20/files/patch-support:htpasswd.c11
-rw-r--r--www/apache20/pkg-plist6
-rw-r--r--www/apache21/Makefile16
-rw-r--r--www/apache21/files/patch-support:htpasswd.c11
-rw-r--r--www/apache21/pkg-plist6
-rw-r--r--www/apache22/Makefile16
-rw-r--r--www/apache22/files/patch-support:htpasswd.c11
-rw-r--r--www/apache22/pkg-plist6
12 files changed, 60 insertions, 72 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 1503ee0a4510..25fb8c3c2d73 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apache
PORTVERSION= 2.0.39
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www ipv6
MASTER_SITES= http://www.apache.org/dist/httpd/ \
http://apache.mirrorcentral.com/dist/httpd/ \
@@ -23,6 +23,8 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER?= perky@fallin.lv
+LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
+
LATEST_LINK= apache2
WITH_MPM?= prefork # or worker, perchild
@@ -37,6 +39,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--enable-so \
--with-mpm=${WITH_MPM} \
--with-port=${HTTP_PORT} \
+ --with-expat=${LOCALBASE} \
--libdir=${PREFIX_RELDEST}/lib/apache2 \
--includedir=${PREFIX_RELDEST}/include/apache2
CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
@@ -50,15 +53,6 @@ MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes
MAKE_ENV+= -DNOPORTDOCS
.endif
-.if !defined(WITHOUT_BUNDLED_EXPAT)
-EXPAT_PATHS= xml/expat-cvs xml/expat $$srcdir/xml/expat
-PLIST_SUB+= EXPAT=""
-.else
-LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
-EXPAT_PATHS= ${LOCALBASE} ${PREFIX} ${LOCALBASE:S,^${DESTDIR},,}
-PLIST_SUB+= EXPAT="@comment "
-.endif
-
.if defined(WITH_SUEXEC)
SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
SUEXEC_USERDIR?= public_html
@@ -132,8 +126,6 @@ post-patch:
${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\
ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
); done
- @${REINPLACE_CMD} -e 's,/usr .*/xml/expat,${EXPAT_PATHS},g' \
- ${WRKSRC}/srclib/apr-util/configure
@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
diff --git a/www/apache2/files/patch-support:htpasswd.c b/www/apache2/files/patch-support:htpasswd.c
new file mode 100644
index 000000000000..3267c08e9c31
--- /dev/null
+++ b/www/apache2/files/patch-support:htpasswd.c
@@ -0,0 +1,11 @@
+--- support/htpasswd.c 2002/06/18 02:58:36 1.48
++++ support/htpasswd.c 2002/06/19 17:31:19 1.49
+@@ -375,7 +375,7 @@
+ }
+ }
+
+- if (*mask & (APHTP_NEWFILE | APHTP_NOFILE)) {
++ if ((*mask & APHTP_NEWFILE) && (*mask & APHTP_NOFILE)) {
+ apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
+ exit(ERR_SYNTAX);
+ }
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index 297d23c2551d..29da7ea06294 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -78,7 +78,6 @@ include/apache2/apr_xlate.h
include/apache2/apr_xml.h
include/apache2/apu.h
include/apache2/apu_compat.h
-%%EXPAT%%include/apache2/expat.h
include/apache2/http_config.h
include/apache2/http_connection.h
include/apache2/http_core.h
@@ -131,11 +130,6 @@ lib/apache2/libaprutil.la
lib/apache2/libaprutil.so.0
@unexec rm -f %D/lib/apache2/libaprutil.so
@exec ln -fs libaprutil.so.0 %D/lib/apache2/libaprutil.so
-%%EXPAT%%lib/apache2/libexpat.a
-%%EXPAT%%lib/apache2/libexpat.la
-%%EXPAT%%lib/apache2/libexpat.so.1
-%%EXPAT%%@unexec rm -f %D/lib/apache2/libexpat.so
-%%EXPAT%%@exec ln -fs libexpat.so.1 %D/lib/apache2/libexpat.so
libexec/apache2/httpd.exp
libexec/apache2/mod_access.so
libexec/apache2/mod_actions.so
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 1503ee0a4510..25fb8c3c2d73 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apache
PORTVERSION= 2.0.39
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www ipv6
MASTER_SITES= http://www.apache.org/dist/httpd/ \
http://apache.mirrorcentral.com/dist/httpd/ \
@@ -23,6 +23,8 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER?= perky@fallin.lv
+LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
+
LATEST_LINK= apache2
WITH_MPM?= prefork # or worker, perchild
@@ -37,6 +39,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--enable-so \
--with-mpm=${WITH_MPM} \
--with-port=${HTTP_PORT} \
+ --with-expat=${LOCALBASE} \
--libdir=${PREFIX_RELDEST}/lib/apache2 \
--includedir=${PREFIX_RELDEST}/include/apache2
CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
@@ -50,15 +53,6 @@ MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes
MAKE_ENV+= -DNOPORTDOCS
.endif
-.if !defined(WITHOUT_BUNDLED_EXPAT)
-EXPAT_PATHS= xml/expat-cvs xml/expat $$srcdir/xml/expat
-PLIST_SUB+= EXPAT=""
-.else
-LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
-EXPAT_PATHS= ${LOCALBASE} ${PREFIX} ${LOCALBASE:S,^${DESTDIR},,}
-PLIST_SUB+= EXPAT="@comment "
-.endif
-
.if defined(WITH_SUEXEC)
SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
SUEXEC_USERDIR?= public_html
@@ -132,8 +126,6 @@ post-patch:
${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\
ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
); done
- @${REINPLACE_CMD} -e 's,/usr .*/xml/expat,${EXPAT_PATHS},g' \
- ${WRKSRC}/srclib/apr-util/configure
@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
diff --git a/www/apache20/files/patch-support:htpasswd.c b/www/apache20/files/patch-support:htpasswd.c
new file mode 100644
index 000000000000..3267c08e9c31
--- /dev/null
+++ b/www/apache20/files/patch-support:htpasswd.c
@@ -0,0 +1,11 @@
+--- support/htpasswd.c 2002/06/18 02:58:36 1.48
++++ support/htpasswd.c 2002/06/19 17:31:19 1.49
+@@ -375,7 +375,7 @@
+ }
+ }
+
+- if (*mask & (APHTP_NEWFILE | APHTP_NOFILE)) {
++ if ((*mask & APHTP_NEWFILE) && (*mask & APHTP_NOFILE)) {
+ apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
+ exit(ERR_SYNTAX);
+ }
diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index 297d23c2551d..29da7ea06294 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -78,7 +78,6 @@ include/apache2/apr_xlate.h
include/apache2/apr_xml.h
include/apache2/apu.h
include/apache2/apu_compat.h
-%%EXPAT%%include/apache2/expat.h
include/apache2/http_config.h
include/apache2/http_connection.h
include/apache2/http_core.h
@@ -131,11 +130,6 @@ lib/apache2/libaprutil.la
lib/apache2/libaprutil.so.0
@unexec rm -f %D/lib/apache2/libaprutil.so
@exec ln -fs libaprutil.so.0 %D/lib/apache2/libaprutil.so
-%%EXPAT%%lib/apache2/libexpat.a
-%%EXPAT%%lib/apache2/libexpat.la
-%%EXPAT%%lib/apache2/libexpat.so.1
-%%EXPAT%%@unexec rm -f %D/lib/apache2/libexpat.so
-%%EXPAT%%@exec ln -fs libexpat.so.1 %D/lib/apache2/libexpat.so
libexec/apache2/httpd.exp
libexec/apache2/mod_access.so
libexec/apache2/mod_actions.so
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 1503ee0a4510..25fb8c3c2d73 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apache
PORTVERSION= 2.0.39
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www ipv6
MASTER_SITES= http://www.apache.org/dist/httpd/ \
http://apache.mirrorcentral.com/dist/httpd/ \
@@ -23,6 +23,8 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER?= perky@fallin.lv
+LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
+
LATEST_LINK= apache2
WITH_MPM?= prefork # or worker, perchild
@@ -37,6 +39,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--enable-so \
--with-mpm=${WITH_MPM} \
--with-port=${HTTP_PORT} \
+ --with-expat=${LOCALBASE} \
--libdir=${PREFIX_RELDEST}/lib/apache2 \
--includedir=${PREFIX_RELDEST}/include/apache2
CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
@@ -50,15 +53,6 @@ MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes
MAKE_ENV+= -DNOPORTDOCS
.endif
-.if !defined(WITHOUT_BUNDLED_EXPAT)
-EXPAT_PATHS= xml/expat-cvs xml/expat $$srcdir/xml/expat
-PLIST_SUB+= EXPAT=""
-.else
-LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
-EXPAT_PATHS= ${LOCALBASE} ${PREFIX} ${LOCALBASE:S,^${DESTDIR},,}
-PLIST_SUB+= EXPAT="@comment "
-.endif
-
.if defined(WITH_SUEXEC)
SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
SUEXEC_USERDIR?= public_html
@@ -132,8 +126,6 @@ post-patch:
${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\
ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
); done
- @${REINPLACE_CMD} -e 's,/usr .*/xml/expat,${EXPAT_PATHS},g' \
- ${WRKSRC}/srclib/apr-util/configure
@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
diff --git a/www/apache21/files/patch-support:htpasswd.c b/www/apache21/files/patch-support:htpasswd.c
new file mode 100644
index 000000000000..3267c08e9c31
--- /dev/null
+++ b/www/apache21/files/patch-support:htpasswd.c
@@ -0,0 +1,11 @@
+--- support/htpasswd.c 2002/06/18 02:58:36 1.48
++++ support/htpasswd.c 2002/06/19 17:31:19 1.49
+@@ -375,7 +375,7 @@
+ }
+ }
+
+- if (*mask & (APHTP_NEWFILE | APHTP_NOFILE)) {
++ if ((*mask & APHTP_NEWFILE) && (*mask & APHTP_NOFILE)) {
+ apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
+ exit(ERR_SYNTAX);
+ }
diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index 297d23c2551d..29da7ea06294 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -78,7 +78,6 @@ include/apache2/apr_xlate.h
include/apache2/apr_xml.h
include/apache2/apu.h
include/apache2/apu_compat.h
-%%EXPAT%%include/apache2/expat.h
include/apache2/http_config.h
include/apache2/http_connection.h
include/apache2/http_core.h
@@ -131,11 +130,6 @@ lib/apache2/libaprutil.la
lib/apache2/libaprutil.so.0
@unexec rm -f %D/lib/apache2/libaprutil.so
@exec ln -fs libaprutil.so.0 %D/lib/apache2/libaprutil.so
-%%EXPAT%%lib/apache2/libexpat.a
-%%EXPAT%%lib/apache2/libexpat.la
-%%EXPAT%%lib/apache2/libexpat.so.1
-%%EXPAT%%@unexec rm -f %D/lib/apache2/libexpat.so
-%%EXPAT%%@exec ln -fs libexpat.so.1 %D/lib/apache2/libexpat.so
libexec/apache2/httpd.exp
libexec/apache2/mod_access.so
libexec/apache2/mod_actions.so
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 1503ee0a4510..25fb8c3c2d73 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apache
PORTVERSION= 2.0.39
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www ipv6
MASTER_SITES= http://www.apache.org/dist/httpd/ \
http://apache.mirrorcentral.com/dist/httpd/ \
@@ -23,6 +23,8 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER?= perky@fallin.lv
+LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
+
LATEST_LINK= apache2
WITH_MPM?= prefork # or worker, perchild
@@ -37,6 +39,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \
--enable-so \
--with-mpm=${WITH_MPM} \
--with-port=${HTTP_PORT} \
+ --with-expat=${LOCALBASE} \
--libdir=${PREFIX_RELDEST}/lib/apache2 \
--includedir=${PREFIX_RELDEST}/include/apache2
CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
@@ -50,15 +53,6 @@ MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes
MAKE_ENV+= -DNOPORTDOCS
.endif
-.if !defined(WITHOUT_BUNDLED_EXPAT)
-EXPAT_PATHS= xml/expat-cvs xml/expat $$srcdir/xml/expat
-PLIST_SUB+= EXPAT=""
-.else
-LIB_DEPENDS= expat.2:${PORTSDIR}/textproc/expat2
-EXPAT_PATHS= ${LOCALBASE} ${PREFIX} ${LOCALBASE:S,^${DESTDIR},,}
-PLIST_SUB+= EXPAT="@comment "
-.endif
-
.if defined(WITH_SUEXEC)
SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
SUEXEC_USERDIR?= public_html
@@ -132,8 +126,6 @@ post-patch:
${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\
ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
); done
- @${REINPLACE_CMD} -e 's,/usr .*/xml/expat,${EXPAT_PATHS},g' \
- ${WRKSRC}/srclib/apr-util/configure
@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
@${SED} ${RC_SUB} ${FILESDIR}/apache.sh >${WRKDIR}/apache2.sh
@${SED} ${RC_SUB} ${FILESDIR}/config.layout >>${WRKSRC}/config.layout
diff --git a/www/apache22/files/patch-support:htpasswd.c b/www/apache22/files/patch-support:htpasswd.c
new file mode 100644
index 000000000000..3267c08e9c31
--- /dev/null
+++ b/www/apache22/files/patch-support:htpasswd.c
@@ -0,0 +1,11 @@
+--- support/htpasswd.c 2002/06/18 02:58:36 1.48
++++ support/htpasswd.c 2002/06/19 17:31:19 1.49
+@@ -375,7 +375,7 @@
+ }
+ }
+
+- if (*mask & (APHTP_NEWFILE | APHTP_NOFILE)) {
++ if ((*mask & APHTP_NEWFILE) && (*mask & APHTP_NOFILE)) {
+ apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
+ exit(ERR_SYNTAX);
+ }
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index 297d23c2551d..29da7ea06294 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -78,7 +78,6 @@ include/apache2/apr_xlate.h
include/apache2/apr_xml.h
include/apache2/apu.h
include/apache2/apu_compat.h
-%%EXPAT%%include/apache2/expat.h
include/apache2/http_config.h
include/apache2/http_connection.h
include/apache2/http_core.h
@@ -131,11 +130,6 @@ lib/apache2/libaprutil.la
lib/apache2/libaprutil.so.0
@unexec rm -f %D/lib/apache2/libaprutil.so
@exec ln -fs libaprutil.so.0 %D/lib/apache2/libaprutil.so
-%%EXPAT%%lib/apache2/libexpat.a
-%%EXPAT%%lib/apache2/libexpat.la
-%%EXPAT%%lib/apache2/libexpat.so.1
-%%EXPAT%%@unexec rm -f %D/lib/apache2/libexpat.so
-%%EXPAT%%@exec ln -fs libexpat.so.1 %D/lib/apache2/libexpat.so
libexec/apache2/httpd.exp
libexec/apache2/mod_access.so
libexec/apache2/mod_actions.so
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 12:03:05 +0000