Update to 0.48

This release includes the following features:

- Compatibility for the upcoming ClamAV 0.95
- Add new iconset
- Ukrainian translation
- Many other bug fixes

PR:		132902
Submitted by:	Anderson S. Ferreira (maintainer)

5 files changed, 33 insertions, 52 deletions

diff --git a/security/klamav/Makefile b/security/klamav/Makefile
index a610e9920697..01d38df5a666 100644
--- a/security/klamav/Makefile
+++ b/security/klamav/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	klamav
-PORTVERSION=	0.44
-PORTREVISION=	1
+PORTVERSION=	0.46
 CATEGORIES=	security
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
@@ -15,7 +14,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 MAINTAINER=	anderson@cnpm.embrapa.br
 COMMENT=	A KDE 3 front-end to Clam Anti-Virus
 
-LIB_DEPENDS=	clamav.5:${PORTSDIR}/security/clamav
+LIB_DEPENDS=	clamav:${PORTSDIR}/security/clamav
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/security/klamav/distinfo b/security/klamav/distinfo
index e4743ffc67f5..ba5652e92132 100644
--- a/security/klamav/distinfo
+++ b/security/klamav/distinfo
@@ -1,3 +1,3 @@
-SHA256 (klamav-0.44-source.tar.gz) = 6427bd94b33ff23d78c5edd3ef6340229d1478ee683b92b9171487f3e4f8fc6a
-MD5 (klamav-0.44-source.tar.gz) = 1e5caa994677b8e82819d6340abde97f
-SIZE (klamav-0.44-source.tar.gz) = 2029215
+SIZE (klamav-0.46-source.tar.gz) = 2058031
+MD5 (klamav-0.46-source.tar.gz) = e3669d312998ae50bfb14a26a08aa6e4
+SHA256 (klamav-0.46-source.tar.gz) = b39b3c8df613272e2dc5120d409d947f1250262318fc659efd4b93a8a3f90079
diff --git a/security/klamav/files/patch-po b/security/klamav/files/patch-po
index 26fa89d32965..b6c3ec21c8d4 100644
--- a/security/klamav/files/patch-po
+++ b/security/klamav/files/patch-po
@@ -153,3 +153,20 @@
  "o'. Daha sonra yetkili kullanıcı şifresi sorulacak."
  
  #: klamd.cpp:734 klamd.cpp:735
+--- po/uk.po.orig	2009-03-21 09:54:35.000000000 -0300
++++ po/uk.po	2009-03-21 09:55:24.000000000 -0300
+@@ -999,12 +999,12 @@
+ "I need to load a module called 'dazuko' first. This module will allow KlamAV "
+ "to gain real-time access to files. If you don't want this message to appear "
+ "in future, put the following command in your initialization scripts: "
+-"'modprobe dazuko.o'. You will next be asked for the root password."
++"'kldload dazuko.ko'. You will next be asked for the root password."
+ msgstr ""
+ "Спершу потрібно завантажити модуль, що має назву 'dazuko'. Цей модуль "
+ "дозволить KlamAV отримати доступ до файлів у реальному часі. Якщо Ви не "
+ "бажаєте появи цього повідомлення далі, додайте таку команду до Ваших "
+-"початковий скриптів: 'modprobe dazuko.o'. Зараз Вам потрібно буде ввести "
++"початковий скриптів: 'kldload dazuko.ko'. Зараз Вам потрібно буде ввести "
+ "пароль адміністратора."
+ 
+ #: klamd.cpp:734 klamd.cpp:735
diff --git a/security/klamav/files/patch-src_klammail_clamdmail.c b/security/klamav/files/patch-src_klammail_clamdmail.c
deleted file mode 100644
index 77a6257aa95b..000000000000
--- a/security/klamav/files/patch-src_klammail_clamdmail.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/klammail/clamdmail.c.orig	2008-09-16 08:46:48.000000000 -0300
-+++ src/klammail/clamdmail.c	2008-09-16 08:47:25.000000000 -0300
-@@ -160,7 +160,7 @@
-                 if(fsync(fd) == -1) {
- //                         cli_dbgmsg("fsync() failed for descriptor %d\n", fd);
-                         close(fd);
--                        return CL_EFSYNC;
-+                        return CL_EIO;
-                 }
- 
-                 close(fd);
diff --git a/security/klamav/pkg-plist b/security/klamav/pkg-plist
index 793d7ab9e4b6..807c8fc3e94e 100644
--- a/security/klamav/pkg-plist
+++ b/security/klamav/pkg-plist
@@ -4,6 +4,7 @@ bin/ScanWithKlamAV
 %%DOCSDIR%%/index.docbook
 %%DOCSDIR%%/index.cache.bz2
 %%DOCSDIR%%/common
+share/locale/uk/LC_MESSAGES/klamav.mo
 share/locale/de/LC_MESSAGES/klamav.mo
 share/locale/cs/LC_MESSAGES/klamav.mo
 share/locale/hu/LC_MESSAGES/klamav.mo
@@ -21,31 +22,19 @@ share/applnk/Utilities/klamav.desktop
 share/apps/konqueror/servicemenus/klamav-dropdown.desktop
 share/apps/klamav/klamavui.rc
 share/config.kcfg/klamavconfig.kcfg
-share/icons/locolor/32x32/apps/klamav.png
-share/icons/locolor/32x32/actions/klamav.png
-share/icons/locolor/16x16/apps/klamav.png
 share/icons/hicolor/48x48/apps/klamav.png
 share/icons/hicolor/32x32/apps/klamav.png
-share/icons/hicolor/22x22/actions/klamav.png
-share/icons/hicolor/32x32/actions/klamav.png
-share/icons/locolor/16x16/actions/klamav.png
-share/apps/klamav/icons/locolor/32x32/apps/klamav.png
-share/apps/klamav/icons/hicolor/32x32/actions/klamavbw.png
-share/apps/klamav/icons/hicolor/32x32/actions/klamavdl.png
-share/apps/klamav/icons/hicolor/32x32/actions/klamavbwdl.png
-share/apps/klamav/icons/hicolor/32x32/apps/klamavbw.png
-share/apps/klamav/icons/hicolor/32x32/apps/klamavdl.png
-share/apps/klamav/icons/hicolor/22x22/actions/klamavbwdl.png
-share/apps/klamav/icons/locolor/32x32/actions/klamav.png
-share/apps/klamav/icons/hicolor/32x32/apps/klamavbwdl.png
-share/apps/klamav/icons/locolor/16x16/apps/klamav.png
-share/apps/klamav/icons/hicolor/48x48/apps/klamav.png
 share/apps/klamav/icons/hicolor/32x32/apps/klamav.png
-share/apps/klamav/icons/hicolor/22x22/actions/klamavbw.png
-share/apps/klamav/icons/hicolor/22x22/actions/klamav.png
-share/apps/klamav/icons/hicolor/22x22/actions/klamavdl.png
-share/apps/klamav/icons/hicolor/32x32/actions/klamav.png
-share/apps/klamav/icons/locolor/16x16/actions/klamav.png
+share/apps/klamav/icons/hicolor/32x32/apps/klamav_update_required.png
+share/apps/klamav/icons/hicolor/32x32/apps/klamav_on_acc_enabled.png
+share/apps/klamav/icons/hicolor/32x32/apps/klamav_error.png
+share/apps/klamav/icons/hicolor/32x32/apps/klamav_quarantining.png
+share/apps/klamav/icons/hicolor/32x32/apps/klamav_on_acc_disabled.png
+share/apps/klamav/icons/hicolor/32x32/apps/klamav_virus.png
+share/apps/klamav/icons/hicolor/32x32/actions/klamav_scanning.png
+share/apps/klamav/icons/hicolor/32x32/actions/klamav_scan_found.png
+share/apps/klamav/icons/hicolor/32x32/actions/klamav_scan_safe.png
+share/apps/klamav/icons/hicolor/48x48/apps/klamav.png
 share/apps/klamav/about/main.html
 share/apps/klamav/about/wait.html
 share/apps/klamav/about/nodb.html
@@ -55,27 +44,14 @@ share/apps/klamav/about/tshirt.png
 @dirrmtry share/applnk/Utilities
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/apps/konqueror/servicemenus
-@dirrmtry share/icons/locolor/32x32/apps
-@dirrmtry share/icons/locolor/32x32/actions
-@dirrmtry share/icons/locolor/16x16/apps
 @dirrmtry share/icons/hicolor/48x48/apps
 @dirrmtry share/icons/hicolor/32x32/apps
 @dirrmtry share/icons/hicolor/22x22/actions
 @dirrmtry share/icons/hicolor/32x32/actions
-@dirrmtry share/icons/locolor/16x16/actions
-@dirrmtry share/apps/klamav/icons/locolor/32x32/apps
 @dirrmtry share/apps/klamav/icons/hicolor/32x32/actions
 @dirrmtry share/apps/klamav/icons/hicolor/32x32/apps
-@dirrmtry share/apps/klamav/icons/hicolor/22x22/actions
-@dirrmtry share/apps/klamav/icons/locolor/32x32/actions
-@dirrmtry share/apps/klamav/icons/locolor/16x16/apps
 @dirrmtry share/apps/klamav/icons/hicolor/48x48/apps
-@dirrmtry share/apps/klamav/icons/locolor/16x16/actions
-@dirrmtry share/apps/klamav/icons/locolor/32x32
-@dirrmtry share/apps/klamav/icons/locolor/16x16
-@dirrmtry share/apps/klamav/icons/locolor
 @dirrmtry share/apps/klamav/icons/hicolor/32x32
-@dirrmtry share/apps/klamav/icons/hicolor/22x22
 @dirrmtry share/apps/klamav/icons/hicolor/48x48
 @dirrmtry share/apps/klamav/icons/hicolor
 @dirrmtry share/apps/klamav/icons