From d7422c6406bbada531509be80cee1d6a122f98b0 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Thu, 23 Oct 1997 16:40:02 +0000 Subject: Compile with -funsigned-char instead of (unsigned char) cast and not replace Apache functions now --- www/apache13/Makefile | 2 -- www/apache13/files/patch-ab | 51 --------------------------------------------- www/apache2/Makefile | 2 -- www/apache2/files/patch-ab | 51 --------------------------------------------- www/apache20/Makefile | 2 -- www/apache20/files/patch-ab | 51 --------------------------------------------- www/apache21/Makefile | 2 -- www/apache21/files/patch-ab | 51 --------------------------------------------- www/apache22/Makefile | 2 -- www/apache22/files/patch-ab | 51 --------------------------------------------- 10 files changed, 265 deletions(-) delete mode 100644 www/apache13/files/patch-ab delete mode 100644 www/apache2/files/patch-ab delete mode 100644 www/apache20/files/patch-ab delete mode 100644 www/apache21/files/patch-ab delete mode 100644 www/apache22/files/patch-ab (limited to 'www') diff --git a/www/apache13/Makefile b/www/apache13/Makefile index 96bc898574ca..9d7bbd9cc276 100644 --- a/www/apache13/Makefile +++ b/www/apache13/Makefile @@ -17,8 +17,6 @@ MAINTAINER= ache@freebsd.org # VERS_ID = mods-1.0/me post-patch: - @cp /usr/include/md5.h ${WRKSRC}/src/main/freebsd_md5.h - @cp /usr/include/fnmatch.h ${WRKSRC}/src/main/freebsd_fnmatch.h @cd ${WRKSRC}/conf && \ for I in access.conf-dist srm.conf-dist; do \ sed -e "s#@@ServerRoot@@#${PREFIX}/www#g" < $${I} > $${I}.new; \ diff --git a/www/apache13/files/patch-ab b/www/apache13/files/patch-ab deleted file mode 100644 index c815f9f2b384..000000000000 --- a/www/apache13/files/patch-ab +++ /dev/null @@ -1,51 +0,0 @@ -*** src/main/fnmatch.h.orig Thu Oct 16 22:57:01 1997 ---- src/main/fnmatch.h Wed Oct 22 22:44:12 1997 -*************** -*** 35,40 **** ---- 35,44 ---- - - /* This file has been modified by the Apache Group. */ - -+ #ifdef __FreeBSD__ -+ #include "freebsd_fnmatch.h" -+ extern int is_fnmatch(const char *); -+ #else - #ifndef _FNMATCH_H_ - #define _FNMATCH_H_ - -*************** -*** 50,52 **** ---- 54,57 ---- - extern int is_fnmatch(const char *); - - #endif /* !_FNMATCH_H_ */ -+ #endif /* !FreeBSD */ -*** src/main/fnmatch.c.orig Thu Oct 16 22:57:01 1997 ---- src/main/fnmatch.c Wed Oct 22 22:40:52 1997 -*************** -*** 34,39 **** ---- 34,40 ---- - * SUCH DAMAGE. - */ - -+ #ifndef __FreeBSD__ - #if defined(LIBC_SCCS) && !defined(lint) - static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94"; - #endif /* LIBC_SCCS and not lint */ -*************** -*** 169,175 **** - } - return (ok == negate ? NULL : pattern); - } -! - - /* This function is an Apache addition */ - /* return non-zero if pattern has any glob chars in it */ ---- 170,176 ---- - } - return (ok == negate ? NULL : pattern); - } -! #endif /* !FreeBSD */ - - /* This function is an Apache addition */ - /* return non-zero if pattern has any glob chars in it */ diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 96bc898574ca..9d7bbd9cc276 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -17,8 +17,6 @@ MAINTAINER= ache@freebsd.org # VERS_ID = mods-1.0/me post-patch: - @cp /usr/include/md5.h ${WRKSRC}/src/main/freebsd_md5.h - @cp /usr/include/fnmatch.h ${WRKSRC}/src/main/freebsd_fnmatch.h @cd ${WRKSRC}/conf && \ for I in access.conf-dist srm.conf-dist; do \ sed -e "s#@@ServerRoot@@#${PREFIX}/www#g" < $${I} > $${I}.new; \ diff --git a/www/apache2/files/patch-ab b/www/apache2/files/patch-ab deleted file mode 100644 index c815f9f2b384..000000000000 --- a/www/apache2/files/patch-ab +++ /dev/null @@ -1,51 +0,0 @@ -*** src/main/fnmatch.h.orig Thu Oct 16 22:57:01 1997 ---- src/main/fnmatch.h Wed Oct 22 22:44:12 1997 -*************** -*** 35,40 **** ---- 35,44 ---- - - /* This file has been modified by the Apache Group. */ - -+ #ifdef __FreeBSD__ -+ #include "freebsd_fnmatch.h" -+ extern int is_fnmatch(const char *); -+ #else - #ifndef _FNMATCH_H_ - #define _FNMATCH_H_ - -*************** -*** 50,52 **** ---- 54,57 ---- - extern int is_fnmatch(const char *); - - #endif /* !_FNMATCH_H_ */ -+ #endif /* !FreeBSD */ -*** src/main/fnmatch.c.orig Thu Oct 16 22:57:01 1997 ---- src/main/fnmatch.c Wed Oct 22 22:40:52 1997 -*************** -*** 34,39 **** ---- 34,40 ---- - * SUCH DAMAGE. - */ - -+ #ifndef __FreeBSD__ - #if defined(LIBC_SCCS) && !defined(lint) - static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94"; - #endif /* LIBC_SCCS and not lint */ -*************** -*** 169,175 **** - } - return (ok == negate ? NULL : pattern); - } -! - - /* This function is an Apache addition */ - /* return non-zero if pattern has any glob chars in it */ ---- 170,176 ---- - } - return (ok == negate ? NULL : pattern); - } -! #endif /* !FreeBSD */ - - /* This function is an Apache addition */ - /* return non-zero if pattern has any glob chars in it */ diff --git a/www/apache20/Makefile b/www/apache20/Makefile index 96bc898574ca..9d7bbd9cc276 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -17,8 +17,6 @@ MAINTAINER= ache@freebsd.org # VERS_ID = mods-1.0/me post-patch: - @cp /usr/include/md5.h ${WRKSRC}/src/main/freebsd_md5.h - @cp /usr/include/fnmatch.h ${WRKSRC}/src/main/freebsd_fnmatch.h @cd ${WRKSRC}/conf && \ for I in access.conf-dist srm.conf-dist; do \ sed -e "s#@@ServerRoot@@#${PREFIX}/www#g" < $${I} > $${I}.new; \ diff --git a/www/apache20/files/patch-ab b/www/apache20/files/patch-ab deleted file mode 100644 index c815f9f2b384..000000000000 --- a/www/apache20/files/patch-ab +++ /dev/null @@ -1,51 +0,0 @@ -*** src/main/fnmatch.h.orig Thu Oct 16 22:57:01 1997 ---- src/main/fnmatch.h Wed Oct 22 22:44:12 1997 -*************** -*** 35,40 **** ---- 35,44 ---- - - /* This file has been modified by the Apache Group. */ - -+ #ifdef __FreeBSD__ -+ #include "freebsd_fnmatch.h" -+ extern int is_fnmatch(const char *); -+ #else - #ifndef _FNMATCH_H_ - #define _FNMATCH_H_ - -*************** -*** 50,52 **** ---- 54,57 ---- - extern int is_fnmatch(const char *); - - #endif /* !_FNMATCH_H_ */ -+ #endif /* !FreeBSD */ -*** src/main/fnmatch.c.orig Thu Oct 16 22:57:01 1997 ---- src/main/fnmatch.c Wed Oct 22 22:40:52 1997 -*************** -*** 34,39 **** ---- 34,40 ---- - * SUCH DAMAGE. - */ - -+ #ifndef __FreeBSD__ - #if defined(LIBC_SCCS) && !defined(lint) - static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94"; - #endif /* LIBC_SCCS and not lint */ -*************** -*** 169,175 **** - } - return (ok == negate ? NULL : pattern); - } -! - - /* This function is an Apache addition */ - /* return non-zero if pattern has any glob chars in it */ ---- 170,176 ---- - } - return (ok == negate ? NULL : pattern); - } -! #endif /* !FreeBSD */ - - /* This function is an Apache addition */ - /* return non-zero if pattern has any glob chars in it */ diff --git a/www/apache21/Makefile b/www/apache21/Makefile index 96bc898574ca..9d7bbd9cc276 100644 --- a/www/apache21/Makefile +++ b/www/apache21/Makefile @@ -17,8 +17,6 @@ MAINTAINER= ache@freebsd.org # VERS_ID = mods-1.0/me post-patch: - @cp /usr/include/md5.h ${WRKSRC}/src/main/freebsd_md5.h - @cp /usr/include/fnmatch.h ${WRKSRC}/src/main/freebsd_fnmatch.h @cd ${WRKSRC}/conf && \ for I in access.conf-dist srm.conf-dist; do \ sed -e "s#@@ServerRoot@@#${PREFIX}/www#g" < $${I} > $${I}.new; \ diff --git a/www/apache21/files/patch-ab b/www/apache21/files/patch-ab deleted file mode 100644 index c815f9f2b384..000000000000 --- a/www/apache21/files/patch-ab +++ /dev/null @@ -1,51 +0,0 @@ -*** src/main/fnmatch.h.orig Thu Oct 16 22:57:01 1997 ---- src/main/fnmatch.h Wed Oct 22 22:44:12 1997 -*************** -*** 35,40 **** ---- 35,44 ---- - - /* This file has been modified by the Apache Group. */ - -+ #ifdef __FreeBSD__ -+ #include "freebsd_fnmatch.h" -+ extern int is_fnmatch(const char *); -+ #else - #ifndef _FNMATCH_H_ - #define _FNMATCH_H_ - -*************** -*** 50,52 **** ---- 54,57 ---- - extern int is_fnmatch(const char *); - - #endif /* !_FNMATCH_H_ */ -+ #endif /* !FreeBSD */ -*** src/main/fnmatch.c.orig Thu Oct 16 22:57:01 1997 ---- src/main/fnmatch.c Wed Oct 22 22:40:52 1997 -*************** -*** 34,39 **** ---- 34,40 ---- - * SUCH DAMAGE. - */ - -+ #ifndef __FreeBSD__ - #if defined(LIBC_SCCS) && !defined(lint) - static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94"; - #endif /* LIBC_SCCS and not lint */ -*************** -*** 169,175 **** - } - return (ok == negate ? NULL : pattern); - } -! - - /* This function is an Apache addition */ - /* return non-zero if pattern has any glob chars in it */ ---- 170,176 ---- - } - return (ok == negate ? NULL : pattern); - } -! #endif /* !FreeBSD */ - - /* This function is an Apache addition */ - /* return non-zero if pattern has any glob chars in it */ diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 96bc898574ca..9d7bbd9cc276 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -17,8 +17,6 @@ MAINTAINER= ache@freebsd.org # VERS_ID = mods-1.0/me post-patch: - @cp /usr/include/md5.h ${WRKSRC}/src/main/freebsd_md5.h - @cp /usr/include/fnmatch.h ${WRKSRC}/src/main/freebsd_fnmatch.h @cd ${WRKSRC}/conf && \ for I in access.conf-dist srm.conf-dist; do \ sed -e "s#@@ServerRoot@@#${PREFIX}/www#g" < $${I} > $${I}.new; \ diff --git a/www/apache22/files/patch-ab b/www/apache22/files/patch-ab deleted file mode 100644 index c815f9f2b384..000000000000 --- a/www/apache22/files/patch-ab +++ /dev/null @@ -1,51 +0,0 @@ -*** src/main/fnmatch.h.orig Thu Oct 16 22:57:01 1997 ---- src/main/fnmatch.h Wed Oct 22 22:44:12 1997 -*************** -*** 35,40 **** ---- 35,44 ---- - - /* This file has been modified by the Apache Group. */ - -+ #ifdef __FreeBSD__ -+ #include "freebsd_fnmatch.h" -+ extern int is_fnmatch(const char *); -+ #else - #ifndef _FNMATCH_H_ - #define _FNMATCH_H_ - -*************** -*** 50,52 **** ---- 54,57 ---- - extern int is_fnmatch(const char *); - - #endif /* !_FNMATCH_H_ */ -+ #endif /* !FreeBSD */ -*** src/main/fnmatch.c.orig Thu Oct 16 22:57:01 1997 ---- src/main/fnmatch.c Wed Oct 22 22:40:52 1997 -*************** -*** 34,39 **** ---- 34,40 ---- - * SUCH DAMAGE. - */ - -+ #ifndef __FreeBSD__ - #if defined(LIBC_SCCS) && !defined(lint) - static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94"; - #endif /* LIBC_SCCS and not lint */ -*************** -*** 169,175 **** - } - return (ok == negate ? NULL : pattern); - } -! - - /* This function is an Apache addition */ - /* return non-zero if pattern has any glob chars in it */ ---- 170,176 ---- - } - return (ok == negate ? NULL : pattern); - } -! #endif /* !FreeBSD */ - - /* This function is an Apache addition */ - /* return non-zero if pattern has any glob chars in it */ -- cgit v1.2.3