Building lighttpd 1.4.22 with mod_cache 1.7.0 patch fails.

[Mischa]

Hi,

When I try to build lighttpd 1.4.22 with the mod_cache 1.7.0 patch
file it fails on 2 chunks.

# make PATCHFILES=lighttpd-1.4.22.modcache.v.1.7.0.patch
PATCH_SITES=http://www.linux.com.cn/modcache/ NO_CHECKSUM=yes

===> Vulnerability check disabled, database not found
===> Found saved configuration for lighttpd-1.4.22_1
=> lighttpd-1.4.22.tar.bz2 doesn't seem to exist in /var/ports/
distfiles/.
=> Attempting to fetch from http://www.lighttpd.net/download/.
lighttpd-1.4.22.tar.bz2 100% of 642 kB 534
kBps
===> Extracting for lighttpd-1.4.22_1
===> Patching for lighttpd-1.4.22_1
===> Applying distribution patches for lighttpd-1.4.22_1
===> Applying FreeBSD patches for lighttpd-1.4.22_1
2 out of 7 hunks failed--saving rejects to src/Makefile.in.rej
=> Patch patch-src_Makefile.in failed to apply cleanly.
=> Patch(es) patch-doc_Makefile.in applied cleanly.
*** Error code 1

Stop in /basejail/usr/ports/www/lighttpd.
*** Error code 1

Stop in /basejail/usr/ports/www/lighttpd.


# cat Makefile.in.rej
***************
*** 423,430 ****
$(mod_status_la_SOURCES) $(mod_trigger_b4_dl_la_SOURCES) \
$(mod_userdir_la_SOURCES) $(mod_usertrack_la_SOURCES) \
$(mod_webdav_la_SOURCES) $(lemon_SOURCES) $(lighttpd_SOURCES)
\
- $(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \
- $(spawn_fcgi_SOURCES)
DIST_SOURCES = $(am__liblightcomp_la_SOURCES_DIST) \
$(mod_access_la_SOURCES) $(mod_accesslog_la_SOURCES) \
$(mod_alias_la_SOURCES) $(mod_auth_la_SOURCES) \
--- 419,425 ----
$(mod_status_la_SOURCES) $(mod_trigger_b4_dl_la_SOURCES) \
$(mod_userdir_la_SOURCES) $(mod_usertrack_la_SOURCES) \
$(mod_webdav_la_SOURCES) $(lemon_SOURCES) $(lighttpd_SOURCES)
\
+ $(lighttpd_angel_SOURCES) $(proc_open_SOURCES)
DIST_SOURCES = $(am__liblightcomp_la_SOURCES_DIST) \
$(mod_access_la_SOURCES) $(mod_accesslog_la_SOURCES) \
$(mod_alias_la_SOURCES) $(mod_auth_la_SOURCES) \
***************
*** 443,450 ****
$(mod_trigger_b4_dl_la_SOURCES) $(mod_userdir_la_SOURCES) \
$(mod_usertrack_la_SOURCES) $(mod_webdav_la_SOURCES) \
$(lemon_SOURCES) $(am__lighttpd_SOURCES_DIST) \
- $(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \
- $(spawn_fcgi_SOURCES)
HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
--- 438,444 ----
$(mod_trigger_b4_dl_la_SOURCES) $(mod_userdir_la_SOURCES) \
$(mod_usertrack_la_SOURCES) $(mod_webdav_la_SOURCES) \
$(lemon_SOURCES) $(am__lighttpd_SOURCES_DIST) \
+ $(lighttpd_angel_SOURCES) $(proc_open_SOURCES)
HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags

Is there anything that I can do to fix this?

Thanx!

Mischa