diff options
| author | wiz <wiz> | 2004-09-14 08:32:16 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2004-09-14 08:32:16 +0000 |
| commit | ead66607b13194577dfb1f3cc3642360f92ebb4c (patch) | |
| tree | 38969853550033d9e0634a3fc9c159482dbe13ee /www | |
| parent | 48b676d7369ec7451e0423ea9d9b6e81be354986 (diff) | |
| download | pkgsrc-ead66607b13194577dfb1f3cc3642360f92ebb4c.tar.gz | |
Add patch from PR 25487 to disable mmap on old (1.5ish) NetBSD systems.
Apply patch from PR 25488 to enable choosing the log facility for thttpd.
Both based on patches from Michael Santos.
Bump PKGREVISION to 1.
Diffstat (limited to 'www')
| -rw-r--r-- | www/thttpd/Makefile | 10 | ||||
| -rw-r--r-- | www/thttpd/distinfo | 3 | ||||
| -rw-r--r-- | www/thttpd/patches/patch-af | 15 |
3 files changed, 26 insertions, 2 deletions
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile index 1202a8fcb39..0aca7257518 100644 --- a/www/thttpd/Makefile +++ b/www/thttpd/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2004/02/22 18:34:54 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2004/09/14 08:32:16 wiz Exp $ DISTNAME= thttpd-2.25b +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.acme.com/software/thttpd/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -18,6 +19,10 @@ USE_PKGINSTALL= yes # Note: this pkg auto-detects IPv6 without regarding USE_INET6. BUILD_DEFS+= USE_INET6 +# thttpd syslogs at level LOG_DAEMON by default +# change this to your preferred syslog level +THTTPD_LOG_FACILITY?= LOG_DAEMON +BUILD_DEFS+= THTTPD_LOG_FACILITY EGDIR= ${PREFIX}/share/examples CONF_FILES= ${EGDIR}/thttpd.conf ${PKG_SYSCONFDIR}/thttpd.conf @@ -33,6 +38,9 @@ pre-configure: ${SED} -e "s,\.htpasswd,XXX,g;s,htpasswd,thtpasswd,g;s,XXX,.htpasswd,g" \ ${WRKSRC}/$${FILE}.bak > ${WRKSRC}/$${FILE}; \ done + ${MV} -f ${WRKSRC}/config.h ${WRKSRC}/config.h.bak + ${SED} -e "s/LOG_DAEMON/${THTTPD_LOG_FACILITY}/" ${WRKSRC}/config.h.bak \ + > ${WRKSRC}/config.h post-build: @for FILE in thttpd.conf; do \ diff --git a/www/thttpd/distinfo b/www/thttpd/distinfo index 6726033a5b9..dbf827d1807 100644 --- a/www/thttpd/distinfo +++ b/www/thttpd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2004/01/17 12:55:05 xtraeme Exp $ +$NetBSD: distinfo,v 1.8 2004/09/14 08:32:16 wiz Exp $ SHA1 (thttpd-2.25b.tar.gz) = 51bc25ef035d7557c869a02ce353580a1cadfa2c Size (thttpd-2.25b.tar.gz) = 132363 bytes @@ -8,3 +8,4 @@ SHA1 (patch-aa) = 0f739bebf1ade45a9b9819fc92d48eeb1004eb66 SHA1 (patch-ab) = 3766ae48fabc1980483e482157d1267971e621df SHA1 (patch-ac) = 71b2926a9513bd25a124510ad5f234d029492eb2 SHA1 (patch-ad) = 1d7777516ff0c5e7b03643809854bf96707759ec +SHA1 (patch-af) = 2fa1603964383a745a82f1760faa947193764079 diff --git a/www/thttpd/patches/patch-af b/www/thttpd/patches/patch-af new file mode 100644 index 00000000000..7d8cea9e833 --- /dev/null +++ b/www/thttpd/patches/patch-af @@ -0,0 +1,15 @@ +$NetBSD: patch-af,v 1.3 2004/09/14 08:32:16 wiz Exp $ + +--- mmc.c.orig 2003-12-25 20:06:35.000000000 +0100 ++++ mmc.c +@@ -38,6 +38,10 @@ + #include <syslog.h> + #include <errno.h> + ++#if (defined(__NetBSD__) && __NetBSD_Version__ <= 105120000) ++#undef HAVE_MMAP ++#endif ++ + #ifdef HAVE_MMAP + #include <sys/mman.h> + #endif /* HAVE_MMAP */ |