- Update to 0.4.19

- Unbreak plist

PR:		ports/79977
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

14 files changed, 184 insertions, 198 deletions

diff --git a/www/cherokee-devel/Makefile b/www/cherokee-devel/Makefile
index 2db4baa29240..9b6390b0b79e 100644
--- a/www/cherokee-devel/Makefile
+++ b/www/cherokee-devel/Makefile
@@ -6,35 +6,60 @@
 #
 
 PORTNAME=	cherokee
-PORTVERSION=	0.4.17
+PORTVERSION=	0.4.19
 CATEGORIES=	www
-MASTER_SITES=	ftp://laurel.datsi.fi.upm.es/pub/linux/cherokee/%SUBDIR%/
+MASTER_SITES=	http://www.0x50.org/download/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION:R}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An extremely fast and flexible web server
 
-LIB_DEPENDS=	gnutls.12:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GETOPT_LONG=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=	15
+USE_LIBTOOL_VER=	15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
+CONFIGURE_ARGS=	--with-wwwroot=${PREFIX}/www
 INSTALLS_SHLIB=	yes
 
 MAN1=		cherokee-config.1 cherokee.1
 
-CPPFLAGS=	${PTHREAD_CFLAGS}
-LDFLAGS=	${PTHREAD_LIBS}
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
+.if defined(WITHOUT_GNUTLS)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=	--enable-tls=openssl
+LDFLAGS+=	-lssl -lcrypto
+.else
+LIB_DEPENDS+=	gnutls.12:${PORTSDIR}/security/gnutls
+CONFIGURE_ARGS+=	--enable-tls=gnutls
+.endif
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Broken pkg-plist"
+.if ${OSVERSION} < 500000
+PLIST_SUB+=	PAM="" PAM5="@comment "
+.else
+PLIST_SUB+=	PAM="@comment " PAM5=""
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$$(top_builddir)/sherokee_reinplace|true|g' \
+		${WRKSRC}/Makefile.in
+
+pre-build:
+.for file in advanced.conf cherokee.conf mods-ssl sites-default sites-example
+	@cd ${BUILD_WRKSRC} && ${SED} -e \
+		's:%sysconfdir%:${PREFIX}/etc:g ; \
+		 s:%datadir%:${PREFIX}/share:g ; \
+		 s:%wwwroot%:${PREFIX}/www:g ; \
+		 s:%prefix%:${PREFIX}:g' < ${file}.sample.pre > ${file}.sample
+.endfor
+
 pre-install:
 	@if [ ! -f ${PREFIX}/www ]; then \
 		${MKDIR} ${PREFIX}/www;\
diff --git a/www/cherokee-devel/distinfo b/www/cherokee-devel/distinfo
index b52598ca4676..306f38ea6ed7 100644
--- a/www/cherokee-devel/distinfo
+++ b/www/cherokee-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (cherokee-0.4.17.tar.gz) = 2cf8c8eb973e6b3e5578406b467f23b5
-SIZE (cherokee-0.4.17.tar.gz) = 800872
+MD5 (cherokee-0.4.19.tar.gz) = ecd2b9e52450bdd70f0eed8f0c803871
+SIZE (cherokee-0.4.19.tar.gz) = 1024984
diff --git a/www/cherokee-devel/files/patch-src::socket.h b/www/cherokee-devel/files/patch-cherokee-socket.h
index 641be13d6b3f..1d3eb1b24ad0 100644
--- a/www/cherokee-devel/files/patch-src::socket.h
+++ b/www/cherokee-devel/files/patch-cherokee-socket.h
@@ -1,5 +1,5 @@
---- src/socket.h.orig	Sat Jun 19 23:03:54 2004
-+++ src/socket.h	Sat Jul 17 20:36:02 2004
+--- cherokee/socket.h.orig	Sun Mar  6 08:09:33 2005
++++ cherokee/socket.h	Fri Apr  1 13:09:44 2005
 @@ -45,12 +45,12 @@
  # include <sys/socket.h>
  #endif
diff --git a/www/cherokee-devel/files/patch-cherokee-validator_pam.c b/www/cherokee-devel/files/patch-cherokee-validator_pam.c
new file mode 100644
index 000000000000..8b11798061a4
--- /dev/null
+++ b/www/cherokee-devel/files/patch-cherokee-validator_pam.c
@@ -0,0 +1,12 @@
+--- cherokee/validator_pam.c.orig	Wed Mar 30 02:15:14 2005
++++ cherokee/validator_pam.c	Fri Apr  1 14:51:10 2005
+@@ -27,6 +27,9 @@
+ 
+ #include <security/pam_appl.h>
+ 
++#include "connection.h"
++#include "connection-protected.h"
++
+ 
+ cherokee_module_info_t cherokee_pam_info = {
+ 	cherokee_validator,           /* type     */
diff --git a/www/cherokee-devel/files/patch-cherokee.conf.sample.pre b/www/cherokee-devel/files/patch-cherokee.conf.sample.pre
deleted file mode 100644
index 677dae3d8df0..000000000000
--- a/www/cherokee-devel/files/patch-cherokee.conf.sample.pre
+++ /dev/null
@@ -1,11 +0,0 @@
---- cherokee.conf.sample.pre.orig	Tue Jun 29 05:54:01 2004
-+++ cherokee.conf.sample.pre	Sat Jul 17 22:19:43 2004
-@@ -68,7 +68,7 @@
- ## documents. By default, all requests are taken from this directory, but
- ## symbolic links and aliases may be used to point to other locations.
- ##
--DocumentRoot /var/www
-+DocumentRoot /usr/local/www/data
- 
- ##
- ## Hide Version:  Hide the software version
diff --git a/www/cherokee-devel/pkg-descr b/www/cherokee-devel/pkg-descr
index 96a8f5087e9b..40f0d1208bd6 100644
--- a/www/cherokee-devel/pkg-descr
+++ b/www/cherokee-devel/pkg-descr
@@ -3,4 +3,4 @@ entirely in C, and has no dependencies beyond a standard C library. It
 provides only the most basic HTTP functionality, but is extremely fast and
 small.
 
-WWW: http://www.alobbs.com/cherokee/
+WWW: http://www.0x50.org/
diff --git a/www/cherokee-devel/pkg-plist b/www/cherokee-devel/pkg-plist
index 8ffbe1467ef2..1bad591d1461 100644
--- a/www/cherokee-devel/pkg-plist
+++ b/www/cherokee-devel/pkg-plist
@@ -1,4 +1,4 @@
-bin/cherokee-bench
+bin/cget
 bin/cherokee-config
 bin/cherokee-panic
 etc/cherokee/advanced.conf
@@ -9,99 +9,63 @@ etc/cherokee/mods-available/ssl
 etc/cherokee/sites-available/default
 etc/cherokee/sites-available/example.com
 etc/cherokee/sites-enabled/default
-include/cherokee/access.h
-include/cherokee/avl.h
+%%PAM5%%etc/pam.d/cherokee
 include/cherokee/buffer.h
 include/cherokee/cherokee-config.h
+include/cherokee/cherokee.h
 include/cherokee/common.h
 include/cherokee/connection.h
-include/cherokee/crc32.h
+include/cherokee/downloader.h
 include/cherokee/encoder.h
-include/cherokee/encoder_table.h
 include/cherokee/fdpoll.h
 include/cherokee/handler.h
-include/cherokee/handler_table.h
-include/cherokee/handler_table_entry.h
 include/cherokee/header.h
 include/cherokee/http.h
-include/cherokee/icons.h
 include/cherokee/list.h
-include/cherokee/list_ext.h
-include/cherokee/log.h
+include/cherokee/list_merge_sort.h
 include/cherokee/logger.h
-include/cherokee/logger_table.h
-include/cherokee/match.h
-include/cherokee/matching_list.h
+include/cherokee/macros.h
 include/cherokee/mime.h
-include/cherokee/mmap.h
 include/cherokee/module.h
 include/cherokee/module_loader.h
 include/cherokee/server.h
-include/cherokee/socket.h
 include/cherokee/table.h
-include/cherokee/tdate_parse.h
-include/cherokee/thread.h
-include/cherokee/validator.h
-include/cherokee/virtual_server.h
-lib/cherokee/libcherokee_cgi.a
-lib/cherokee/libcherokee_cgi.la
-lib/cherokee/libcherokee_cgi.so
-lib/cherokee/libcherokee_combined.a
-lib/cherokee/libcherokee_combined.la
-lib/cherokee/libcherokee_combined.so
-lib/cherokee/libcherokee_common.a
-lib/cherokee/libcherokee_common.la
-lib/cherokee/libcherokee_common.so
-lib/cherokee/libcherokee_dirlist.a
-lib/cherokee/libcherokee_dirlist.la
-lib/cherokee/libcherokee_dirlist.so
-lib/cherokee/libcherokee_file.a
-lib/cherokee/libcherokee_file.la
-lib/cherokee/libcherokee_file.so
-lib/cherokee/libcherokee_gotls.a
-lib/cherokee/libcherokee_gotls.la
-lib/cherokee/libcherokee_gotls.so
-lib/cherokee/libcherokee_gzip.a
-lib/cherokee/libcherokee_gzip.la
-lib/cherokee/libcherokee_gzip.so
-lib/cherokee/libcherokee_mono.a
-lib/cherokee/libcherokee_mono.la
-lib/cherokee/libcherokee_mono.so
-lib/cherokee/libcherokee_ncsa.a
-lib/cherokee/libcherokee_ncsa.la
-lib/cherokee/libcherokee_ncsa.so
-lib/cherokee/libcherokee_nn.a
-lib/cherokee/libcherokee_nn.la
-lib/cherokee/libcherokee_nn.so
-lib/cherokee/libcherokee_pam.a
-lib/cherokee/libcherokee_pam.la
-lib/cherokee/libcherokee_pam.so
-lib/cherokee/libcherokee_phpcgi.a
-lib/cherokee/libcherokee_phpcgi.la
-lib/cherokee/libcherokee_phpcgi.so
-lib/cherokee/libcherokee_plain.a
-lib/cherokee/libcherokee_plain.la
-lib/cherokee/libcherokee_plain.so
-lib/cherokee/libcherokee_redir.a
-lib/cherokee/libcherokee_redir.la
-lib/cherokee/libcherokee_redir.so
-lib/cherokee/libcherokee_remote_control.a
-lib/cherokee/libcherokee_remote_control.la
-lib/cherokee/libcherokee_remote_control.so
-lib/cherokee/libcherokee_server_info.a
-lib/cherokee/libcherokee_server_info.la
-lib/cherokee/libcherokee_server_info.so
-lib/cherokee/libcherokee_w3c.a
-lib/cherokee/libcherokee_w3c.la
-lib/cherokee/libcherokee_w3c.so
-lib/libcherokee.a
-lib/libcherokee.la
-lib/libcherokee.so
-lib/libcherokee.so.0
+include/cherokee/url.h
+include/cherokee/util.h
+lib/cherokee/libplugin_cgi.so
+lib/cherokee/libplugin_combined.so
+lib/cherokee/libplugin_common.so
+lib/cherokee/libplugin_dirlist.so
+lib/cherokee/libplugin_error_redir.so
+lib/cherokee/libplugin_file.so
+lib/cherokee/libplugin_gzip.so
+lib/cherokee/libplugin_ncsa.so
+lib/cherokee/libplugin_nn.so
+%%PAM%%lib/cherokee/libplugin_pam.so
+lib/cherokee/libplugin_phpcgi.so
+lib/cherokee/libplugin_plain.so
+lib/cherokee/libplugin_redir.so
+lib/cherokee/libplugin_remote_control.so
+lib/cherokee/libplugin_server_info.so
+lib/cherokee/libplugin_w3c.so
+lib/libcherokee-base.a
+lib/libcherokee-base.so
+lib/libcherokee-base.so.0
+lib/libcherokee-client.a
+lib/libcherokee-client.so
+lib/libcherokee-client.so.0
+lib/libcherokee-server.a
+lib/libcherokee-server.so
+lib/libcherokee-server.so.0
 libdata/pkgconfig/cherokee.pc
 sbin/cherokee
 share/aclocal/cherokee.m4
 %%DATADIR%%/Intro.txt
+%%DATADIR%%/deps/combined.deps
+%%DATADIR%%/deps/common.deps
+%%DATADIR%%/deps/error_redir.deps
+%%DATADIR%%/deps/nn.deps
+%%DATADIR%%/deps/phpcgi.deps
 %%DATADIR%%/icons/back.png
 %%DATADIR%%/icons/binary.png
 %%DATADIR%%/icons/blank.png
@@ -109,6 +73,8 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/icons/compressed.png
 %%DATADIR%%/icons/folder.png
 %%DATADIR%%/icons/image.png
+%%DATADIR%%/icons/iso.png
+%%DATADIR%%/icons/java.png
 %%DATADIR%%/icons/movie.png
 %%DATADIR%%/icons/pdf.png
 %%DATADIR%%/icons/ps.png
@@ -120,6 +86,7 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/icons/unknown.png
 %%DATADIR%%/mime_types.txt
 @dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/deps
 @dirrm %%DATADIR%%
 @dirrm lib/cherokee
 @dirrm include/cherokee
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 2db4baa29240..9b6390b0b79e 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -6,35 +6,60 @@
 #
 
 PORTNAME=	cherokee
-PORTVERSION=	0.4.17
+PORTVERSION=	0.4.19
 CATEGORIES=	www
-MASTER_SITES=	ftp://laurel.datsi.fi.upm.es/pub/linux/cherokee/%SUBDIR%/
+MASTER_SITES=	http://www.0x50.org/download/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION:R}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An extremely fast and flexible web server
 
-LIB_DEPENDS=	gnutls.12:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GETOPT_LONG=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=	15
+USE_LIBTOOL_VER=	15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
+CONFIGURE_ARGS=	--with-wwwroot=${PREFIX}/www
 INSTALLS_SHLIB=	yes
 
 MAN1=		cherokee-config.1 cherokee.1
 
-CPPFLAGS=	${PTHREAD_CFLAGS}
-LDFLAGS=	${PTHREAD_LIBS}
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
+.if defined(WITHOUT_GNUTLS)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=	--enable-tls=openssl
+LDFLAGS+=	-lssl -lcrypto
+.else
+LIB_DEPENDS+=	gnutls.12:${PORTSDIR}/security/gnutls
+CONFIGURE_ARGS+=	--enable-tls=gnutls
+.endif
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Broken pkg-plist"
+.if ${OSVERSION} < 500000
+PLIST_SUB+=	PAM="" PAM5="@comment "
+.else
+PLIST_SUB+=	PAM="@comment " PAM5=""
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$$(top_builddir)/sherokee_reinplace|true|g' \
+		${WRKSRC}/Makefile.in
+
+pre-build:
+.for file in advanced.conf cherokee.conf mods-ssl sites-default sites-example
+	@cd ${BUILD_WRKSRC} && ${SED} -e \
+		's:%sysconfdir%:${PREFIX}/etc:g ; \
+		 s:%datadir%:${PREFIX}/share:g ; \
+		 s:%wwwroot%:${PREFIX}/www:g ; \
+		 s:%prefix%:${PREFIX}:g' < ${file}.sample.pre > ${file}.sample
+.endfor
+
 pre-install:
 	@if [ ! -f ${PREFIX}/www ]; then \
 		${MKDIR} ${PREFIX}/www;\
diff --git a/www/cherokee/distinfo b/www/cherokee/distinfo
index b52598ca4676..306f38ea6ed7 100644
--- a/www/cherokee/distinfo
+++ b/www/cherokee/distinfo
@@ -1,2 +1,2 @@
-MD5 (cherokee-0.4.17.tar.gz) = 2cf8c8eb973e6b3e5578406b467f23b5
-SIZE (cherokee-0.4.17.tar.gz) = 800872
+MD5 (cherokee-0.4.19.tar.gz) = ecd2b9e52450bdd70f0eed8f0c803871
+SIZE (cherokee-0.4.19.tar.gz) = 1024984
diff --git a/www/cherokee/files/patch-src::socket.h b/www/cherokee/files/patch-cherokee-socket.h
index 641be13d6b3f..1d3eb1b24ad0 100644
--- a/www/cherokee/files/patch-src::socket.h
+++ b/www/cherokee/files/patch-cherokee-socket.h
@@ -1,5 +1,5 @@
---- src/socket.h.orig	Sat Jun 19 23:03:54 2004
-+++ src/socket.h	Sat Jul 17 20:36:02 2004
+--- cherokee/socket.h.orig	Sun Mar  6 08:09:33 2005
++++ cherokee/socket.h	Fri Apr  1 13:09:44 2005
 @@ -45,12 +45,12 @@
  # include <sys/socket.h>
  #endif
diff --git a/www/cherokee/files/patch-cherokee-validator_pam.c b/www/cherokee/files/patch-cherokee-validator_pam.c
new file mode 100644
index 000000000000..8b11798061a4
--- /dev/null
+++ b/www/cherokee/files/patch-cherokee-validator_pam.c
@@ -0,0 +1,12 @@
+--- cherokee/validator_pam.c.orig	Wed Mar 30 02:15:14 2005
++++ cherokee/validator_pam.c	Fri Apr  1 14:51:10 2005
+@@ -27,6 +27,9 @@
+ 
+ #include <security/pam_appl.h>
+ 
++#include "connection.h"
++#include "connection-protected.h"
++
+ 
+ cherokee_module_info_t cherokee_pam_info = {
+ 	cherokee_validator,           /* type     */
diff --git a/www/cherokee/files/patch-cherokee.conf.sample.pre b/www/cherokee/files/patch-cherokee.conf.sample.pre
deleted file mode 100644
index 677dae3d8df0..000000000000
--- a/www/cherokee/files/patch-cherokee.conf.sample.pre
+++ /dev/null
@@ -1,11 +0,0 @@
---- cherokee.conf.sample.pre.orig	Tue Jun 29 05:54:01 2004
-+++ cherokee.conf.sample.pre	Sat Jul 17 22:19:43 2004
-@@ -68,7 +68,7 @@
- ## documents. By default, all requests are taken from this directory, but
- ## symbolic links and aliases may be used to point to other locations.
- ##
--DocumentRoot /var/www
-+DocumentRoot /usr/local/www/data
- 
- ##
- ## Hide Version:  Hide the software version
diff --git a/www/cherokee/pkg-descr b/www/cherokee/pkg-descr
index 96a8f5087e9b..40f0d1208bd6 100644
--- a/www/cherokee/pkg-descr
+++ b/www/cherokee/pkg-descr
@@ -3,4 +3,4 @@ entirely in C, and has no dependencies beyond a standard C library. It
 provides only the most basic HTTP functionality, but is extremely fast and
 small.
 
-WWW: http://www.alobbs.com/cherokee/
+WWW: http://www.0x50.org/
diff --git a/www/cherokee/pkg-plist b/www/cherokee/pkg-plist
index 8ffbe1467ef2..1bad591d1461 100644
--- a/www/cherokee/pkg-plist
+++ b/www/cherokee/pkg-plist
@@ -1,4 +1,4 @@
-bin/cherokee-bench
+bin/cget
 bin/cherokee-config
 bin/cherokee-panic
 etc/cherokee/advanced.conf
@@ -9,99 +9,63 @@ etc/cherokee/mods-available/ssl
 etc/cherokee/sites-available/default
 etc/cherokee/sites-available/example.com
 etc/cherokee/sites-enabled/default
-include/cherokee/access.h
-include/cherokee/avl.h
+%%PAM5%%etc/pam.d/cherokee
 include/cherokee/buffer.h
 include/cherokee/cherokee-config.h
+include/cherokee/cherokee.h
 include/cherokee/common.h
 include/cherokee/connection.h
-include/cherokee/crc32.h
+include/cherokee/downloader.h
 include/cherokee/encoder.h
-include/cherokee/encoder_table.h
 include/cherokee/fdpoll.h
 include/cherokee/handler.h
-include/cherokee/handler_table.h
-include/cherokee/handler_table_entry.h
 include/cherokee/header.h
 include/cherokee/http.h
-include/cherokee/icons.h
 include/cherokee/list.h
-include/cherokee/list_ext.h
-include/cherokee/log.h
+include/cherokee/list_merge_sort.h
 include/cherokee/logger.h
-include/cherokee/logger_table.h
-include/cherokee/match.h
-include/cherokee/matching_list.h
+include/cherokee/macros.h
 include/cherokee/mime.h
-include/cherokee/mmap.h
 include/cherokee/module.h
 include/cherokee/module_loader.h
 include/cherokee/server.h
-include/cherokee/socket.h
 include/cherokee/table.h
-include/cherokee/tdate_parse.h
-include/cherokee/thread.h
-include/cherokee/validator.h
-include/cherokee/virtual_server.h
-lib/cherokee/libcherokee_cgi.a
-lib/cherokee/libcherokee_cgi.la
-lib/cherokee/libcherokee_cgi.so
-lib/cherokee/libcherokee_combined.a
-lib/cherokee/libcherokee_combined.la
-lib/cherokee/libcherokee_combined.so
-lib/cherokee/libcherokee_common.a
-lib/cherokee/libcherokee_common.la
-lib/cherokee/libcherokee_common.so
-lib/cherokee/libcherokee_dirlist.a
-lib/cherokee/libcherokee_dirlist.la
-lib/cherokee/libcherokee_dirlist.so
-lib/cherokee/libcherokee_file.a
-lib/cherokee/libcherokee_file.la
-lib/cherokee/libcherokee_file.so
-lib/cherokee/libcherokee_gotls.a
-lib/cherokee/libcherokee_gotls.la
-lib/cherokee/libcherokee_gotls.so
-lib/cherokee/libcherokee_gzip.a
-lib/cherokee/libcherokee_gzip.la
-lib/cherokee/libcherokee_gzip.so
-lib/cherokee/libcherokee_mono.a
-lib/cherokee/libcherokee_mono.la
-lib/cherokee/libcherokee_mono.so
-lib/cherokee/libcherokee_ncsa.a
-lib/cherokee/libcherokee_ncsa.la
-lib/cherokee/libcherokee_ncsa.so
-lib/cherokee/libcherokee_nn.a
-lib/cherokee/libcherokee_nn.la
-lib/cherokee/libcherokee_nn.so
-lib/cherokee/libcherokee_pam.a
-lib/cherokee/libcherokee_pam.la
-lib/cherokee/libcherokee_pam.so
-lib/cherokee/libcherokee_phpcgi.a
-lib/cherokee/libcherokee_phpcgi.la
-lib/cherokee/libcherokee_phpcgi.so
-lib/cherokee/libcherokee_plain.a
-lib/cherokee/libcherokee_plain.la
-lib/cherokee/libcherokee_plain.so
-lib/cherokee/libcherokee_redir.a
-lib/cherokee/libcherokee_redir.la
-lib/cherokee/libcherokee_redir.so
-lib/cherokee/libcherokee_remote_control.a
-lib/cherokee/libcherokee_remote_control.la
-lib/cherokee/libcherokee_remote_control.so
-lib/cherokee/libcherokee_server_info.a
-lib/cherokee/libcherokee_server_info.la
-lib/cherokee/libcherokee_server_info.so
-lib/cherokee/libcherokee_w3c.a
-lib/cherokee/libcherokee_w3c.la
-lib/cherokee/libcherokee_w3c.so
-lib/libcherokee.a
-lib/libcherokee.la
-lib/libcherokee.so
-lib/libcherokee.so.0
+include/cherokee/url.h
+include/cherokee/util.h
+lib/cherokee/libplugin_cgi.so
+lib/cherokee/libplugin_combined.so
+lib/cherokee/libplugin_common.so
+lib/cherokee/libplugin_dirlist.so
+lib/cherokee/libplugin_error_redir.so
+lib/cherokee/libplugin_file.so
+lib/cherokee/libplugin_gzip.so
+lib/cherokee/libplugin_ncsa.so
+lib/cherokee/libplugin_nn.so
+%%PAM%%lib/cherokee/libplugin_pam.so
+lib/cherokee/libplugin_phpcgi.so
+lib/cherokee/libplugin_plain.so
+lib/cherokee/libplugin_redir.so
+lib/cherokee/libplugin_remote_control.so
+lib/cherokee/libplugin_server_info.so
+lib/cherokee/libplugin_w3c.so
+lib/libcherokee-base.a
+lib/libcherokee-base.so
+lib/libcherokee-base.so.0
+lib/libcherokee-client.a
+lib/libcherokee-client.so
+lib/libcherokee-client.so.0
+lib/libcherokee-server.a
+lib/libcherokee-server.so
+lib/libcherokee-server.so.0
 libdata/pkgconfig/cherokee.pc
 sbin/cherokee
 share/aclocal/cherokee.m4
 %%DATADIR%%/Intro.txt
+%%DATADIR%%/deps/combined.deps
+%%DATADIR%%/deps/common.deps
+%%DATADIR%%/deps/error_redir.deps
+%%DATADIR%%/deps/nn.deps
+%%DATADIR%%/deps/phpcgi.deps
 %%DATADIR%%/icons/back.png
 %%DATADIR%%/icons/binary.png
 %%DATADIR%%/icons/blank.png
@@ -109,6 +73,8 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/icons/compressed.png
 %%DATADIR%%/icons/folder.png
 %%DATADIR%%/icons/image.png
+%%DATADIR%%/icons/iso.png
+%%DATADIR%%/icons/java.png
 %%DATADIR%%/icons/movie.png
 %%DATADIR%%/icons/pdf.png
 %%DATADIR%%/icons/ps.png
@@ -120,6 +86,7 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/icons/unknown.png
 %%DATADIR%%/mime_types.txt
 @dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/deps
 @dirrm %%DATADIR%%
 @dirrm lib/cherokee
 @dirrm include/cherokee