diff options
| author | zuntum <zuntum> | 2002-04-23 11:23:58 +0000 |
|---|---|---|
| committer | zuntum <zuntum> | 2002-04-23 11:23:58 +0000 |
| commit | 591d1dd4371c651b90a23269811f9a8b3803d432 (patch) | |
| tree | f808587e7546bd38e2483079dfdecd3699e5ce0b /www/bozohttpd | |
| parent | cd63629adc6c0580f26091152d57d7e31c599dac (diff) | |
| download | pkgsrc-591d1dd4371c651b90a23269811f9a8b3803d432.tar.gz | |
Merge 2 patches for the same file into one diff
Diffstat (limited to 'www/bozohttpd')
| -rw-r--r-- | www/bozohttpd/Makefile | 3 | ||||
| -rw-r--r-- | www/bozohttpd/distinfo | 5 | ||||
| -rw-r--r-- | www/bozohttpd/patches/patch-ac | 13 | ||||
| -rw-r--r-- | www/bozohttpd/patches/patch-ae (renamed from www/bozohttpd/patches/patch-ad) | 11 |
4 files changed, 14 insertions, 18 deletions
diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile index f7ade67707e..ffdecb1cc9c 100644 --- a/www/bozohttpd/Makefile +++ b/www/bozohttpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/12/14 16:26:03 mrg Exp $ +# $NetBSD: Makefile,v 1.14 2002/04/23 11:23:58 zuntum Exp $ # DISTNAME= bozohttpd-5.09 @@ -20,6 +20,7 @@ USE_BUILDLINK_ONLY= YES CPPFLAGS+= -DINET6 .endif +CFLAGS+= -DDEBUG=1 pre-patch: ${MV} ${WRKSRC}/bozohttpd.8 ${WRKSRC}/bozohttpd.8.in diff --git a/www/bozohttpd/distinfo b/www/bozohttpd/distinfo index 5158038a58d..b7723916230 100644 --- a/www/bozohttpd/distinfo +++ b/www/bozohttpd/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.8 2002/04/23 11:13:52 zuntum Exp $ +$NetBSD: distinfo,v 1.9 2002/04/23 11:23:59 zuntum Exp $ SHA1 (bozohttpd-5.09.tar.bz2) = 38670bf3216cf97fa2e7af1415afe0831bdd8ddc Size (bozohttpd-5.09.tar.bz2) = 18439 bytes SHA1 (patch-aa) = 3831938ead3fd2792d61878c10aa7ada431e8cd7 SHA1 (patch-ab) = 3dbf43680c52c60251221243e855fc2d2f26c1ff -SHA1 (patch-ac) = ecce33aaa6bd1a9c492b228c70dca57667386a99 -SHA1 (patch-ad) = aa7ab45fd34b4e0abf9b7284c456b0d662a274c5 +SHA1 (patch-ae) = 65a715f22af38be3bf2c47dd0b9dceedad23e412 diff --git a/www/bozohttpd/patches/patch-ac b/www/bozohttpd/patches/patch-ac deleted file mode 100644 index 2fd1276f2d6..00000000000 --- a/www/bozohttpd/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2002/04/23 11:10:08 zuntum Exp $ - ---- bozohttpd.c.orig Sat Sep 22 12:10:00 2001 -+++ bozohttpd.c -@@ -1734,7 +1734,7 @@ - int savederrno; - - /* only log if the level is low enough */ -- if (level < dflag) -+ if (dflag < level) - return; - - savederrno = errno; diff --git a/www/bozohttpd/patches/patch-ad b/www/bozohttpd/patches/patch-ae index c82049d98c8..325b62195b3 100644 --- a/www/bozohttpd/patches/patch-ad +++ b/www/bozohttpd/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1 2002/04/23 11:13:53 zuntum Exp $ +$NetBSD: patch-ae,v 1.1 2002/04/23 11:24:00 zuntum Exp $ --- bozohttpd.c.orig Sat Sep 22 12:10:00 2001 +++ bozohttpd.c @@ -10,3 +10,12 @@ $NetBSD: patch-ad,v 1.1 2002/04/23 11:13:53 zuntum Exp $ break; #else error(1, "CGI is not enabled"); +@@ -1734,7 +1735,7 @@ + int savederrno; + + /* only log if the level is low enough */ +- if (level < dflag) ++ if (dflag < level) + return; + + savederrno = errno; |