2 files changed, 44 insertions, 1 deletions

diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 003ad8333bd3..41027160890a 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cherokee
 PORTVERSION=	0.4.30
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.0x50.org/download/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION:R}/${PORTVERSION}
@@ -21,7 +22,7 @@ USE_GCC=	3.4+
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-wwwroot=${PREFIX}/www
 INSTALLS_SHLIB=	yes
diff --git a/www/cherokee/pkg-plist b/www/cherokee/pkg-plist
index b92829348b5b..921fb701e299 100644
--- a/www/cherokee/pkg-plist
+++ b/www/cherokee/pkg-plist
@@ -40,35 +40,77 @@ include/cherokee/table.h
 include/cherokee/typed_table.h
 include/cherokee/url.h
 include/cherokee/util.h
+lib/cherokee/libplugin_admin.a
+lib/cherokee/libplugin_admin.la
 lib/cherokee/libplugin_admin.so
+lib/cherokee/libplugin_cgi.a
+lib/cherokee/libplugin_cgi.la
 lib/cherokee/libplugin_cgi.so
+lib/cherokee/libplugin_combined.a
+lib/cherokee/libplugin_combined.la
 lib/cherokee/libplugin_combined.so
+lib/cherokee/libplugin_common.a
+lib/cherokee/libplugin_common.la
 lib/cherokee/libplugin_common.so
+lib/cherokee/libplugin_dirlist.a
+lib/cherokee/libplugin_dirlist.la
 lib/cherokee/libplugin_dirlist.so
+lib/cherokee/libplugin_error_redir.a
+lib/cherokee/libplugin_error_redir.la
 lib/cherokee/libplugin_error_redir.so
+lib/cherokee/libplugin_fastcgi.a
+lib/cherokee/libplugin_fastcgi.la
 lib/cherokee/libplugin_fastcgi.so
+lib/cherokee/libplugin_file.a
+lib/cherokee/libplugin_file.la
 lib/cherokee/libplugin_file.so
+lib/cherokee/libplugin_gzip.a
+lib/cherokee/libplugin_gzip.la
 lib/cherokee/libplugin_gzip.so
+lib/cherokee/libplugin_htdigest.a
+lib/cherokee/libplugin_htdigest.la
 lib/cherokee/libplugin_htdigest.so
+lib/cherokee/libplugin_ncsa.a
+lib/cherokee/libplugin_ncsa.la
 lib/cherokee/libplugin_ncsa.so
+lib/cherokee/libplugin_nn.a
+lib/cherokee/libplugin_nn.la
 lib/cherokee/libplugin_nn.so
+%%PAM%%lib/cherokee/libplugin_pam.a
+%%PAM%%lib/cherokee/libplugin_pam.la
 %%PAM%%lib/cherokee/libplugin_pam.so
+lib/cherokee/libplugin_phpcgi.a
+lib/cherokee/libplugin_phpcgi.la
 lib/cherokee/libplugin_phpcgi.so
+lib/cherokee/libplugin_plain.a
+lib/cherokee/libplugin_plain.la
 lib/cherokee/libplugin_plain.so
+lib/cherokee/libplugin_read_config.a
+lib/cherokee/libplugin_read_config.la
 lib/cherokee/libplugin_read_config.so
+lib/cherokee/libplugin_redir.a
+lib/cherokee/libplugin_redir.la
 lib/cherokee/libplugin_redir.so
+lib/cherokee/libplugin_server_info.a
+lib/cherokee/libplugin_server_info.la
 lib/cherokee/libplugin_server_info.so
+lib/cherokee/libplugin_w3c.a
+lib/cherokee/libplugin_w3c.la
 lib/cherokee/libplugin_w3c.so
 lib/libcherokee-base.a
+lib/libcherokee-base.la
 lib/libcherokee-base.so
 lib/libcherokee-base.so.0
 lib/libcherokee-client.a
+lib/libcherokee-client.la
 lib/libcherokee-client.so
 lib/libcherokee-client.so.0
 lib/libcherokee-config.a
+lib/libcherokee-config.la
 lib/libcherokee-config.so
 lib/libcherokee-config.so.0
 lib/libcherokee-server.a
+lib/libcherokee-server.la
 lib/libcherokee-server.so
 lib/libcherokee-server.so.0
 libdata/pkgconfig/cherokee.pc