3 files changed, 18 insertions, 31 deletions

diff --git a/net-im/sim-im-devel/Makefile b/net-im/sim-im-devel/Makefile
index 9465f44b952c..ff59ef9d9331 100644
--- a/net-im/sim-im-devel/Makefile
+++ b/net-im/sim-im-devel/Makefile
@@ -5,9 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	sim-im-devel
-PORTVERSION=	0.9.5.970
+PORTVERSION=	0.9.5.1538
 CATEGORIES=	net-im
-MASTER_SITES=	http://sim-im.lehis.ru/dist/
+MASTER_SITES=	http://sim-im.lehis.ru/dist/ \
+		http://www.sim-im.lehis.ru/dist/
 
 MAINTAINER=	sim-im@lehis.ru
 COMMENT=	Plugin-based instant messenger
@@ -35,11 +36,14 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} --x-includes=${X11BASE}/include --x-libraries
 OPTIONS=	KDE "Enable KDE support" off \
 		DEBUG "Enable debug" on
 
-PORT_DBDIR?=	/var/db/ports
-LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
-OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
-.if exists(${OPTIONSFILE})
-.include "${OPTIONSFILE}"
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+IGNORE=	it doesn't work on FreeBSD 4.X
+.endif
+
+.if !defined(WITHOUT_DEBUG)
+CONFIGURE_ARGS+=--enable-debug
 .endif
 
 .if !defined(WITH_KDE)
@@ -51,10 +55,7 @@ PLIST_SUB+=	KDE="@comment " \
 USE_KDELIBS_VER=3
 PLIST_SUB+=	KDE="" \
 		SPELL="@comment "
+.include "${PORTSDIR}/Mk/bsd.kde.mk"
 .endif
 
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=--enable-debug
-.endif
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net-im/sim-im-devel/distinfo b/net-im/sim-im-devel/distinfo
index bd41cdd495f1..295ad5a6322a 100644
--- a/net-im/sim-im-devel/distinfo
+++ b/net-im/sim-im-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (sim-im-devel-0.9.5.970.tar.bz2) = 50d696dadc0e9e1841c88c3bd5e361a6
-SHA256 (sim-im-devel-0.9.5.970.tar.bz2) = a4f6e966559036d2ee52d81a82adea408417b5b86e9fa5115b912211ab98f768
-SIZE (sim-im-devel-0.9.5.970.tar.bz2) = 2571818
+MD5 (sim-im-devel-0.9.5.1538.tar.bz2) = e1be78c780cef144131a2bedcb78d92b
+SHA256 (sim-im-devel-0.9.5.1538.tar.bz2) = efbfe4046de9f5375d1fedf6ec04c4c8f83882f1efb07a38f880b9fb5770ab5f
+SIZE (sim-im-devel-0.9.5.1538.tar.bz2) = 2604019
diff --git a/net-im/sim-im-devel/pkg-plist b/net-im/sim-im-devel/pkg-plist
index 13fa04508742..b38cd05fc473 100644
--- a/net-im/sim-im-devel/pkg-plist
+++ b/net-im/sim-im-devel/pkg-plist
@@ -110,6 +110,7 @@ lib/sim/zodiak.a
 lib/sim/zodiak.la
 lib/sim/zodiak.so
 share/applications/kde/sim.desktop
+share/apps/sim/icons/GPL-Icons.jisp
 share/apps/sim/icons/icqlite.jisp
 share/apps/sim/icons/additional.jisp
 share/apps/sim/icons/icq5.jisp
@@ -141,6 +142,7 @@ share/apps/sim/styles/SIM.2.xsl
 share/apps/sim/styles/SIM.3.xsl
 share/apps/sim/styles/SIM.4.(2+3).xsl
 share/apps/sim/styles/SIM.5.2.2.xsl
+share/apps/sim/styles/SIM.5.2.3.xsl
 share/apps/sim/styles/SIM.5.2.xsl
 share/apps/sim/styles/SIM.5.xsl
 share/apps/sim/styles/SIM.xsl
@@ -156,13 +158,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
@@ -183,7 +181,6 @@ share/locale/sv/LC_MESSAGES/sim.mo
 share/locale/th/LC_MESSAGES/sim.mo
 share/locale/tr/LC_MESSAGES/sim.mo
 share/locale/uk/LC_MESSAGES/sim.mo
-share/locale/zh_TW/LC_MESSAGES/sim.mo
 share/mimelnk/application/x-icq.desktop
 share/services/simctrl.desktop
 @dirrm lib/sim/styles
@@ -198,8 +195,6 @@ share/services/simctrl.desktop
 @dirrmtry share/apps
 @dirrmtry share/icons/hicolor/16x16/apps
 @dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
 @dirrmtry share/icons/hicolor/32x32/apps
 @dirrmtry share/icons/hicolor/32x32
 @dirrmtry share/icons/hicolor/48x48/apps
@@ -207,13 +202,6 @@ share/services/simctrl.desktop
 @dirrmtry share/icons/hicolor/64x64/apps
 @dirrmtry share/icons/hicolor/64x64
 @dirrmtry share/icons/hicolor
-@dirrmtry share/icons/locolor/16x16/apps
-@dirrmtry share/icons/locolor/16x16
-@dirrmtry share/icons/locolor/22x22/apps
-@dirrmtry share/icons/locolor/22x22
-@dirrmtry share/icons/locolor/32x32/apps
-@dirrmtry share/icons/locolor/32x32
-@dirrmtry share/icons/locolor
 @dirrmtry share/icons
 @dirrmtry share/locale/ca/LC_MESSAGES
 @dirrmtry share/locale/ca
@@ -229,8 +217,6 @@ share/services/simctrl.desktop
 @dirrmtry share/locale/sw
 @dirrmtry share/locale/uk/LC_MESSAGES
 @dirrmtry share/locale/uk
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
 @dirrmtry share/mimelnk/application
 @dirrmtry share/mimelnk
 @dirrmtry share/services