- Update to 4.1

PR:		168040
Submitted by:	Ports Fury

5 files changed, 52 insertions, 105 deletions

diff --git a/mail/kshowmail/Makefile b/mail/kshowmail/Makefile
index fbbb57117636..ee7eaa16ccee 100644
--- a/mail/kshowmail/Makefile
+++ b/mail/kshowmail/Makefile
@@ -5,29 +5,22 @@
 # $FreeBSD$
 
 PORTNAME=	kshowmail
-PORTVERSION=	3.3.1
-PORTREVISION=	7
+PORTVERSION=	4.1
 CATEGORIES=	mail kde
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20for%20KDE3/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20for%20KDE4/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	POP3 mail checker for KDE
 
-LIB_DEPENDS=	mimelib.1:${PORTSDIR}/deskutils/kdepim3
+LICENSE=	GPLv2
 
-USE_KDELIBS_VER=	3
+USE_KDE4=	automoc4 kdehier kdeprefix kdelibs pimlibs
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib dbus gui network svg xml \
+		qmake_build uic_build rcc_build
+USE_PERL5_BUILD=yes
 USE_GETTEXT=	yes
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
-GNU_CONFIGURE=	yes
+USE_CMAKE=	yes
+MAKE_JOBS_SAFE=	yes
 
-AUTOTOOLSFILES=	admin/cvs.sh
-
-.include <bsd.port.pre.mk>
-
-pre-configure:
-	@cd ${WRKSRC}/admin && ${RM} -f ltmain.sh && ${CP} -f ${LTMAIN} .
-	@cd ${WRKSRC}/admin && ${RM} -f libtool.m4.in && ${CP} -f ${LIBTOOL_M4} libtool.m4.in
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} -f admin/Makefile.common
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/kshowmail/distinfo b/mail/kshowmail/distinfo
index fad9d6e47e76..7d3f3550e927 100644
--- a/mail/kshowmail/distinfo
+++ b/mail/kshowmail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kshowmail-3.3.1.tar.gz) = 00c64e09552fdc3f1b7d8d032309ba9910fcaf256c1c2d19ae52eddfe7296c14
-SIZE (kshowmail-3.3.1.tar.gz) = 1657620
+SHA256 (kshowmail-4.1.tar.gz) = 3febf2924c0309db39944f6eb79cd09d8b3d2248e7210aac51d0be098b76012b
+SIZE (kshowmail-4.1.tar.gz) = 2884248
diff --git a/mail/kshowmail/files/patch-admin-configure.in.min b/mail/kshowmail/files/patch-admin-configure.in.min
deleted file mode 100644
index fd843e623356..000000000000
--- a/mail/kshowmail/files/patch-admin-configure.in.min
+++ /dev/null
@@ -1,7 +0,0 @@
---- admin/configure.in.min.orig	2007-03-12 10:34:22.000000000 -0500
-+++ admin/configure.in.min	2010-09-05 15:17:20.000000000 -0500
-@@ -46,2 +46,4 @@
- dnl Checks for programs.
-+AC_PROG_CC
-+AC_PROG_CXX
- AC_CHECK_COMPILERS
diff --git a/mail/kshowmail/files/patch-admin-cvs.sh b/mail/kshowmail/files/patch-admin-cvs.sh
deleted file mode 100644
index 465a8ff8a5a8..000000000000
--- a/mail/kshowmail/files/patch-admin-cvs.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- admin/cvs.sh.orig	2007-05-17 11:12:38.000000000 -0700
-+++ admin/cvs.sh	2012-04-24 09:23:49.000000000 -0700
-@@ -65,8 +65,3 @@
- case $AUTOMAKE_STRING in
--  automake*1.5d* | automake*1.5* | automake*1.5-* )
--    echo "*** YOU'RE USING $AUTOMAKE_STRING."
--    echo "*** KDE requires automake $required_automake_version"
--    exit 1
--    ;;
--  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
-+  automake*%%AUTOMAKE_VERSION%%* )
-     echo "*** $AUTOMAKE_STRING found."
diff --git a/mail/kshowmail/pkg-plist b/mail/kshowmail/pkg-plist
index 99784e64256e..493ad17f7efa 100644
--- a/mail/kshowmail/pkg-plist
+++ b/mail/kshowmail/pkg-plist
@@ -1,29 +1,28 @@
 bin/kshowmail
-lib/kde3/kcm_kshowmailconfigaccounts.la
-lib/kde3/kcm_kshowmailconfigaccounts.so
-lib/kde3/kcm_kshowmailconfigactions.la
-lib/kde3/kcm_kshowmailconfigactions.so
-lib/kde3/kcm_kshowmailconfigdisplay.la
-lib/kde3/kcm_kshowmailconfigdisplay.so
-lib/kde3/kcm_kshowmailconfigfilter.la
-lib/kde3/kcm_kshowmailconfigfilter.so
-lib/kde3/kcm_kshowmailconfiggeneral.la
-lib/kde3/kcm_kshowmailconfiggeneral.so
-lib/kde3/kcm_kshowmailconfiglog.la
-lib/kde3/kcm_kshowmailconfiglog.so
-lib/kde3/kcm_kshowmailconfigspamcheck.la
-lib/kde3/kcm_kshowmailconfigspamcheck.so
-share/applnk/Internet/kshowmail.desktop
+lib/kde4/kcm_kshowmailconfigaccounts.so
+lib/kde4/kcm_kshowmailconfigactions.so
+lib/kde4/kcm_kshowmailconfigdisplay.so
+lib/kde4/kcm_kshowmailconfigfilter.so
+lib/kde4/kcm_kshowmailconfiggeneral.so
+lib/kde4/kcm_kshowmailconfiglog.so
+lib/kde4/kcm_kshowmailconfigspamcheck.so
+share/applications/kde4/kshowmail.desktop
 share/apps/kshowmail/kshowmailui.rc
-share/apps/kshowmail/pics/eraser.png
-share/apps/kshowmail/pics/kshowmail.png
-share/apps/kshowmail/pics/kshowmail24.png
-share/apps/kshowmail/pics/letter-closed.png
-share/apps/kshowmail/pics/letter-open.png
-share/apps/kshowmail/pics/ok.png
-share/apps/kshowmail/pics/tool.png
-share/apps/kshowmail/sounds/neuepost.wav
-share/apps/kshowmail/sounds/newmail.wav
+share/apps/kshowmail/pics/account.svgz
+share/apps/kshowmail/pics/accountActive.png
+share/apps/kshowmail/pics/accountNotActive.png
+share/apps/kshowmail/pics/button_blacklist.png
+share/apps/kshowmail/pics/button_whitelist.png
+share/apps/kshowmail/pics/deletedFilter.png
+share/apps/kshowmail/pics/deletedManual.png
+share/apps/kshowmail/pics/export.png
+share/apps/kshowmail/pics/import.png
+share/apps/kshowmail/pics/mail-unread-new.png
+share/apps/kshowmail/pics/newMailPic.png
+share/apps/kshowmail/pics/senderOnWhitelist.png
+share/apps/kshowmail/pics/trayIcon.png
+share/apps/kshowmail/sounds/neuepost.ogg
+share/apps/kshowmail/sounds/newmail.ogg
 share/doc/HTML/de/kshowmail/common
 share/doc/HTML/de/kshowmail/index.cache.bz2
 share/doc/HTML/de/kshowmail/index.docbook
@@ -33,58 +32,32 @@ share/doc/HTML/en/kshowmail/index.docbook
 share/doc/HTML/es/kshowmail/common
 share/doc/HTML/es/kshowmail/index.cache.bz2
 share/doc/HTML/es/kshowmail/index.docbook
-share/doc/HTML/fr/kshowmail/common
-share/doc/HTML/fr/kshowmail/index.cache.bz2
-share/doc/HTML/fr/kshowmail/index.docbook
-share/doc/HTML/hu/kshowmail/common
-share/doc/HTML/hu/kshowmail/index.cache.bz2
-share/doc/HTML/hu/kshowmail/index.docbook
 share/doc/HTML/it/kshowmail/common
 share/doc/HTML/it/kshowmail/index.cache.bz2
 share/doc/HTML/it/kshowmail/index.docbook
-share/doc/HTML/ru/kshowmail/common
-share/doc/HTML/ru/kshowmail/index.cache.bz2
-share/doc/HTML/ru/kshowmail/index.docbook
-share/doc/HTML/sv/kshowmail/common
-share/doc/HTML/sv/kshowmail/index.cache.bz2
-share/doc/HTML/sv/kshowmail/index.docbook
-share/locale/cs/LC_MESSAGES/kshowmail.mo
+share/doc/HTML/nl/kshowmail/common
+share/doc/HTML/nl/kshowmail/index.cache.bz2
+share/doc/HTML/nl/kshowmail/index.docbook
+share/icons/hicolor/16x16/apps/kshowmail.png
+share/icons/hicolor/32x32/apps/kshowmail.png
+share/icons/hicolor/48x48/apps/kshowmail.png
+share/kde4/services/kshowmailconfigaccounts.desktop
+share/kde4/services/kshowmailconfigactions.desktop
+share/kde4/services/kshowmailconfigdisplay.desktop
+share/kde4/services/kshowmailconfigfilter.desktop
+share/kde4/services/kshowmailconfiggeneral.desktop
+share/kde4/services/kshowmailconfiglog.desktop
+share/kde4/services/kshowmailconfigspamcheck.desktop
 share/locale/de/LC_MESSAGES/kshowmail.mo
 share/locale/es/LC_MESSAGES/kshowmail.mo
-share/locale/fr/LC_MESSAGES/kshowmail.mo
-share/locale/hu/LC_MESSAGES/kshowmail.mo
 share/locale/it/LC_MESSAGES/kshowmail.mo
-share/locale/ru/LC_MESSAGES/kshowmail.mo
-share/locale/sv/LC_MESSAGES/kshowmail.mo
-share/services/kshowmailconfigaccounts.desktop
-share/services/kshowmailconfigactions.desktop
-share/services/kshowmailconfigdisplay.desktop
-share/services/kshowmailconfigfilter.desktop
-share/services/kshowmailconfiggeneral.desktop
-share/services/kshowmailconfiglog.desktop
-share/services/kshowmailconfigspamcheck.desktop
-@dirrmtry share/services
-@dirrm share/doc/HTML/sv/kshowmail
-@dirrmtry share/doc/HTML/sv
-@dirrm share/doc/HTML/ru/kshowmail
-@dirrmtry share/doc/HTML/ru
+share/locale/nb/LC_MESSAGES/kshowmail.mo
+share/locale/nl/LC_MESSAGES/kshowmail.mo
+@dirrm share/doc/HTML/nl/kshowmail
 @dirrm share/doc/HTML/it/kshowmail
-@dirrmtry share/doc/HTML/it
-@dirrm share/doc/HTML/hu/kshowmail
-@dirrmtry share/doc/HTML/hu
-@dirrm share/doc/HTML/fr/kshowmail
-@dirrmtry share/doc/HTML/fr
 @dirrm share/doc/HTML/es/kshowmail
-@dirrmtry share/doc/HTML/es
 @dirrm share/doc/HTML/en/kshowmail
-@dirrmtry share/doc/HTML/en
 @dirrm share/doc/HTML/de/kshowmail
-@dirrmtry share/doc/HTML/de
-@dirrmtry share/doc/HTML
 @dirrm share/apps/kshowmail/sounds
 @dirrm share/apps/kshowmail/pics
 @dirrm share/apps/kshowmail
-@dirrmtry share/apps
-@dirrmtry share/applnk/Internet
-@dirrmtry share/applnk
-@dirrmtry lib/kde3