From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jan 8 20:40:21 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 163DE16A4CF for ; Sat, 8 Jan 2005 20:40:21 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC64843D4C for ; Sat, 8 Jan 2005 20:40:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j08KeKlP013536 for ; Sat, 8 Jan 2005 20:40:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j08KeKUT013532; Sat, 8 Jan 2005 20:40:20 GMT (envelope-from gnats) Resent-Date: Sat, 8 Jan 2005 20:40:20 GMT Resent-Message-Id: <200501082040.j08KeKUT013532@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rainer Link Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5F4EF16A4CE for ; 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 ; 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: Date: Sat, 08 Jan 2005 21:36:05 +0100 From: Rainer Link Sender: Rainer Link To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/75966: [patch] improve samba-vscan port X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Rainer Link List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jan 2005 20:40:21 -0000 >Number: 75966 >Category: ports >Synopsis: [patch] improve samba-vscan port >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Jan 08 20:40:20 GMT 2005 >Closed-Date: >Last-Modified: >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: >Unformatted: