From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 20 06:30:42 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 14E0E16A4CF for ; Thu, 20 May 2004 06:30:42 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06DF343D1F for ; Thu, 20 May 2004 06:30:42 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i4KDUM8K070528 for ; Thu, 20 May 2004 06:30:22 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i4KDUMvK070525; Thu, 20 May 2004 06:30:22 -0700 (PDT) (envelope-from gnats) Resent-Date: Thu, 20 May 2004 06:30:22 -0700 (PDT) Resent-Message-Id: <200405201330.i4KDUMvK070525@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Rashid N. Achilov" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7CC2F16A4CE for ; Thu, 20 May 2004 06:23:15 -0700 (PDT) Received: from sentry.granch.ru (sentry.granch.ru [212.20.5.55]) by mx1.FreeBSD.org (Postfix) with ESMTP id ACD3F43D3F for ; Thu, 20 May 2004 06:23:13 -0700 (PDT) (envelope-from shelton@sentry.granch.ru) Received: from sentry.granch.ru (IDENT:25@localhost.granch.ru [127.0.0.1]) by sentry.granch.ru (8.12.11/8.12.11) with ESMTP id i4KDMoAw060520 for ; Thu, 20 May 2004 20:22:50 +0700 (NOVST) (envelope-from shelton@sentry.granch.ru) Received: (from root@localhost) by sentry.granch.ru (8.12.11/8.12.11/Submit) id i4KDMnT7060519; Thu, 20 May 2004 20:22:49 +0700 (NOVST) (envelope-from shelton) Message-Id: <200405201322.i4KDMnT7060519@sentry.granch.ru> Date: Thu, 20 May 2004 20:22:49 +0700 (NOVST) From: "Rashid N. Achilov" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/66940: sysutls/kkbswitch port updating up to version 1.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: "Rashid N. Achilov" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 May 2004 13:30:42 -0000 >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@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 + +.if defined(WITH_RU_UA_LAYOUT) +PLIST_SUB+= LAYOUT="" +.else +CONFIGURE_ARGS+= --disable-ru-ua-layout +PLIST_SUB+= LAYOUT="@comment " +.endif -.include +.include "${PORTSDIR}/x11/kde3/Makefile.kde" +.include 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 -@dirrm share/doc/HTML/en/kkbswitch +@dirrm %%DOCSDIR%%/common +@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: