ports/66940: sysutls/kkbswitch port updating up to version 1.4

[Rashid N. Achilov]

>Number:         66940
>Category:       ports
>Synopsis:       sysutls/kkbswitch port updating up to version 1.4
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 20 06:30:22 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Rashid N. Achilov
>Release:        FreeBSD 4.10-PRERELEASE i386
>Organization:
Granch Ltd.
>Environment:
System: FreeBSD sentry.granch.ru 4.10-PRERELEASE FreeBSD 4.10-PRERELEASE #13: Mon May 17 12:00:41 NOVST 2004 shelton at sentry.granch.ru:/usr/src/sys/compile/Sentry i386
>Description:
Update port sysutils/kkbswitch up to version 1.4. This is a feature release, with
addition some new features.
>How-To-Repeat:
>Fix:
diff -ruN kkbswitch.old/Makefile kkbswitch/Makefile
--- kkbswitch.old/Makefile	Wed Apr  7 02:34:42 2004
+++ kkbswitch/Makefile	Thu May 20 20:08:26 2004
@@ -6,8 +6,7 @@
 #

 PORTNAME=		kkbswitch
-PORTVERSION=		1.3.1
-PORTREVISION=	2
+PORTVERSION=		1.4
 CATEGORIES=		sysutils kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kkbswitch
@@ -25,7 +24,22 @@

 CONFIGURE_TARGET=

+DOCSDIR=		share/doc/HTML/en/${PORTNAME}
+
+OPTIONS=		RU_UA_LAYOUT	"With additional RU_UA keyboard layout" on
+
 PLIST_SUB=		PREFIX=${PREFIX} \
-			X11BASE=${X11BASE}
+			X11BASE=${X11BASE} \
+			DOCSDIR=${DOCSDIR}
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_RU_UA_LAYOUT)
+PLIST_SUB+=		LAYOUT=""
+.else
+CONFIGURE_ARGS+=	--disable-ru-ua-layout
+PLIST_SUB+=		LAYOUT="@comment "
+.endif

-.include <bsd.port.mk>
+.include "${PORTSDIR}/x11/kde3/Makefile.kde"
+.include <bsd.port.post.mk>
diff -ruN kkbswitch.old/distinfo kkbswitch/distinfo
--- kkbswitch.old/distinfo	Thu Apr  1 02:31:56 2004
+++ kkbswitch/distinfo	Thu May 20 15:20:17 2004
@@ -1,2 +1,2 @@
-MD5 (kkbswitch-1.3.1.tar.gz) = 38dbe77edb599600a6796ccc0d7fd1e0
-SIZE (kkbswitch-1.3.1.tar.gz) = 566701
+MD5 (kkbswitch-1.4.tar.gz) = ff28207eadc3ff0653da18487588c558
+SIZE (kkbswitch-1.4.tar.gz) = 672499
diff -ruN kkbswitch.old/files/patch-aa kkbswitch/files/patch-aa
--- kkbswitch.old/files/patch-aa	Thu Jan  1 07:00:00 1970
+++ kkbswitch/files/patch-aa	Thu May 20 15:46:33 2004
@@ -0,0 +1,8 @@
+--- kkbswitch.upd/kkbswitch_update_14_icons.old	Tue May 18 13:40:41 2004
++++ kkbswitch.upd/kkbswitch_update_14_icons	Thu May 20 15:43:17 2004
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ # update Icons section
+ if [ -z "$DISPLAY" ]; then
diff -ruN kkbswitch.old/pkg-plist kkbswitch/pkg-plist
--- kkbswitch.old/pkg-plist	Mon Nov 17 16:50:38 2003
+++ kkbswitch/pkg-plist	Thu May 20 16:54:21 2004
@@ -1,18 +1,23 @@
 bin/kkbswitch
 share/applnk/Utilities/kkbswitch.desktop
-share/icons/locolor/16x16/apps/kkbswitch.png
-share/icons/locolor/32x32/apps/kkbswitch.png
+share/autostart/kkbswitch.desktop
 share/apps/kkbswitch/group_names
+share/apps/kconf_update/kkbswitch.upd
+share/apps/kconf_update/kkbswitch_update_14_icons
+share/apps/kconf_update/kkbswitch_update_14_options
 share/locale/ru/LC_MESSAGES/kkbswitch.mo
-share/doc/HTML/en/kkbswitch/code_style.png
-share/doc/HTML/en/kkbswitch/flag_code_style.png
-share/doc/HTML/en/kkbswitch/flag_style.png
-share/doc/HTML/en/kkbswitch/index.docbook
-share/doc/HTML/en/kkbswitch/index.cache.bz2
+share/locale/uk/LC_MESSAGES/kkbswitch.mo
+share/locale/el/LC_MESSAGES/kkbswitch.mo
+%%DOCSDIR%%/code_style.png
+%%DOCSDIR%%/flag_code_style.png
+%%DOCSDIR%%/flag_style.png
+%%DOCSDIR%%/index.docbook
+%%DOCSDIR%%/index.cache.bz2
 @cwd %%X11BASE%%
-lib/X11/xkb/symbols/ru_ua
+%%LAYOUT%%lib/X11/xkb/symbols/ru_ua
 @cwd %%PREFIX%%
 @dirrm share/apps/kkbswitch
- at dirrm share/doc/HTML/en/kkbswitch
+ at dirrm %%DOCSDIR%%/common
+ at dirrm %%DOCSDIR%%
 @unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
 @unexec rmdir %D/share/applnk 2>/dev/null || true
>Release-Note:
>Audit-Trail:
>Unformatted: