- Upgrade to 0.3.5.

- Add VSCAN_SAMBA_PORT knob to work with samba3 port.

No response from:	maintainer

4 files changed, 23 insertions, 23 deletions

diff --git a/security/samba-vscan/Makefile b/security/samba-vscan/Makefile
index 31ad756f204..edc89266090 100644
--- a/security/samba-vscan/Makefile
+++ b/security/samba-vscan/Makefile
@@ -6,7 +6,7 @@
 #
 
 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/ \
@@ -15,15 +15,22 @@ MASTER_SITES=	http://heanet.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
diff --git a/security/samba-vscan/distinfo b/security/samba-vscan/distinfo
index 2c7b1b46414..35d8d714362 100644
--- a/security/samba-vscan/distinfo
+++ b/security/samba-vscan/distinfo
@@ -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
diff --git a/security/samba-vscan/files/patch-openantivirus::vscan-oav_core.h b/security/samba-vscan/files/patch-openantivirus::vscan-oav_core.h
deleted file mode 100644
index a560448dc01..00000000000
--- a/security/samba-vscan/files/patch-openantivirus::vscan-oav_core.h
+++ /dev/null
@@ -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>
diff --git a/security/samba-vscan/pkg-plist b/security/samba-vscan/pkg-plist
index f91ae3b4ecf..8dc06babe7b 100644
--- a/security/samba-vscan/pkg-plist
+++ b/security/samba-vscan/pkg-plist
@@ -6,13 +6,16 @@ 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