From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Apr 2 17:20:12 2005 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 B01C216A50F for ; Sat, 2 Apr 2005 17:20:12 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78F8D43D49 for ; Sat, 2 Apr 2005 17:20:11 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j32HKBsY096303 for ; Sat, 2 Apr 2005 17:20:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j32HKBIc096302; Sat, 2 Apr 2005 17:20:11 GMT (envelope-from gnats) Resent-Date: Sat, 2 Apr 2005 17:20:11 GMT Resent-Message-Id: <200504021720.j32HKBIc096302@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, "Kay Lehmann" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7735916A4CF for ; Sat, 2 Apr 2005 17:15:38 +0000 (GMT) Received: from einhorn.in-berlin.de (einhorn.in-berlin.de [192.109.42.8]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C68543D1D for ; Sat, 2 Apr 2005 17:15:37 +0000 (GMT) (envelope-from kay_lehmann@web.de) Received: from bippes.finkenkrug.ev (lehmann.in-dsl.de [217.197.85.240]) (authenticated bits=0)j32HF6Ix015740 for ; Sat, 2 Apr 2005 19:15:18 +0200 Message-Id: <1112462602.0@bippes.finkenkrug.ev> Date: Sat, 2 Apr 2005 19:23:22 +0200 From: "Kay Lehmann" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.4 Subject: ports/79487: [Maintainer Update] sysutils/lineakd: Update to version 0.8.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Apr 2005 17:20:13 -0000 >Number: 79487 >Category: ports >Synopsis: [Maintainer Update] sysutils/lineakd: Update to version 0.8.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Apr 02 17:20:11 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Kay Lehmann >Release: FreeBSD 5.4-PRERELEASE i386 >Organization: >Environment: System: FreeBSD 5.4-PRERELEASE #5: Thu Mar 31 14:30:09 CEST 2005 root@bippes.finkenkrug.ev:/usr/obj/usr/src/sys/bippes >Description: Update to version 0.8.3. >How-To-Repeat: >Fix: --- patch-lineakd-0.8.2-0.8.3 begins here --- diff -urN lineakd.orig/Makefile lineakd/Makefile --- lineakd.orig/Makefile Sat Apr 2 18:48:34 2005 +++ lineakd/Makefile Sat Apr 2 18:46:28 2005 @@ -6,8 +6,7 @@ # PORTNAME= lineakd -PORTVERSION= 0.8.2 -PORTREVISION= 1 +PORTVERSION= 0.8.3 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=lineak diff -urN lineakd.orig/distinfo lineakd/distinfo --- lineakd.orig/distinfo Sat Apr 2 18:48:34 2005 +++ lineakd/distinfo Sat Apr 2 18:46:28 2005 @@ -1,2 +1,2 @@ -MD5 (lineak/lineakd-0.8.2.tar.gz) = 86bae5018d5fcf349bb665779b1f068d -SIZE (lineak/lineakd-0.8.2.tar.gz) = 830455 +MD5 (lineak/lineakd-0.8.3.tar.gz) = fc1d3add18afbb8e61b8277b89c525c6 +SIZE (lineak/lineakd-0.8.3.tar.gz) = 852158 diff -urN lineakd.orig/files/patch-Makefile.in lineakd/files/patch-Makefile.in --- lineakd.orig/files/patch-Makefile.in Thu Jan 1 01:00:00 1970 +++ lineakd/files/patch-Makefile.in Sat Apr 2 18:46:28 2005 @@ -0,0 +1,11 @@ +--- Makefile.in.orig Sat Apr 2 18:31:49 2005 ++++ Makefile.in Sat Apr 2 18:32:05 2005 +@@ -267,7 +267,7 @@ + COMPILE_LAST = lineakd + + ####### kdevelop will overwrite this part!!! (begin)########## +-SUBDIRS = lineak lineakd utils ++SUBDIRS = lineak lineakd + + EXTRA_DIST = lineakd.kdevprj admin AUTHORS COPYING ChangeLog INSTALL README TODO lineakd.lsm lineakd.spec lineakd-noarch.spec README_LINEAK_LIBRARY DIRECTIVES + diff -urN lineakd.orig/files/patch-lineak__defloader.cpp lineakd/files/patch-lineak__defloader.cpp --- lineakd.orig/files/patch-lineak__defloader.cpp Sat Apr 2 18:48:34 2005 +++ lineakd/files/patch-lineak__defloader.cpp Thu Jan 1 01:00:00 1970 @@ -1,27 +0,0 @@ ---- lineak/defloader.cpp.orig Tue Feb 15 18:28:46 2005 -+++ lineak/defloader.cpp Tue Feb 15 18:28:49 2005 -@@ -129,7 +129,7 @@ - // Handle empty lines. - loc = tmp.find('='); - // empty line -- if (loc == string::npos) -+ if (loc == (unsigned int)string::npos) - continue; - - // key == the name of the key. -@@ -157,13 +157,13 @@ - //cout << akey; - /** Now determine if this is a toggleable key. We will have to parse - the name format name1|name2 if indeed it is a toggleable key. */ -- if ((unsigned int)key.find('|') != string::npos) { -+ if ((unsigned int)key.find('|') != (unsigned int)string::npos) { - key+='|'; - akey->setToggle(true); - int index; - string tmp; - //vectornames; -- while (((unsigned int)(index = key.find('|'))) != string::npos) { -+ while (((unsigned int)(index = key.find('|'))) != (unsigned int)string::npos) { - tmp = key.substr(0,index); - //cout << "adding toggle name: " << tmp << " to " << akey->getName() << endl; - akey->addToggleName(tmp); diff -urN lineakd.orig/files/patch-lineakd__lineakd_core_functions.cpp lineakd/files/patch-lineakd__lineakd_core_functions.cpp --- lineakd.orig/files/patch-lineakd__lineakd_core_functions.cpp Sat Apr 2 18:48:34 2005 +++ lineakd/files/patch-lineakd__lineakd_core_functions.cpp Sat Apr 2 18:46:28 2005 @@ -1,5 +1,5 @@ ---- lineakd/lineakd_core_functions.cpp.orig Wed Dec 29 11:49:55 2004 -+++ lineakd/lineakd_core_functions.cpp Wed Dec 29 11:54:02 2004 +--- lineakd/lineakd_core_functions.cpp.orig Wed Mar 2 13:15:38 2005 ++++ lineakd/lineakd_core_functions.cpp Sat Apr 2 18:13:06 2005 @@ -46,6 +46,7 @@ #include } @@ -17,8 +17,15 @@ /* Clean up X */ if (X != 0) { X->cleanup(myKbd); -@@ -275,7 +276,7 @@ - //msg("Unloading All Plugins DONE!"); +@@ -270,12 +271,12 @@ + if (!plugincleanup) { + plugincleanup = true; + if ( plugins != NULL) { +- msg("Unloading All Plugins!"); ++ lineak_core_functions::msg("Unloading All Plugins!"); + plugins->unloadAllPlugins(); +- msg("Unloading All Plugins DONE!"); ++ lineak_core_functions::msg("Unloading All Plugins DONE!"); delete(plugins); plugins = NULL; - msg("Plugins all taken care of!"); @@ -42,7 +49,7 @@ lockCtrl lock("lineakd"); lock.unlock(); // exit(true); -@@ -321,8 +322,8 @@ +@@ -321,16 +322,16 @@ sigprocmask(SIG_SETMASK, &mask_set, &old_set); //bool verbose = cmdprefs.getVerbose(); @@ -52,8 +59,18 @@ + lineak_core_functions::msg("Unmapping keys"); X->cleanup(myKbd); - //msg("Unloading all plugins"); -@@ -366,34 +367,34 @@ +- msg("Unloading all plugins"); ++ lineak_core_functions::msg("Unloading all plugins"); + plugins->unloadAllPlugins(); + + /** Get a list of the potential plugins in the plugin directory */ + vector pluginlist = plugins->scanForPlugins(); +- msg("Scaning for and loading plugins"); ++ lineak_core_functions::msg("Scaning for and loading plugins"); + /** Load the plugins */ + plugins->loadPlugins(pluginlist); + /** Define the list of macros we support */ +@@ -370,34 +371,34 @@ cmdprefs.setDefaults(dnd); /* reload .conf and .def file */ diff -urN lineakd.orig/files/patch-lineakd__main.cpp lineakd/files/patch-lineakd__main.cpp --- lineakd.orig/files/patch-lineakd__main.cpp Sat Apr 2 18:48:34 2005 +++ lineakd/files/patch-lineakd__main.cpp Sat Apr 2 18:46:28 2005 @@ -1,6 +1,32 @@ ---- lineakd/main.cpp.orig Wed Dec 29 11:55:13 2004 -+++ lineakd/main.cpp Wed Dec 29 11:55:15 2004 -@@ -288,7 +288,7 @@ +--- lineakd/main.cpp.orig Mon Feb 21 20:26:38 2005 ++++ lineakd/main.cpp Sat Apr 2 18:20:50 2005 +@@ -134,19 +134,19 @@ + /** Load the plugins */ + plugins->loadPlugins(pluginlist); + if (verbose) { +- msg(""); +- msg("Listing Plugins"); ++ lineak_core_functions::msg(""); ++ lineak_core_functions::msg("Listing Plugins"); + plugins->listPlugins(); + } + +- msg(""); +- msg("Defining Macro Lists"); ++ lineak_core_functions::msg(""); ++ lineak_core_functions::msg("Defining Macro Lists"); + /** Define the list of macros we support */ + plugins->defineMacroLists(); + //if (verbose) plugins->listPlugins(); + /** Define the configurate directives we support */ +- msg(""); +- msg("Defining Directives Lists"); ++ lineak_core_functions::msg(""); ++ lineak_core_functions::msg("Defining Directives Lists"); + plugins->defineDirectivesLists(); + //if (verbose) plugins->listPlugins(); + /** Get a list of macros we support so that we can inform other classes */ +@@ -307,7 +307,7 @@ watch_messages(); /* init X/Xkb with our EAK keycodes/keysyms */ @@ -9,16 +35,64 @@ if (!X->initialize(myKbd)) { cerr << "Could not initialize all keys. Retrying.\n"; -@@ -345,7 +345,7 @@ +@@ -329,7 +329,7 @@ + myDisplay = new displayCtrl(myConfig); + myDisplay->init(); + } +- msg("Initializing Plugin Display"); ++ lineak_core_functions::msg("Initializing Plugin Display"); + plugins->initializePluginsDisplay(*myDisplay); + + /* alright, we're going to loop forever now. only signals can interrupt us. */ +@@ -362,23 +362,23 @@ + // like VMWare. + if (xev.type == MappingNotify) { + // if (!X->xkbRemapped()) { +- msg("Setting xkbRemapped flag"); ++ lineak_core_functions::msg("Setting xkbRemapped flag"); + X->xkbRemapped(true); // =1; +- msg("Cleaning up key mappings from MappingNotify event"); ++ lineak_core_functions::msg("Cleaning up key mappings from MappingNotify event"); + X->cleanup(myKbd); +- msg("Cleaning up the on screen display."); ++ lineak_core_functions::msg("Cleaning up the on screen display."); + myDisplay->cleanup(); + // } + // If we are getting the display back. + // Get out modifiers and grab our keys again. + // Reinitialize the OSD. + // else { +- msg("Clearing xkbRemapped flag"); ++ lineak_core_functions::msg("Clearing xkbRemapped flag"); + X->xkbRemapped(false); + //X->getModifiers(); +- msg("Reclaiming keyboard map from MappingNotify event"); ++ lineak_core_functions::msg("Reclaiming keyboard map from MappingNotify event"); + X->initialize(myKbd); +- msg("Restarting the OSD."); ++ lineak_core_functions::msg("Restarting the OSD."); + myDisplay = plugins->getDisplay(myConfig); + if (myDisplay != NULL) { + if (very_verbose) cout << "Reiniting plugin provided On Screen Display" << endl; +@@ -390,7 +390,7 @@ + myDisplay->init(); + } + // Initialize the plugin displays again. +- msg("Initializing Plugin Display"); ++ lineak_core_functions::msg("Initializing Plugin Display"); + plugins->initializePluginsDisplay(*myDisplay); + // set exec.setDisplayCtrl(myDisplay) again. + exec.setDisplayCtrl(myDisplay); +@@ -414,7 +414,7 @@ } if (obj != NULL) { - msg("Got an object!"); + lineak_core_functions::msg("Got an object!"); if (obj->getType() == SYM && obj->getEventType() == PRESS) { - if (xev.xkey.keycode == XKeysymToKeycode (display, obj->getKeySym()) - && obj->hasModifier(xev.xkey.state)) -@@ -366,21 +366,21 @@ + cout << "xev.xkey.keycode = " << xev.xkey.keycode << endl; + cout << "obj->getKeyCode() = " << obj->getKeyCode() << endl; +@@ -435,21 +435,21 @@ } } else { @@ -44,12 +118,3 @@ execute = plugins->exec(obj,xev); if (execute != NULL) execute(obj,xev); -@@ -515,7 +515,7 @@ - if (!X->xkbRemapped()) - X->xkbRemapped(true); // =1; - else { -- msg("Reclaiming keyboard map from MappingNotify event"); -+ lineak_core_functions::msg("Reclaiming keyboard map from MappingNotify event"); - X->xkbRemapped(false); - //X->getModifiers(); - X->initialize(myKbd); --- patch-lineakd-0.8.2-0.8.3 ends here --- >Release-Note: >Audit-Trail: >Unformatted: