svn commit: r305457 - in head/net/samba4-devel: . files

[Koop Mast]

Author: kwm
Date: Sun Oct  7 11:16:07 2012
New Revision: 305457
URL: http://svn.freebsd.org/changeset/ports/305457

Log:
  Unbreak by using bundled tevent.
  
  While here update header and switch USE_PKGCONFIG.
  
  PR:		ports/171614
  Submitted by:	John Hein <jhein at symmetricom.com>
  Approved by:	maintainer

Deleted:
  head/net/samba4-devel/files/patch-source4-min__versions.m4
Modified:
  head/net/samba4-devel/Makefile

Modified: head/net/samba4-devel/Makefile
==============================================================================
--- head/net/samba4-devel/Makefile	Sun Oct  7 11:10:18 2012	(r305456)
+++ head/net/samba4-devel/Makefile	Sun Oct  7 11:16:07 2012	(r305457)
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	samba4
-# Date created:				28 Jun 2006
-# Whom:					timur at FreeBSD.org
-#
+# Created by: timur at 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 @@ DISTNAME=		${SAMBA_DISTNAME}
 MAINTAINER?=		timur at 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_PYTHON=		yes
 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 @@ CONFIGURE_ARGS+=	--enable-external-libtd
 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 \