2 files changed, 14 insertions, 49 deletions

diff --git a/www/cherokee-devel/Makefile b/www/cherokee-devel/Makefile
index 76b2a04f04e0..be418e457cca 100644
--- a/www/cherokee-devel/Makefile
+++ b/www/cherokee-devel/Makefile
@@ -7,40 +7,39 @@
 
 PORTNAME=	cherokee
 PORTVERSION=	0.5.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
-MASTER_SITES=	http://www.cherokee-project.com/download/%SUBDIR%/ \
-		http://www.alaskaparadise.com/freebsd/
-MASTER_SITE_SUBDIR=	${PORTVERSION:R}/${PORTVERSION}
+MASTER_SITES=	http://www.cherokee-project.com/download/${PORTVERSION:R}/${PORTVERSION}/ \
+		CENKES http://www.alaskaparadise.com/freebsd/
 
 MAINTAINER=	beech@alaskaparadise.com
 COMMENT=	An extremely fast and flexible web server
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
+CONFLICTS=	cherokee-devel-[0-9]*
 USE_GNOME=	gnomehack gnometarget pkgconfig
+USE_LDCONFIG=	yes
 USE_RC_SUBR=	cherokee.sh
 USE_GCC=	3.4+
 USE_BISON=	yes
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man \
-		--with-wwwroot=${PREFIX}/www
+		--with-wwwroot=${PREFIX}/www \
+		--disable-static
 
 OPTIONS=	GNUTLS	"TLS/SSL Use gnutls"	on \
 		OPENSSL	"TLS/SSL Use openssl"	off \
 		NOTLS	"No TLS/SSL"		off \
 		NOIPV6	"No IPv6"		off
 
-USE_LDCONFIG=	yes
-
 MAN1=		cget.1 cherokee-config.1 cherokee.1 cherokee_logrotate.1
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_GNUTLS)
@@ -75,23 +74,14 @@ pre-build:
 		 s:%prefix%:${PREFIX}:g' < ${file}.sample.pre > ${file}.sample
 .endfor
 
-pre-install:
-	@if [ ! -f ${PREFIX}/www ]; then \
-		${MKDIR} ${PREFIX}/www;\
-	fi
-	@if [ ! -f ${PREFIX}/www/data ] ; then \
-		${MKDIR} ${PREFIX}/www/data;\
-	fi
-	@${ECHO_MSG} " `pwd` "
-
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/images/*.png ${DOCSDIR}
+	@${INSTALL} -d ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/images/*.png ${DOCSDIR}/
 .endif
-	${INSTALL_DATA} ${WRKSRC}/doc/develop/Intro.txt ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/develop/Intro.txt ${DATADIR}/
 	@${ECHO_MSG} " "
 	@${ECHO_MSG} " Dont forget to read the doc "
 	@${ECHO_MSG} " ${PREFIX}/share/cherokee/Intro.txt"
diff --git a/www/cherokee-devel/pkg-plist b/www/cherokee-devel/pkg-plist
index b7438d7a4c6b..e87a23c24c31 100644
--- a/www/cherokee-devel/pkg-plist
+++ b/www/cherokee-devel/pkg-plist
@@ -40,79 +40,55 @@ 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_fcgi.a
 lib/cherokee/libplugin_fcgi.la
 lib/cherokee/libplugin_fcgi.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
-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_scgi.a
 lib/cherokee/libplugin_scgi.la
 lib/cherokee/libplugin_scgi.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
@@ -210,4 +186,3 @@ www/index.html
 @dirrm etc/cherokee/mods-available
 @dirrm etc/cherokee
 @dirrmtry www/images
-@dirrmtry www/data