[pkgsrc/pkgsrc-2006Q4]: pkgsrc/mail Pullup ticket 2038 - requested by salo

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a774f09a1d2
branches:  pkgsrc-2006Q4
changeset: 523045:4a774f09a1d2
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Mon Mar 05 12:29:18 2007 +0000

description:
Pullup ticket 2038 - requested by salo
build/usability fixes for clamav

- pkgsrc/mail/clamav/Makefile                           1.69 via patch
- pkgsrc/mail/clamav/options                            1.1
- pkgsrc/mail/p5-Mail-ClamAV/Makefile                   1.21
- pkgsrc/mail/p5-Mail-ClamAV/distinfo                   1.7

   Module Name: pkgsrc
   Committed By:        wiz
   Date:                Wed Feb 21 22:10:47 UTC 2007

   Modified Files:
           pkgsrc/mail/p5-Mail-ClamAV: Makefile distinfo

   Log Message:
   Update to 0.20:
      - Updated for new clamav release 0.90
---
   Module Name: pkgsrc
   Committed By:        xtraeme
   Date:                Wed Feb 28 20:42:05 UTC 2007

   Modified Files:
           pkgsrc/mail/clamav: Makefile
   Added Files:
           pkgsrc/mail/clamav: options.mk

   Log Message:
   Disable --enable-experimental by default, because it does not work
   correctly with sparc64.

   Make it an option: clamav-experimental.

   Move all options into the options.mk file.

diffstat:

 mail/clamav/Makefile         |  34 +++-------------------------------
 mail/clamav/options.mk       |  34 ++++++++++++++++++++++++++++++++++
 mail/p5-Mail-ClamAV/Makefile |  10 +++++-----
 mail/p5-Mail-ClamAV/distinfo |   8 ++++----
 4 files changed, 46 insertions(+), 40 deletions(-)

diffs (136 lines):

diff -r f5bb6ed02825 -r 4a774f09a1d2 mail/clamav/Makefile
--- a/mail/clamav/Makefile      Mon Mar 05 12:12:42 2007 +0000
+++ b/mail/clamav/Makefile      Mon Mar 05 12:29:18 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.66.2.1 2007/02/17 18:34:24 salo Exp $
+# $NetBSD: Makefile,v 1.66.2.2 2007/03/05 12:29:18 ghen Exp $
 
 DISTNAME=      clamav-${CLAMAV_VERSION}
 PKGNAME=       clamav-${CLAMAV_VERSION:S/-/./}
-#PKGREVISION=  1
+PKGREVISION=   1
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=clamav/}
 
@@ -24,7 +24,6 @@
 CONFIGURE_ARGS+=       --with-group=${CLAMAV_GROUP:Q}
 CONFIGURE_ARGS+=       --with-tcpwrappers
 CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
-CONFIGURE_ARGS+=       --enable-experimental
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -52,34 +51,7 @@
 
 INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} CFGINST=${EGDIR} DBINST=${EGDIR}
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.clamav
-PKG_SUPPORTED_OPTIONS= curl milter
-PKG_SUGGESTED_OPTIONS= curl
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mmilter)
-# force use of pkgsrc version of libmilter -- clamav uses the sendmail binary
-# to check API compatibility(!), so it must build with as new a version of
-# libmilter as pkgsrc is capable of providing
-USE_BUILTIN.libmilter= no
-.  include "../../mail/libmilter/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-milter
-PLIST_SUBST+=          MILTER=
-.else
-CONFIGURE_ARGS+=       --disable-milter
-# XXX --disable-milter doesn't work as expected, so we need this
-CONFIGURE_ENV+=                ac_cv_header_libmilter_mfapi_h=no
-PLIST_SUBST+=          MILTER="@comment "
-.endif
-
-.if !empty(PKG_OPTIONS:Mcurl)
-.  include "../../www/curl/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-libcurl
-BUILDLINK_API_DEPENDS.curl+=curl>=7.10.0
-.else
-CONFIGURE_ARGS+=       --without-libcurl
-.endif
+.include "options.mk"
 
 # pkgsrc enforces a "secure" version of zlib, so don't let this check
 # bomb the build.
