From owner-svn-ports-all@FreeBSD.ORG Tue Nov 13 14:25:01 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 81E6FC48; Tue, 13 Nov 2012 14:25:01 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5E2BB8FC15; Tue, 13 Nov 2012 14:25:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qADEP1nc061389; Tue, 13 Nov 2012 14:25:01 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qADEP1N1061386; Tue, 13 Nov 2012 14:25:01 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201211131425.qADEP1N1061386@svn.freebsd.org> From: Alexey Dokuchaev Date: Tue, 13 Nov 2012 14:25:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307376 - head/x11/xxkb X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Nov 2012 14:25:01 -0000 Author: danfe Date: Tue Nov 13 14:25:00 2012 New Revision: 307376 URL: http://svnweb.freebsd.org/changeset/ports/307376 Log: - Sanitize Makefile formatting, trim header and clean it up a bit - Define LICENSE (Artistic 1.0) - Drop shlib version number from LIB_DEPENDS - Convert to the new OPTIONS framework, utilize PORTDOCS - Drop indefinite article from COMMENT and bring it close to official description on sf.net - Convert Russian language docs from archaic KOI8-R to modern UTF-8 - Rephrase, reformat, and generally augment port description Approved by: maintainer timeout Feature safe: yes Modified: head/x11/xxkb/Makefile head/x11/xxkb/pkg-descr head/x11/xxkb/pkg-plist Modified: head/x11/xxkb/Makefile ============================================================================== --- head/x11/xxkb/Makefile Tue Nov 13 14:09:46 2012 (r307375) +++ head/x11/xxkb/Makefile Tue Nov 13 14:25:00 2012 (r307376) @@ -1,40 +1,45 @@ -# New ports collection makefile for: xxkb -# Date created: 5 Mar 2001 -# Whom: Alexander Matey -# +# Created by: Alexander Matey # $FreeBSD$ -# -PORTNAME= xxkb -PORTVERSION= 1.11 -CATEGORIES= x11 -MASTER_SITES= SF -DISTNAME= ${PORTNAME}-${PORTVERSION}-src +PORTNAME= xxkb +PORTVERSION= 1.11 +CATEGORIES= x11 +MASTER_SITES= SF +DISTNAME= ${PORTNAME}-${PORTVERSION}-src -MAINTAINER= alexander.pohoyda@gmx.net -COMMENT= An XKB keyboard layout switcher and indicator +MAINTAINER= alexander.pohoyda@gmx.net +COMMENT= XKB keyboard layout indicator and switcher -WRKSRC= ${WRKDIR}/${PORTNAME} -USE_XORG= xpm -USE_IMAKE= yes +LICENSE= ART10 -MAN1= xxkb.1 +BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv -OPTIONS= LIBRSVG "With SVG(librsvg2) support" off +USE_XORG= xpm +USE_IMAKE= yes +WRKSRC= ${WRKDIR}/${PORTNAME} + +MAN1= ${PORTNAME}.1 +PORTDOCS= README CHANGES.ru README.ru + +OPTIONS_DEFINE= LIBRSVG2 DOCS .include -.if defined(WITH_LIBRSVG) -LIB_DEPENDS+= rsvg-2.2:${PORTSDIR}/graphics/librsvg2 -XMKMF= xmkmf -a -DWITH_SVG_SUPPORT +.if ${PORT_OPTIONS:MLIBRSVG2} +LIB_DEPENDS= rsvg-2:${PORTSDIR}/graphics/librsvg2 +XMKMF= xmkmf -a -DWITH_SVG_SUPPORT .endif +post-build: +# Convert Russian language docs from archaic KOI8-R to modern UTF-8 +.for f in CHANGES README + iconv -f koi8-r -t utf-8 ${WRKSRC}/${f}.koi8 > ${WRKSRC}/${f}.ru +.endfor + post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -. for file in LICENSE README CHANGES.koi8 README.koi8 - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -. endfor +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} .endif .include Modified: head/x11/xxkb/pkg-descr ============================================================================== --- head/x11/xxkb/pkg-descr Tue Nov 13 14:09:46 2012 (r307375) +++ head/x11/xxkb/pkg-descr Tue Nov 13 14:25:00 2012 (r307376) @@ -1,9 +1,19 @@ -Xxkb is a simple XKB keyboard mapping switcher. It maintains an active -keyboard mapping on a per-window basis. An optional small icon is -displayed in each window to indicate the selected keyboard mapping. You -can click this icon to switch between mappings in addition to being able -to use the key combination specified in the XKB configuration. +The xxkb program is a keyboard layout switcher and indicator. Unlike the +programs that reload keyboard maps and use their own hot-keys, xxkb is a +simple GUI for XKB (X keyboard extension) and just sends commands to and +accepts events from XKB. That means that it will work with the existing +configuration of X11 server without any modifications. -Xxkb works with virtually any window manager. +Additional features include: -WWW: http://www.sourceforge.net/projects/xxkb/ + - Remembers the current layout in each application and switches to it + on window focus change + - Can put its own icon on an application window titlebar + - Allows to designate two main layouts from multi-layout keymaps + - Alternative layouts can be set separately for each application and + can be changed during run-time + - Supports custom actions for certain windows (e.g. ignore, set initial + active layout on application startup) + - Can be docked as a docklet or placed in the system tray + +WWW: http://sourceforge.net/projects/xxkb/ Modified: head/x11/xxkb/pkg-plist ============================================================================== --- head/x11/xxkb/pkg-plist Tue Nov 13 14:09:46 2012 (r307375) +++ head/x11/xxkb/pkg-plist Tue Nov 13 14:25:00 2012 (r307376) @@ -16,9 +16,4 @@ lib/X11/app-defaults/XXkb %%DATADIR%%/su48.xpm %%DATADIR%%/ua15.xpm %%DATADIR%%/ua48.xpm -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/CHANGES.koi8 -%%PORTDOCS%%%%DOCSDIR%%/README.koi8 -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%