- Update to 3.3.0

PR:		123085
Submitted by:	Ports Fury

3 files changed, 20 insertions, 25 deletions

diff --git a/mail/kshowmail/Makefile b/mail/kshowmail/Makefile
index 4f91e40b3be2..fdf08ee26643 100644
--- a/mail/kshowmail/Makefile
+++ b/mail/kshowmail/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	kshowmail
-PORTVERSION=	3.2.9.1
+PORTVERSION=	3.3.0
 CATEGORIES=	mail kde
 MASTER_SITES=	SF
 
@@ -15,24 +15,13 @@ COMMENT=	POP3 mail checker for KDE
 LIB_DEPENDS=	mimelib.1:${PORTSDIR}/deskutils/kdepim3
 
 USE_KDELIBS_VER=	3
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf:261:env automake:19:env libtool:15:env
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_NLS)
-PLIST_SUB=	NLS="@comment "
-.else
-USE_GETTEXT=	yes
-PLIST_SUB=	NLS=""
-.endif
-
-post-patch:
-.if defined(WITHOUT_NLS)
-	${REINPLACE_CMD} -e 's|po||g' ${WRKSRC}/Makefile.am
-.endif
-
 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
diff --git a/mail/kshowmail/distinfo b/mail/kshowmail/distinfo
index ac66c14ab885..5867c21a3c7f 100644
--- a/mail/kshowmail/distinfo
+++ b/mail/kshowmail/distinfo
@@ -1,3 +1,3 @@
-MD5 (kshowmail-3.2.9.1.tar.gz) = 20a129e6d153b21241971bb39466f256
-SHA256 (kshowmail-3.2.9.1.tar.gz) = ee75f58124f8bd9acf075028673acf5f7c492724fcde9c2532b13f085a3d457a
-SIZE (kshowmail-3.2.9.1.tar.gz) = 1575112
+MD5 (kshowmail-3.3.0.tar.gz) = 952984895de41544cea06c1df0939c10
+SHA256 (kshowmail-3.3.0.tar.gz) = b7d9c796859e5ed88aec22f658ed78b412799faedf9317c8aef815a28127c700
+SIZE (kshowmail-3.3.0.tar.gz) = 1660131
diff --git a/mail/kshowmail/pkg-plist b/mail/kshowmail/pkg-plist
index 0a4082c3d661..99784e64256e 100644
--- a/mail/kshowmail/pkg-plist
+++ b/mail/kshowmail/pkg-plist
@@ -5,10 +5,14 @@ lib/kde3/kcm_kshowmailconfigactions.la
 lib/kde3/kcm_kshowmailconfigactions.so
 lib/kde3/kcm_kshowmailconfigdisplay.la
 lib/kde3/kcm_kshowmailconfigdisplay.so
-lib/kde3/kcm_kshowmailconfigfilter.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
 share/apps/kshowmail/kshowmailui.rc
 share/apps/kshowmail/pics/eraser.png
@@ -44,19 +48,21 @@ 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
-%%NLS%%share/locale/cs/LC_MESSAGES/kshowmail.mo
-%%NLS%%share/locale/de/LC_MESSAGES/kshowmail.mo
-%%NLS%%share/locale/es/LC_MESSAGES/kshowmail.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/kshowmail.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/kshowmail.mo
-%%NLS%%share/locale/it/LC_MESSAGES/kshowmail.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/kshowmail.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/kshowmail.mo
+share/locale/cs/LC_MESSAGES/kshowmail.mo
+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