From link@netclue.de  Sat Jan  8 20:36:07 2005
Return-Path: <link@netclue.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5F4EF16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  8 Jan 2005 20:36:07 +0000 (GMT)
Received: from netclue.de (ask.netclue.de [213.95.27.137])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E14B143D39
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  8 Jan 2005 20:36:06 +0000 (GMT)
	(envelope-from link@netclue.de)
Received: from link by netclue.de with local (Exim 4.43 (FreeBSD))
	id 1CnNJd-000KZD-AA
	for FreeBSD-gnats-submit@freebsd.org; Sat, 08 Jan 2005 21:36:05 +0100
Message-Id: <E1CnNJd-000KZD-AA@netclue.de>
Date: Sat, 08 Jan 2005 21:36:05 +0100
From: Rainer Link <link@unfug.org>
Sender: Rainer Link <link@netclue.de>
Reply-To: Rainer Link <link@unfug.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] improve samba-vscan port	
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         75966
>Category:       ports
>Synopsis:       [patch] improve samba-vscan port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 08 20:40:20 GMT 2005
>Closed-Date:    Mon May 30 20:56:41 GMT 2005
>Last-Modified:  Mon May 30 20:56:41 GMT 2005
>Originator:     Rainer Link
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD hq.netclue.de 5.3-STABLE FreeBSD 5.3-STABLE #0: Mon Oct 25 17:11:28 CEST 2004 aw@hq.netclue.de:/usr/obj/usr/src/sys/NETCLUE i386


>Description:
	To build samba-vscan it's not necessary to build Samba; 
	for Samba 2.2 it's sufficient to run configure, for Samba 3.0
	"make proto" must be executed as well.
	As Samba 2.2 is discontinued by the Samba team, the default
	should be to build samba-vscan for Samba 3.0.
	Documentation should be installed, at least INSTALL is recommended
	as this file provides hints for proper installation of the
	required anti-virus software.
 
>How-To-Repeat:

>Fix:
	Attached is a proposed fix. 

--- Makefile.dif begins here ---
--- Makefile.orig	Sat Aug 28 07:08:45 2004
+++ Makefile	Sat Jan  8 20:54:02 2005
@@ -16,7 +16,10 @@
 MAINTAINER=	jmelo@freebsdbrasil.com.br
 COMMENT=	On-access virus scanning with Samba
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/${VSCAN_SAMBA_PORT}:build
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/${VSCAN_SAMBA_PORT}:configure
+.if !defined(NOPORTDOCS)
+PORTDOCS=	AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README
+.endif
 
 USE_BZIP2=	yes
 SAMBA_WRKSRC=	`cd ${PORTSDIR}/net/${VSCAN_SAMBA_PORT}; make -V WRKSRC`
@@ -25,7 +28,7 @@
 CONFIGURE_ARGS=	--with-samba-source=${SAMBA_WRKSRC}
 ETCDIR=		${PREFIX}/etc/samba-vscan
 PKGMESSAGE=	${WRKDIR}/pkg-message
-VSCAN_SAMBA_PORT?=samba
+VSCAN_SAMBA_PORT?=samba3
 
 .if ${VSCAN_SAMBA_PORT} == "samba3"
 PLIST_SUB=	VFSDIR=lib/samba/vfs
@@ -33,7 +36,18 @@
 PLIST_SUB=	VFSDIR=lib/samba
 .endif
 
+pre-configure:
+.if ${VSCAN_SAMBA_PORT} == "samba3"
+		@cd ${SAMBA_WRKSRC}; make proto 2>&1 > /dev/null 
+.endif
+
 post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for i in ${PORTDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
 	@${MKDIR} ${PREFIX}/etc/samba-vscan
 	@${INSTALL_DATA} ${WRKSRC}/clamav/vscan-clamav.conf ${ETCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/fprot/vscan-fprotd.conf ${ETCDIR}
--- Makefile.dif ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: vs 
State-Changed-When: Wed Jan 19 17:01:20 GMT 2005 
State-Changed-Why:  
Forwarded PR to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=75966 

From: "Volker Stolz" <vs@freebsd.org>
To: freebsd-gnats-submit@freebsd.org, link@unfug.org,
	jmelo@freebsdbrasil.com.br
Cc:  
Subject: Re: ports/75966: [patch] improve samba-vscan port
Date: Wed, 19 Jan 2005 18:01:07 +0100

 Dear maintainer, please review the following patch!
 
 Cheers,
    Volker
State-Changed-From-To: feedback->open 
State-Changed-By: vs 
State-Changed-When: Mon Jan 24 12:55:56 GMT 2005 
State-Changed-Why:  
Approved by maintainer, but I can't handle this one atm. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=75966 
State-Changed-From-To: open->closed 
State-Changed-By: flz 
State-Changed-When: Thu Apr 14 12:42:36 GMT 2005 
State-Changed-Why:  
Feedback timeout, the port was quite messed up and I'm not 
sure we can handle everyone's shell configuration in the tree. 

Thanks for your submission anyway ! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=75966 
State-Changed-From-To: closed->open 
State-Changed-By: flz 
State-Changed-When: Thu Apr 14 12:46:31 GMT 2005 
State-Changed-Why:  
Eerm, wrong PR, re-open. 


Responsible-Changed-From-To: freebsd-ports-bugs->flz 
Responsible-Changed-By: flz 
Responsible-Changed-When: Thu Apr 14 12:46:31 GMT 2005 
Responsible-Changed-Why:  
Grab. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=75966 
Responsible-Changed-From-To: flz->freebsd-ports-bugs 
Responsible-Changed-By: flz 
Responsible-Changed-When: Fri Apr 22 15:28:32 GMT 2005 
Responsible-Changed-Why:  
Return to the pool, I'll be afk for at least 2 weeks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=75966 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Mon May 30 20:56:32 GMT 2005 
State-Changed-Why:  
Integrated in ports/81669 

http://www.freebsd.org/cgi/query-pr.cgi?pr=75966 
>Unformatted:
