3 files changed, 48 insertions, 26 deletions

diff --git a/security/clamtk/Makefile b/security/clamtk/Makefile
index 67bb15878f43..bbaa448546c8 100644
--- a/security/clamtk/Makefile
+++ b/security/clamtk/Makefile
@@ -6,47 +6,55 @@
 #
 
 PORTNAME=	clamtk
-PORTVERSION=	3.08
-PORTREVISION=	2
+PORTVERSION=	4.08
 CATEGORIES=	security
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK front-end for Clam Antivirus
 
-RUN_DEPENDS=	p5-Gtk2>=1.144:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-File-Find-Rule>=0.30:${PORTSDIR}/devel/p5-File-Find-Rule \
+RUN_DEPENDS=	p5-Config-Tiny>=2.12:${PORTSDIR}/devel/p5-Config-Tiny \
 		p5-Date-Calc>=5.5.1:${PORTSDIR}/devel/p5-Date-Calc \
+		p5-File-Find-Rule>=0.30:${PORTSDIR}/devel/p5-File-Find-Rule \
 		p5-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
-		p5-Config-Tiny>=2.12:${PORTSDIR}/devel/p5-Config-Tiny \
-		clamscan:${PORTSDIR}/security/clamav
+		clamscan:${PORTSDIR}/security/clamav \
+		p5-libwww>=5.822:${PORTSDIR}/www/p5-libwww \
+		p5-Gtk2>=1.144:${PORTSDIR}/x11-toolkits/p5-Gtk2
 
 NO_BUILD=	yes
+USE_PERL5_RUN=	yes
 USE_GETTEXT=	yes
+
 MAN1=		${PORTNAME}.1
-PORTDOCS=	CHANGES DISCLAIMER LICENSE README
 
 post-extract:
 	@${GUNZIP_CMD} ${WRKSRC}/${PORTNAME}.1.gz
 
 post-patch:
-	@${REINPLACE_CMD} -e '/command.*--un/d;/bin\/file/!s|/usr/bin|${LOCALBASE}/bin|g;\
-		s|/var/lib/clamav|/var/db/clamav|;s|/usr/share|${PREFIX}/share|g'\
-			${WRKSRC}/${PORTNAME}
+	@${REINPLACE_CMD} -e \
+		's|/usr/bin|${LOCALBASE}/bin|g ; \
+		 s|/usr/share|${PREFIX}/share|g ; \
+		 s|/var/lib/clamav|/var/db/clamav|g' ${WRKSRC}/lib/*.pm
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
-	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1/
-	@${INSTALL} -d ${PREFIX}/share/applications/
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${PREFIX}/share/applications/
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${PREFIX}/share/pixmaps/
-	@cd ${WRKSRC}/po/&&for i in *.mo;do\
-		${MKDIR} ${PREFIX}/share/locale/$${i%.mo}/LC_MESSAGES/;\
-		${INSTALL_DATA} $$i ${PREFIX}/share/locale/$${i%.mo}/LC_MESSAGES/${PORTNAME}.mo;\
-	done
-.ifndef NOPORTDOCS
-	@${INSTALL} -d ${DOCSDIR}/
-	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1
+	@${MKDIR} ${SITE_PERL}/ClamTk
+	${INSTALL_DATA} ${WRKSRC}/lib/*.pm ${SITE_PERL}/ClamTk
+	@${MKDIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.xpm ${PREFIX}/share/pixmaps
+.for lang in cs_CZ da de es fr gl it ja ko nl pl pt_BR ro ru sl sv zh_CN
+	@${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES
+	${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
+		${PREFIX}/share/locale/${lang}/LC_MESSAGES/${PORTNAME}.mo
+.endfor
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in CHANGES DISCLAIMER LICENSE README
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/clamtk/distinfo b/security/clamtk/distinfo
index 0568ae367d63..a78861d034b4 100644
--- a/security/clamtk/distinfo
+++ b/security/clamtk/distinfo
@@ -1,3 +1,3 @@
-MD5 (clamtk-3.08.tar.gz) = 49c1904dbd138b0e86eea577332bfce7
-SHA256 (clamtk-3.08.tar.gz) = 61ad9911c5ab91fdc5d2898b6f0c4ca8fe1d7d51ed8c7d7954de5f31e3f0231e
-SIZE (clamtk-3.08.tar.gz) = 120239
+MD5 (clamtk-4.08.tar.gz) = c052668af7941bc89cd3af32ff5fa633
+SHA256 (clamtk-4.08.tar.gz) = c26a3bf8cb21d2cbb3bcd7bcb80d5381c273c0f1619e72d1f686d8a9a8e44c85
+SIZE (clamtk-4.08.tar.gz) = 174282
diff --git a/security/clamtk/pkg-plist b/security/clamtk/pkg-plist
index d2bd46d826e4..7dbbcb9043d4 100644
--- a/security/clamtk/pkg-plist
+++ b/security/clamtk/pkg-plist
@@ -1,5 +1,14 @@
 bin/clamtk
+%%SITE_PERL%%/ClamTk/App.pm
+%%SITE_PERL%%/ClamTk/GUI.pm
+%%SITE_PERL%%/ClamTk/Prefs.pm
+%%SITE_PERL%%/ClamTk/Results.pm
+%%SITE_PERL%%/ClamTk/Update.pm
 share/applications/clamtk.desktop
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
 share/locale/cs_CZ/LC_MESSAGES/clamtk.mo
 share/locale/da/LC_MESSAGES/clamtk.mo
 share/locale/de/LC_MESSAGES/clamtk.mo
@@ -7,7 +16,9 @@ share/locale/es/LC_MESSAGES/clamtk.mo
 share/locale/fr/LC_MESSAGES/clamtk.mo
 share/locale/gl/LC_MESSAGES/clamtk.mo
 share/locale/it/LC_MESSAGES/clamtk.mo
+share/locale/ja/LC_MESSAGES/clamtk.mo
 share/locale/ko/LC_MESSAGES/clamtk.mo
+share/locale/nl/LC_MESSAGES/clamtk.mo
 share/locale/pl/LC_MESSAGES/clamtk.mo
 share/locale/pt_BR/LC_MESSAGES/clamtk.mo
 share/locale/ro/LC_MESSAGES/clamtk.mo
@@ -16,6 +27,9 @@ share/locale/sl/LC_MESSAGES/clamtk.mo
 share/locale/sv/LC_MESSAGES/clamtk.mo
 share/locale/zh_CN/LC_MESSAGES/clamtk.mo
 share/pixmaps/clamtk.png
-@dirrmtry share/applications
+share/pixmaps/clamtk.xpm
 @dirrmtry share/locale/cs_CZ/LC_MESSAGES
 @dirrmtry share/locale/cs_CZ
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%SITE_PERL%%/ClamTk
+@dirrmtry share/applications