Index: net/samba4-devel/Makefile
===================================================================
--- net/samba4-devel/Makefile	(revision 305447)
+++ net/samba4-devel/Makefile	(working copy)
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	samba4
-# Date created:				28 Jun 2006
-# Whom:					timur@FreeBSD.org
-#
+# Created by: timur@FreeBSD.org
 # $FreeBSD$
-#
+
 PORTNAME?=		${SAMBA_PORTNAME}
 PORTVERSION?=		${SAMBA_VERSION}
-PORTREVISION?=		2
+PORTREVISION?=		3
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	samba4
@@ -16,8 +13,6 @@
 MAINTAINER?=		timur@FreeBSD.org
 COMMENT?=		A free SMB and CIFS client and server for UNIX
 
-BROKEN=			does not configure
-
 CONFLICTS?=		ldb-1.*
 
 SAMBA_PORTNAME=		samba4
@@ -39,7 +34,7 @@
 USE_GMAKE=		yes
 USE_ICONV=		yes
 GNU_CONFIGURE=		yes
-USE_GNOME=		pkgconfig
+USE_PKGCONFIG=		build
 USE_LDCONFIG=		${SAMBA_LIBDIR}
 USE_AUTOTOOLS=		autoconf autoheader
 # Flags
@@ -91,8 +86,10 @@
 LIB_DEPENDS+=		talloc.2:${PORTSDIR}/devel/talloc
 CONFIGURE_ARGS+=	--enable-external-libtalloc
 # tevent
-LIB_DEPENDS+=		tevent.0:${PORTSDIR}/devel/tevent
-CONFIGURE_ARGS+=	--enable-external-libtevent
+#LIB_DEPENDS+=		tevent.0:${PORTSDIR}/devel/tevent
+#CONFIGURE_ARGS+=	--enable-external-libtevent
+# tevent - use internal libtevent since FreeBSD's port is at
+# 0.9.15 and samba4.alpha11 claims to want exactly 0.9.8
 
 OPTIONS=	\
 		DEBUG		"With debug info" off \
Index: net/samba4-devel/files/patch-source4-min__versions.m4
===================================================================
--- net/samba4-devel/files/patch-source4-min__versions.m4	(revision 305447)
+++ net/samba4-devel/files/patch-source4-min__versions.m4	(working copy)
@@ -1,8 +0,0 @@
---- ./source4/min_versions.m4.orig	2010-01-11 06:35:28.000000000 +0100
-+++ ./source4/min_versions.m4	2011-08-05 17:15:56.000000000 +0200
-@@ -3,4 +3,4 @@
- define(TDB_MIN_VERSION,1.2.0)
- define(TALLOC_MIN_VERSION,2.0.1)
- define(LDB_REQUIRED_VERSION,0.9.10)
--define(TEVENT_REQUIRED_VERSION,0.9.8)
-+define(TEVENT_REQUIRED_VERSION,0.9.13)