Index: Makefile
===================================================================
RCS file: /cvs/ports/www/squid/Makefile,v
retrieving revision 1.99
diff -u -p -r1.99 Makefile
--- Makefile	30 Aug 2009 21:52:44 -0000	1.99
+++ Makefile	14 Oct 2009 14:50:14 -0000
@@ -3,7 +3,7 @@
 COMMENT=	WWW and FTP proxy cache and accelerator
 
 DISTNAME=	squid-2.7.STABLE6
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	www
 MASTER_SITES=	${HOMEPAGE}/Versions/v2/2.7/
 DIST_SUBDIR=	squid
@@ -22,7 +22,7 @@ WANTLIB=	asn1 c com_err crypto krb5 gssa
 SQUIDDIR?=	/var/squid
 SUBST_VARS=	SQUIDDIR
 
-FLAVORS=	ldap snmp
+FLAVORS=	ldap ntlm snmp
 FLAVOR?=
 
 .include <bsd.own.mk>
@@ -69,10 +69,21 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}
 		LDFLAGS="-L${LOCALBASE}/lib"
 .endif
 
+.if ${FLAVOR:L:Mntlm}
+BASIC_AUTH+= 	SMB
+EXTERNAL_ACL+= 	wbinfo_group
+RUN_DEPENDS += 	::net/samba,ads
+CONFIGURE_ARGS+=--enable-auth="basic digest ntlm" \
+		--enable-ntlm-auth-helpers="SMB"
+.endif
+
+
 .if${FLAVOR:L:Msnmp}
 CONFIGURE_ARGS+=--enable-snmp
 .endif
 
+post-configure:
+	@perl -pi -e 's|wbinfo -|${LOCALBASE}/bin/wbinfo -|g' ${WRKSRC}/helpers/external_acl/wbinfo_group/wbinfo_group.pl
 post-install:
 	@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/squid
 	@find ${PREFIX}/share/examples/squid/errors \
Index: pkg/PFRAG.ntlm
===================================================================
RCS file: pkg/PFRAG.ntlm
diff -N pkg/PFRAG.ntlm
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.ntlm	14 Oct 2009 14:50:14 -0000
@@ -0,0 +1,5 @@
+@comment $OpenBSD$
+@bin libexec/ntlm_auth
+@bin libexec/smb_auth
+libexec/smb_auth.sh
+libexec/wbinfo_group.pl
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/squid/pkg/PLIST,v
retrieving revision 1.30
diff -u -p -r1.30 PLIST
--- pkg/PLIST	8 Feb 2009 15:04:33 -0000	1.30
+++ pkg/PLIST	14 Oct 2009 14:50:14 -0000
@@ -20,6 +20,7 @@ bin/RunCache
 @man man/man8/squid.8
 @man man/man8/squid_unix_group.8
 %%ldap%%
+%%ntlm%%
 @bin sbin/squid
 share/examples/squid/
 @sample ${SYSCONFDIR}/squid/