Index: head/www/mohawk/Makefile
===================================================================
--- head/www/mohawk/Makefile	(revision 299906)
+++ head/www/mohawk/Makefile	(revision 299907)
@@ -1,38 +1,43 @@
 # New ports collection makefile for:	mohawk
 # Date created:		2011-04-15
 # Whom:			Baptiste Daroussin <bapt@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mohawk
-PORTVERSION=	0.9
+PORTVERSION=	2.0
 CATEGORIES=	www ipv6
-MASTER_SITES=	http://files.etoilebsd.net/mohawk/
+MASTER_SITES=	http://files.etoilebsd.net/mohawk/ \
+		http://mohawk.bsdsx.fr/
 
-MAINTAINER=	bapt@FreeBSD.org
+MAINTAINER=	mohawk@bsdsx.fr
 COMMENT=	Simple and lightweight HTTP daemon
 
 LICENSE=	BSD
 
-MAN1=	mhtpasswd.1
-MAN8=	mohawk.8
-
 PLIST_FILES+=	bin/mhtpasswd \
 		sbin/mohawk \
 		etc/mohawk.conf.sample
 
+PORTEXAMPLES=	*
 USE_RC_SUBR=	mohawk
 
 .include <bsd.port.pre.mk>
 .if ${OSVERSION} < 800502
 BROKEN=		does not build
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e '/.*rc.d\/mohawk.*/d' ${WRKSRC}/Makefile
+LIB_DEPENDS=    event-2.0:${PORTSDIR}/devel/libevent2
+CFLAGS+=        -I${LOCALBASE}/include/event2/compat -I${LOCALBASE}/include
+LDFLAGS+=       -L${LOCALBASE}/lib/event2
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/mohawk.conf ${PREFIX}/etc/mohawk.conf.sample
+	@${INSTALL_DATA} ${WRKSRC}/examples/minimal.conf ${PREFIX}/etc/mohawk.conf.sample
+	@${INSTALL_SCRIPT} ${WRKSRC}/mhtpasswd.sh ${PREFIX}/bin/mhtpasswd
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/examples/*.conf ${EXAMPLESDIR}
+.endif 
 
 .include <bsd.port.post.mk>

Property changes on: head/www/mohawk/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/www/mohawk/distinfo
===================================================================
--- head/www/mohawk/distinfo	(revision 299906)
+++ head/www/mohawk/distinfo	(revision 299907)
@@ -1,2 +1,2 @@
-SHA256 (mohawk-0.9.tar.gz) = 9c79b82cb3760462f8c5f6edfbbb68c67650692ae25248294dc9974e39be5ede
-SIZE (mohawk-0.9.tar.gz) = 26556
+SHA256 (mohawk-2.0.tar.gz) = 6cef4ff7a18a61a807b7f5ba9819f76fefc9ff49f41dfeb0fee75db7d1044b23
+SIZE (mohawk-2.0.tar.gz) = 45363

Property changes on: head/www/mohawk/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/www/mohawk/files/patch-man5__Makefile
===================================================================
--- head/www/mohawk/files/patch-man5__Makefile	(nonexistent)
+++ head/www/mohawk/files/patch-man5__Makefile	(revision 299907)
@@ -0,0 +1,7 @@
+--- ./man5/Makefile.orig	2012-05-28 13:26:48.000000000 +0200
++++ ./man5/Makefile	2012-05-28 13:27:02.000000000 +0200
+@@ -1,3 +1,4 @@
++SHAREDIR=	${PREFIX}
+ MAN= mohawk.conf.5
+ 
+ .include <bsd.prog.mk>

Property changes on: head/www/mohawk/files/patch-man5__Makefile
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/www/mohawk/files/patch-man8__Makefile
===================================================================
--- head/www/mohawk/files/patch-man8__Makefile	(nonexistent)
+++ head/www/mohawk/files/patch-man8__Makefile	(revision 299907)
@@ -0,0 +1,7 @@
+--- ./man8/Makefile.orig	2012-05-28 13:27:10.000000000 +0200
++++ ./man8/Makefile	2012-05-28 13:27:22.000000000 +0200
+@@ -1,3 +1,4 @@
++SHAREDIR=	${PREFIX}
+ MAN8= mhtpasswd.8 mohawk.8
+ 
+ .include <bsd.prog.mk>

Property changes on: head/www/mohawk/files/patch-man8__Makefile
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/www/mohawk/pkg-descr
===================================================================
--- head/www/mohawk/pkg-descr	(revision 299906)
+++ head/www/mohawk/pkg-descr	(revision 299907)
@@ -1,10 +1,10 @@
 Simple and lightweight HTTP daemon. 
 
 It provides the following features:
 - Basic support for CGI, 
 - ipv6, authentication, 
 - virtual host, 
 - basic authentication
 - basic url mapping system.
 
-WWW:	http://git.etoilebsd.net/mohawk
+WWW:	http://fossil.etoilebsd.net/mohawk

Property changes on: head/www/mohawk/pkg-descr
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property