- Update to 0.9.4.1

Submitted by:	maintainer

4 files changed, 27 insertions, 33 deletions

diff --git a/net-im/sim-im/Makefile b/net-im/sim-im/Makefile
index af6f456bd8a5..64560ba6282a 100644
--- a/net-im/sim-im/Makefile
+++ b/net-im/sim-im/Makefile
@@ -5,9 +5,11 @@
 # $FreeBSD$
 
 PORTNAME=	sim-im
-PORTVERSION=	0.9.4
-CATEGORIES=	net-im kde
-MASTER_SITES=	${MASTER_SITE_BERLIOS}
+PORTVERSION=	0.9.4.1
+CATEGORIES=	net-im
+MASTER_SITES=	${MASTER_SITE_BERLIOS} \
+		http://sim-im.lehis.ru/dist/ \
+		http://www.sim-im.lehis.ru/dist/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME:S/-im//}-${PORTVERSION}
 
@@ -19,7 +21,7 @@ BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 
 CONFLICTS=	simicq-[0-9]* sim-im-devel-[0-9]*
 
-EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
+#EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -27,11 +29,14 @@ USE_QT_VER=	3
 USE_PERL5_BUILD=yes
 USE_AUTOTOOLS=	libtool:15
 USE_OPENSSL=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
+USE_GETTEXT=	yes
+INSTALLS_ICONS=	yes
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--prefix=${PREFIX} --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
 
-.if defined(WITHOUT_KDE)
+.if !defined(WITH_KDE)
 CONFIGURE_ARGS+=--disable-kde --enable-mt
 LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
 PLIST_SUB+=	KDE="@comment " \
@@ -43,12 +48,12 @@ PLIST_SUB+=	KDE="" \
 .endif
 
 pre-everything::
-.if !defined(WITHOUT_KDE)
-	@${ECHO_MSG} "You can disable KDE support by defining WITHOUT_KDE."
+.if !defined(WITH_KDE)
+	@${ECHO_MSG} "You can enable KDE support by defining WITH_KDE."
 .endif
 
 post-patch:
-.if defined(WITHOUT_KDE)
+.if !defined(WITH_KDE)
 	@${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \
 		${CONFIGURE_WRKSRC}/configure
 .endif
diff --git a/net-im/sim-im/distinfo b/net-im/sim-im/distinfo
index a87f71b35d95..a797094552c0 100644
--- a/net-im/sim-im/distinfo
+++ b/net-im/sim-im/distinfo
@@ -1,3 +1,3 @@
-MD5 (sim-0.9.4.tar.bz2) = 1a54b2b7a7f34d7dc7a218fd1c699e49
-SHA256 (sim-0.9.4.tar.bz2) = d751583a21d41f4ddc1eb67cdbc813988cdb06886f810dc094c53cd2807ca8ee
-SIZE (sim-0.9.4.tar.bz2) = 3358617
+MD5 (sim-0.9.4.1.tar.bz2) = 61a9700a45a7e96b1726ccc30a43f53f
+SHA256 (sim-0.9.4.1.tar.bz2) = 7f87b4423d0e8f31711b5cb6dd05bb7711b1dbd91b37196905903be655f79b83
+SIZE (sim-0.9.4.1.tar.bz2) = 3331960
diff --git a/net-im/sim-im/pkg-descr b/net-im/sim-im/pkg-descr
index 54140a34e895..3f88156cba55 100644
--- a/net-im/sim-im/pkg-descr
+++ b/net-im/sim-im/pkg-descr
@@ -1,12 +1,14 @@
-SIM (Simple Instant Messenger) is a plugin-based instant messenger with
-support for various protocols (QT is needed, can be build for KDE).
+This is a SIM-ICQ project's fork.
+
+SIM-IM is a plugin-based instant messenger with support for various 
+protocols (QT is needed, can be build for KDE).
+
+All protocols support richtext-messages, file transfer, typing
+notification, server-side contact list (with postponed synchronization
+- you can change contact list in offline mode and after log on all
+changes will be synchronized with server), new account registration
+and various searches.  You can use several accounts for each protocol.
 
-All protocols support richtext-messages, file transfer, typing notification,
-server-side contact list (with postponed synchronization - you can change
-contact list in offline mode and after log on all changes will be
-synchronized with server), new account registration and various searches.
-You can use several accounts for each protocol.
- 
 Supported protocols:
     * Oscar - ICQ and AIM support
     * Jabber
diff --git a/net-im/sim-im/pkg-plist b/net-im/sim-im/pkg-plist
index 24981d79803c..8ca0be652e35 100644
--- a/net-im/sim-im/pkg-plist
+++ b/net-im/sim-im/pkg-plist
@@ -157,13 +157,9 @@ share/apps/sim/styles/XChat.xsl
 share/apps/sim/styles/XChat2seconds.xsl
 share/apps/sim/styles/XChat3fullDate.xsl
 share/icons/hicolor/16x16/apps/sim.png
-share/icons/hicolor/22x22/apps/sim.png
 share/icons/hicolor/32x32/apps/sim.png
 share/icons/hicolor/48x48/apps/sim.png
 share/icons/hicolor/64x64/apps/sim.png
-share/icons/locolor/16x16/apps/sim.png
-share/icons/locolor/22x22/apps/sim.png
-share/icons/locolor/32x32/apps/sim.png
 share/locale/bg/LC_MESSAGES/sim.mo
 share/locale/ca/LC_MESSAGES/sim.mo
 share/locale/cs/LC_MESSAGES/sim.mo
@@ -206,21 +202,12 @@ share/services/simctrl.desktop
 @dirrmtry share/locale/cs
 @dirrmtry share/locale/ca/LC_MESSAGES
 @dirrmtry share/locale/ca
-@dirrmtry share/icons/locolor/32x32/apps
-@dirrmtry share/icons/locolor/32x32
-@dirrmtry share/icons/locolor/22x22/apps
-@dirrmtry share/icons/locolor/22x22
-@dirrmtry share/icons/locolor/16x16/apps
-@dirrmtry share/icons/locolor/16x16
-@dirrmtry share/icons/locolor
 @dirrmtry share/icons/hicolor/64x64/apps
 @dirrmtry share/icons/hicolor/64x64
 @dirrmtry share/icons/hicolor/48x48/apps
 @dirrmtry share/icons/hicolor/48x48
 @dirrmtry share/icons/hicolor/32x32/apps
 @dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
 @dirrmtry share/icons/hicolor/16x16/apps
 @dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor