- Update to 3.2.1

PR:		118589
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

5 files changed, 44 insertions, 46 deletions

diff --git a/mail/kshowmail/Makefile b/mail/kshowmail/Makefile
index b390bf5..0da68c3 100644
--- a/mail/kshowmail/Makefile
+++ b/mail/kshowmail/Makefile
@@ -4,25 +4,24 @@
 #
 # $FreeBSD$
 
-PORTNAME=		kshowmail
-PORTVERSION=		3.1.0
-PORTREVISION=		6
-CATEGORIES=		mail kde
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+PORTNAME=	kshowmail
+PORTVERSION=	3.2.1
+CATEGORIES=	mail kde
+MASTER_SITES=	SF
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		POP3 mail checker for KDE
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	POP3 mail checker for KDE
 
-LIB_DEPENDS=		mimelib.1:${PORTSDIR}/deskutils/kdepim3
+LIB_DEPENDS=	mimelib.1:${PORTSDIR}/deskutils/kdepim3
 
 USE_KDELIBS_VER=	3
-USE_GMAKE=		yes
-USE_AUTOTOOLS=		libtool:15
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	autoconf:261:env automake:19:env libtool:15:env
+GNU_CONFIGURE=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g; s|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${RM} ${WRKSRC}/kshowmail/OptionDlg.h ${WRKSRC}/kshowmail/OptionDlg.cpp
+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.mk>
diff --git a/mail/kshowmail/distinfo b/mail/kshowmail/distinfo
index bb81a25..92d0dbc 100644
--- a/mail/kshowmail/distinfo
+++ b/mail/kshowmail/distinfo
@@ -1,3 +1,3 @@
-MD5 (kshowmail-3.1.0.tar.gz) = 4607bd38538e92b0d5c6a0b187d0fb7e
-SHA256 (kshowmail-3.1.0.tar.gz) = fc2f42c7e691d36ddba900770e4f6e9385e7a947b5552813dfdd261b0305e1f0
-SIZE (kshowmail-3.1.0.tar.gz) = 1023074
+MD5 (kshowmail-3.2.1.tar.gz) = c97b10673ffad808235a1183a776295a
+SHA256 (kshowmail-3.2.1.tar.gz) = 83955d7aa175ee9b1eec9d428bf78a077ee0fa5e68c6c507a5eb344a14a1bc26
+SIZE (kshowmail-3.2.1.tar.gz) = 1566324
diff --git a/mail/kshowmail/files/patch-configure b/mail/kshowmail/files/patch-configure
deleted file mode 100644
index e1e5f7e..0000000
--- a/mail/kshowmail/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Oct 22 01:20:49 2003
-+++ configure	Wed Oct 22 01:21:13 2003
-@@ -23130,7 +23130,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--	if test -f actest.cpp && grep klineedit actest.cpp > /dev/null; then
-+	if test -f actest.cpp && grep -i klineedit actest.cpp > /dev/null; then
- 		kde_cv_uic_plugins=yes
- 	fi
- fi
diff --git a/mail/kshowmail/files/patch-showrecordelem.cpp b/mail/kshowmail/files/patch-showrecordelem.cpp
deleted file mode 100644
index 183d394..0000000
--- a/mail/kshowmail/files/patch-showrecordelem.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- kshowmail/showrecordelem.cpp.orig	Sun Aug 15 19:13:32 2004
-+++ kshowmail/showrecordelem.cpp	Sun Aug 15 19:13:49 2004
-@@ -115,7 +115,7 @@
-              << i18n("Subject") << " = " << subject() << endl << endl;
-     Logger::flush();
-   }
--};
-+}
- 
- 
- QString ShowRecordElem::from () const
diff --git a/mail/kshowmail/pkg-plist b/mail/kshowmail/pkg-plist
index f9e3767..9a79b11 100644
--- a/mail/kshowmail/pkg-plist
+++ b/mail/kshowmail/pkg-plist
@@ -1,4 +1,12 @@
 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_kshowmailconfiggeneral.la
+lib/kde3/kcm_kshowmailconfiggeneral.so
 share/applnk/Internet/kshowmail.desktop
 share/apps/kshowmail/kshowmailui.rc
 share/apps/kshowmail/pics/eraser.png
@@ -7,7 +15,6 @@ 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/spam.png
 share/apps/kshowmail/pics/tool.png
 share/apps/kshowmail/sounds/neuepost.wav
 share/apps/kshowmail/sounds/newmail.wav
@@ -26,21 +33,34 @@ 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/icons/hicolor/16x16/apps/kshowmail.png
+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
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
+share/services/kshowmailconfigaccounts.desktop
+share/services/kshowmailconfigactions.desktop
+share/services/kshowmailconfigdisplay.desktop
+share/services/kshowmailconfiggeneral.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
+@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
@@ -58,3 +78,4 @@ share/locale/sv/LC_MESSAGES/kshowmail.mo
 @dirrmtry share/apps
 @dirrmtry share/applnk/Internet
 @dirrmtry share/applnk
+@dirrmtry lib/kde3