diff -r f5bb6ed02825 -r 4a774f09a1d2 mail/clamav/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/clamav/options.mk    Mon Mar 05 12:29:18 2007 +0000
@@ -0,0 +1,34 @@
+# $NetBSD: options.mk,v 1.1.2.2 2007/03/05 12:29:19 ghen Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.clamav
+PKG_SUPPORTED_OPTIONS= curl milter clamav-experimental
+PKG_SUGGESTED_OPTIONS= curl
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mmilter)
+# force use of pkgsrc version of libmilter -- clamav uses the sendmail binary
+# to check API compatibility(!), so it must build with as new a version of
+# libmilter as pkgsrc is capable of providing
+USE_BUILTIN.libmilter=  no
+.  include "../../mail/libmilter/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-milter
+PLIST_SUBST+=          MILTER=
+.else
+CONFIGURE_ARGS+=       --disable-milter
+# XXX --disable-milter doesn't work as expected, so we need this
+CONFIGURE_ENV+=                ac_cv_header_libmilter_mfapi_h=no
+PLIST_SUBST+=          MILTER="@comment "
+.endif
+
+.if !empty(PKG_OPTIONS:Mcurl)
+.  include "../../www/curl/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-libcurl
+BUILDLINK_API_DEPENDS.curl+=curl>=7.10.0
+.else
+CONFIGURE_ARGS+=       --without-libcurl
+.endif
+
+.if !empty(PKG_OPTIONS:Mclamav-experimental)
+CONFIGURE_ARGS+=       --enable-experimental
+.endif
diff -r f5bb6ed02825 -r 4a774f09a1d2 mail/p5-Mail-ClamAV/Makefile
--- a/mail/p5-Mail-ClamAV/Makefile      Mon Mar 05 12:12:42 2007 +0000
+++ b/mail/p5-Mail-ClamAV/Makefile      Mon Mar 05 12:29:18 2007 +0000
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.20 2006/11/19 11:50:24 wiz Exp $
+# $NetBSD: Makefile,v 1.20.2.1 2007/03/05 12:29:19 ghen Exp $
 
-DISTNAME=      Mail-ClamAV-0.17
+DISTNAME=      Mail-ClamAV-0.20
 PKGNAME=       p5-${DISTNAME}
-PKGREVISION=   3
 CATEGORIES=    mail perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Mail/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://search.cpan.org/dist/Mail-ClamAV/
 COMMENT=       Perl5 module for mail/clamav virus scanner
 
 DEPENDS+=      p5-Inline>=0.40:../../devel/p5-Inline
 
-# this version needs clamav>=0.80
-BUILDLINK_API_DEPENDS.clamav+= clamav>=0.80
+# this version needs clamav>=0.90
+BUILDLINK_API_DEPENDS.clamav+= clamav>=0.90
 
 PERL5_PACKLIST=                auto/Mail/ClamAV/.packlist
 PTHREAD_OPTS+=         require
diff -r f5bb6ed02825 -r 4a774f09a1d2 mail/p5-Mail-ClamAV/distinfo
--- a/mail/p5-Mail-ClamAV/distinfo      Mon Mar 05 12:12:42 2007 +0000
+++ b/mail/p5-Mail-ClamAV/distinfo      Mon Mar 05 12:29:18 2007 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2005/06/24 06:03:11 grant Exp $
+$NetBSD: distinfo,v 1.6.12.1 2007/03/05 12:29:19 ghen Exp $
 
-SHA1 (Mail-ClamAV-0.17.tar.gz) = 07681413f08b20a595e0a822c274477d0660fa00
-RMD160 (Mail-ClamAV-0.17.tar.gz) = d131fac8e409cb0222cf94cd46f45095ed0d8dc4
-Size (Mail-ClamAV-0.17.tar.gz) = 15441 bytes
+SHA1 (Mail-ClamAV-0.20.tar.gz) = 474e55ff77a8c1f3b0c996a97c34aa04e56a1113
+RMD160 (Mail-ClamAV-0.20.tar.gz) = 33b0627ccb542eda82f79e625d3f66ffe040bdfd
+Size (Mail-ClamAV-0.20.tar.gz) = 14377 bytes