Index: head/security/samba-vscan/Makefile
===================================================================
--- head/security/samba-vscan/Makefile	(revision 115437)
+++ head/security/samba-vscan/Makefile	(revision 115438)
@@ -1,41 +1,48 @@
 # New ports collection makefile for:	samba-vscan
 # Date created:		27 February 2004
 # Whom:			Jean Milanez Melo <jmelo@freebsdbrasil.com.br>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	samba-vscan
-PORTVERSION=	0.3.4
+PORTVERSION=	0.3.5
 CATEGORIES=	security
 MASTER_SITES=	http://heanet.dl.sourceforge.net/sourceforge/openantivirus/ \
 		http://easynews.dl.sourceforge.net/sourceforge/openantivirus/ \
 		http://flow.dl.sourceforge.net/sourceforge/openantivirus/
 
 MAINTAINER=	jmelo@freebsdbrasil.com.br
 COMMENT=	On-access virus scanning with Samba
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/samba:configure
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/${VSCAN_SAMBA_PORT}:build
 
 USE_BZIP2=	yes
-SAMBA_WRKSRC=	`cd ${PORTSDIR}/net/samba; make -V WRKSRC`
+SAMBA_WRKSRC=	`cd ${PORTSDIR}/net/${VSCAN_SAMBA_PORT}; make -V WRKSRC`
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-samba-source=${SAMBA_WRKSRC}
 ETCDIR=		${PREFIX}/etc/samba-vscan
 PKGMESSAGE=	${WRKDIR}/pkg-message
+VSCAN_SAMBA_PORT?=samba
+
+.if ${VSCAN_SAMBA_PORT} == "samba3"
+PLIST_SUB=	VFSDIR=lib/samba/vfs
+.else
+PLIST_SUB=	VFSDIR=lib/samba
+.endif
 
 post-install:
 	@${MKDIR} ${PREFIX}/etc/samba-vscan
 	@${INSTALL_DATA} ${WRKSRC}/clamav/vscan-clamav.conf ${ETCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/fprot/vscan-fprotd.conf ${ETCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/icap/vscan-icap.conf ${ETCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/kaspersky/vscan-kavp.conf ${ETCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/mks/vscan-mks32.conf ${ETCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/openantivirus/vscan-oav.conf ${ETCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/sophos/vscan-sophos.conf ${ETCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/trend/vscan-trend.conf ${ETCDIR}
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g;" ${.CURDIR}/pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Property changes on: head/security/samba-vscan/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/security/samba-vscan/distinfo
===================================================================
--- head/security/samba-vscan/distinfo	(revision 115437)
+++ head/security/samba-vscan/distinfo	(revision 115438)
@@ -1,2 +1,2 @@
-MD5 (samba-vscan-0.3.4.tar.bz2) = acbcb28cff080dcf2ee732b7f2c0f949
-SIZE (samba-vscan-0.3.4.tar.bz2) = 131027
+MD5 (samba-vscan-0.3.5.tar.bz2) = 5f173d549014985d681478897135915b
+SIZE (samba-vscan-0.3.5.tar.bz2) = 161982

Property changes on: head/security/samba-vscan/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/security/samba-vscan/files/patch-openantivirus::vscan-oav_core.h
===================================================================
--- head/security/samba-vscan/files/patch-openantivirus::vscan-oav_core.h	(revision 115437)
+++ head/security/samba-vscan/files/patch-openantivirus::vscan-oav_core.h	(nonexistent)
@@ -1,10 +0,0 @@
---- openantivirus/vscan-oav_core.h.orig	Thu Feb 26 10:28:04 2004
-+++ openantivirus/vscan-oav_core.h	Thu Feb 26 10:28:16 2004
-@@ -1,6 +1,7 @@
- #ifndef __VSCAN_OAV_CORE_H_
- #define __VSCAN_OAV_CORE_H_
- 
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>

Property changes on: head/security/samba-vscan/files/patch-openantivirus::vscan-oav_core.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/security/samba-vscan/pkg-plist
===================================================================
--- head/security/samba-vscan/pkg-plist	(revision 115437)
+++ head/security/samba-vscan/pkg-plist	(revision 115438)
@@ -1,18 +1,21 @@
 etc/samba-vscan/vscan-clamav.conf
 etc/samba-vscan/vscan-fprotd.conf
 etc/samba-vscan/vscan-icap.conf
 etc/samba-vscan/vscan-kavp.conf
 etc/samba-vscan/vscan-mks32.conf
 etc/samba-vscan/vscan-oav.conf
 etc/samba-vscan/vscan-sophos.conf
 etc/samba-vscan/vscan-trend.conf
-lib/samba/vscan-clamav.so
-lib/samba/vscan-fprotd.so
-lib/samba/vscan-icap.so
-lib/samba/vscan-kavp.so
-lib/samba/vscan-mksd.so
-lib/samba/vscan-oav.so
-lib/samba/vscan-sophos.so
-lib/samba/vscan-trend.so
+%%VFSDIR%%/vscan-clamav.so
+%%VFSDIR%%/vscan-fprotd.so
+%%VFSDIR%%/vscan-fsav.so
+%%VFSDIR%%/vscan-icap.so
+%%VFSDIR%%/vscan-kavp.so
+%%VFSDIR%%/vscan-mcdaemon.so
+%%VFSDIR%%/vscan-mksd.so
+%%VFSDIR%%/vscan-oav.so
+%%VFSDIR%%/vscan-sophos.so
+%%VFSDIR%%/vscan-trend.so
+@unexec rmdir %D/%%VFSDIR%% 2>/dev/null || true
 @unexec rmdir %D/lib/samba 2>/dev/null || true
 @dirrm etc/samba-vscan

Property changes on: head/security/samba-vscan/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property