diff options
| -rw-r--r-- | mail/clamav/Makefile | 8 | ||||
| -rw-r--r-- | mail/clamav/PLIST | 5 | ||||
| -rw-r--r-- | mail/clamav/distinfo | 5 | ||||
| -rw-r--r-- | mail/clamav/patches/patch-aa | 10 | ||||
| -rw-r--r-- | mail/clamav/patches/patch-ab | 13 |
5 files changed, 30 insertions, 11 deletions
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile index 8973e1e97cd..875597ad67b 100644 --- a/mail/clamav/Makefile +++ b/mail/clamav/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:37 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2003/06/07 17:39:15 jmmv Exp $ DISTNAME= clamav-0.54 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail MASTER_SITES= http://clamav.elektrapro.com/stable/ @@ -15,10 +15,14 @@ USE_PKGINSTALL= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --disable-clamav +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} PKG_GROUPS+= ${CLAMAV_GROUP} PKG_USERS+= ${CLAMAV_USER}:${CLAMAV_GROUP}::Clamav\\ User +EGDIR= ${PREFIX}/share/examples/clamav +CONF_FILES= ${EGDIR}/clamav.conf ${PKG_SYSCONFDIR}/clamav.conf + pre-configure: cd ${WRKSRC}; ${AUTOCONF} diff --git a/mail/clamav/PLIST b/mail/clamav/PLIST index 093caa28ca4..dad3b71c4dc 100644 --- a/mail/clamav/PLIST +++ b/mail/clamav/PLIST @@ -1,8 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2003/03/26 18:55:17 agc Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/06/07 17:39:15 jmmv Exp $ bin/clamscan bin/freshclam bin/sigtool -etc/clamav.conf include/clamav.h lib/libclamav.a lib/libclamav.la @@ -17,4 +16,6 @@ man/man5/clamav.conf.5 man/man8/clamd.8 share/clamav/viruses.db share/clamav/viruses.db2 +share/examples/clamav/clamav.conf +@dirrm share/examples/clamav @dirrm share/clamav diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo index e95aabc89a9..64035f2f62e 100644 --- a/mail/clamav/distinfo +++ b/mail/clamav/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/03/26 18:55:17 agc Exp $ +$NetBSD: distinfo,v 1.2 2003/06/07 17:39:15 jmmv Exp $ SHA1 (clamav-0.54.tar.gz) = 895d96c56667e037479f918064b9ac4fd2a4604a Size (clamav-0.54.tar.gz) = 985170 bytes -SHA1 (patch-aa) = 6b0bad36a703d4fc240304c454ae7fe78df7d32d +SHA1 (patch-aa) = 679df954d958046af7175af3d1ec5b759d3dae15 +SHA1 (patch-ab) = e0858b7d2f716a8aded21e96c968cd2d9fef22e0 diff --git a/mail/clamav/patches/patch-aa b/mail/clamav/patches/patch-aa index 6570423f968..d5d2dbf0f8b 100644 --- a/mail/clamav/patches/patch-aa +++ b/mail/clamav/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/03/26 18:55:17 agc Exp $ +$NetBSD: patch-aa,v 1.2 2003/06/07 17:39:15 jmmv Exp $ --- configure.in.orig Thu Nov 21 01:43:16 2002 +++ configure.in Tue Mar 11 17:48:07 2003 @@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/03/26 18:55:17 agc Exp $ -else - cfg_dir="$sysconfdir" -fi -+cfg_dir=$prefix/etc ++cfg_dir=$sysconfdir CFGDIR=$cfg_dir AC_SUBST(CFGDIR) @@ -24,10 +24,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/03/26 18:55:17 agc Exp $ + AC_MSG_RESULT(NetBSD detected. Adding pth stuff.) have_pthreads="no" AC_DEFINE(C_BSD) -+ LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L/usr/pkg/lib -lpthread" ++ LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LDFLAGS -lpthread" + AC_DEFINE(CL_THREAD_SAFE) -+ CLAMD_LIBS="-lpthread -L/usr/pkg/lib" -+ CFLAGS="$CFLAGS -I/usr/pkg/include" ++ CLAMD_LIBS="-lpthread $LDFLAGS" ++ CFLAGS="$CFLAGS" ;; bsd*) AC_MSG_RESULT(Unknown BSD detected. Disabling thread support.) diff --git a/mail/clamav/patches/patch-ab b/mail/clamav/patches/patch-ab new file mode 100644 index 00000000000..5c81dced96b --- /dev/null +++ b/mail/clamav/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2003/06/07 17:39:15 jmmv Exp $ + +--- etc/Makefile.in.orig 2002-11-21 01:44:02.000000000 +0100 ++++ etc/Makefile.in +@@ -118,7 +118,7 @@ am__quote = @am__quote@ + install_sh = @install_sh@ + + EXTRA_DIST = clamav.conf +-CFGINST = @CFGDIR@ ++CFGINST = $(datadir)/examples/clamav + subdir = etc + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_CLEAN_FILES = |