From ec1a7f6d989eb88ca67bbf625b8bd570ab4db900 Mon Sep 17 00:00:00 2001 From: pav Date: Sat, 15 Jan 2005 23:31:58 +0000 Subject: - Update to 0.8.2 - Unbreak on 5.x - New plugin system, untested on FreeBSD 4.x, please test PR: ports/76269 Submitted by: Kay Lehmann (maintainer) --- sysutils/lineakd/Makefile | 25 +++--- sysutils/lineakd/distinfo | 4 +- sysutils/lineakd/files/extra-patch-ltmain.sh | 15 ++++ sysutils/lineakd/files/patch-aa | 11 --- sysutils/lineakd/files/patch-lineak__cdromctrl.cpp | 50 +++++++++++ sysutils/lineakd/files/patch-lineakd__Makefile.am | 11 +++ sysutils/lineakd/files/patch-lineakd__Makefile.in | 47 +++++++++++ .../patch-lineakd__lineakd_core_functions.cpp | 97 ++++++++++++++++++++++ sysutils/lineakd/files/patch-lineakd__main.cpp | 55 ++++++++++++ sysutils/lineakd/pkg-plist | 31 +++++++ 10 files changed, 323 insertions(+), 23 deletions(-) create mode 100644 sysutils/lineakd/files/extra-patch-ltmain.sh delete mode 100644 sysutils/lineakd/files/patch-aa create mode 100644 sysutils/lineakd/files/patch-lineak__cdromctrl.cpp create mode 100644 sysutils/lineakd/files/patch-lineakd__Makefile.am create mode 100644 sysutils/lineakd/files/patch-lineakd__Makefile.in create mode 100644 sysutils/lineakd/files/patch-lineakd__lineakd_core_functions.cpp create mode 100644 sysutils/lineakd/files/patch-lineakd__main.cpp (limited to 'sysutils') diff --git a/sysutils/lineakd/Makefile b/sysutils/lineakd/Makefile index a445f87789b4..52ef1736e92b 100644 --- a/sysutils/lineakd/Makefile +++ b/sysutils/lineakd/Makefile @@ -6,38 +6,43 @@ # PORTNAME= lineakd -PORTVERSION= 0.7.2 -PORTREVISION= 1 +PORTVERSION= 0.8.2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=lineak +DIST_SUBDIR= lineak MAINTAINER= kay_lehmann@web.de COMMENT= Lineakd is a daemon which enables special keys on internet keyboards USE_GMAKE= yes USE_XLIB= yes -GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}" USE_REINPLACE= yes +INSTALLS_SHLIB= yes -.if defined(WITHOUT_XOSD) -CONFIGURE_ARGS+= --with-xosd=no -.else -LIB_DEPENDS+= xosd.4:${PORTSDIR}/misc/xosd -.endif +CONFIGURE_ARGS+=--program-prefix='' PORTDOCS= README TODO AUTHORS +MAN1= lineakd.1 +MANCOMPRESSED= yes + .include -.if ${OSVERSION} >= 502126 -BROKEN= "Does not compile on FreeBSD >= 5.x" +.if ${OSVERSION} < 500000 +# ANSI C++ forbids data member `macro_info' with same name as enclosing class +USE_GCC= 3.4 +GNU_CONFIGURE= yes +EXTRA_PATCHES= ${FILESDIR}/extra-patch-ltmain.sh +.else +USE_LIBTOOL_VER=15 .endif post-patch: @${REINPLACE_CMD} -e 's|-lpthread||' ${WRKSRC}/lineakd/Makefile.in + @${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/lineakd/Makefile.in @${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure post-install: diff --git a/sysutils/lineakd/distinfo b/sysutils/lineakd/distinfo index b60831c58d3c..c998ea0740dd 100644 --- a/sysutils/lineakd/distinfo +++ b/sysutils/lineakd/distinfo @@ -1,2 +1,2 @@ -MD5 (lineakd-0.7.2.tar.gz) = 547692808f03f87c247b9e156ac95c29 -SIZE (lineakd-0.7.2.tar.gz) = 398916 +MD5 (lineak/lineakd-0.8.2.tar.gz) = 86bae5018d5fcf349bb665779b1f068d +SIZE (lineak/lineakd-0.8.2.tar.gz) = 830455 diff --git a/sysutils/lineakd/files/extra-patch-ltmain.sh b/sysutils/lineakd/files/extra-patch-ltmain.sh new file mode 100644 index 000000000000..7c1686005ce3 --- /dev/null +++ b/sysutils/lineakd/files/extra-patch-ltmain.sh @@ -0,0 +1,15 @@ +--- admin/ltmain.sh.orig Fri Mar 19 14:14:27 2004 ++++ admin/ltmain.sh Fri Mar 19 14:14:40 2004 +@@ -5425,10 +5425,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false ; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/sysutils/lineakd/files/patch-aa b/sysutils/lineakd/files/patch-aa deleted file mode 100644 index 5f18faacfc8d..000000000000 --- a/sysutils/lineakd/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- lineakd/cdromctrl.cpp.orig Wed Nov 19 13:45:39 2003 -+++ lineakd/cdromctrl.cpp Wed Nov 19 13:46:41 2003 -@@ -23,7 +23,7 @@ - #include - #if defined (__FreeBSD__) - # include -- #define CDROMEJECT CDIOEJECT /*_IO('c',107)*/ -+ #define CDROMEJECT CDIOCEJECT /*_IO('c',107)*/ - #define CDROMCLOSETRAY CDIOCCLOSE - #else - #include /* linux specific?!! */ diff --git a/sysutils/lineakd/files/patch-lineak__cdromctrl.cpp b/sysutils/lineakd/files/patch-lineak__cdromctrl.cpp new file mode 100644 index 000000000000..de5d9341b317 --- /dev/null +++ b/sysutils/lineakd/files/patch-lineak__cdromctrl.cpp @@ -0,0 +1,50 @@ +--- lineak/cdromctrl.cpp.orig Thu Oct 28 17:04:06 2004 ++++ lineak/cdromctrl.cpp Sat Jan 15 11:28:04 2005 +@@ -26,6 +26,12 @@ + # define CDROMEJECT CDIOCEJECT /*_IO('c', 107)*/ + # define CDROMCLOSETRAY CDIOCCLOSE + #else ++# include ++ ++# include ++# include ++# include ++ + # include + # if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70) + typedef unsigned char u8; +@@ -37,16 +43,11 @@ + + #include + #include +-#include + + #include + #include + #include + +-#include +-#include +-#include +- + } + #include + +@@ -141,6 +142,9 @@ + } + /** OPen the tray for a scsi device */ + void cdromCtrl::openTrayScsi(){ ++ #if defined (__FreeBSD__) ++ cdromCtrl::openTray(); ++ #else + /* do we have a CD-ROM device configured? (extra check, not really nescessary) */ + if ( cdromdev != snull && initialized) { + lineak_core_functions::msg("... ejecting the SCSI CD-ROM tray"); +@@ -196,6 +200,7 @@ + status = ioctl(fp, BLKRRPART); + // return (status == 0); + } ++#endif + } + /** Set or disable the auto-eject mode. If auto-eject mode is enabled, the cdrom device + will eject when we issue a close(fp); */ diff --git a/sysutils/lineakd/files/patch-lineakd__Makefile.am b/sysutils/lineakd/files/patch-lineakd__Makefile.am new file mode 100644 index 000000000000..f35bf9a52003 --- /dev/null +++ b/sysutils/lineakd/files/patch-lineakd__Makefile.am @@ -0,0 +1,11 @@ +--- lineakd/Makefile.am.orig Wed Dec 29 12:07:27 2004 ++++ lineakd/Makefile.am Wed Dec 29 12:07:41 2004 +@@ -5,7 +5,7 @@ + ## INCLUDES were found outside kdevelop specific part + + lineakd_SOURCES = lineakd_core_functions.cpp cmdprefs.cpp main.cpp +-lineakd_LDADD = -lpthread -llineak -lXext -lX11 -ldl ++lineakd_LDADD = -lpthread -llineak -lXext -lX11 + + EXTRA_DIST = main.cpp eakprocs.h cmdprefs.cpp cmdprefs.h lineakkb.def lineakd.1.bz2 OLDCODE lineakd_core_functions.h lineakd_core_functions.cpp + #man_MANS = lineakd.1.gz diff --git a/sysutils/lineakd/files/patch-lineakd__Makefile.in b/sysutils/lineakd/files/patch-lineakd__Makefile.in new file mode 100644 index 000000000000..23825f1d93d3 --- /dev/null +++ b/sysutils/lineakd/files/patch-lineakd__Makefile.in @@ -0,0 +1,47 @@ +--- lineakd/Makefile.in.orig Sat Jan 15 11:20:25 2005 ++++ lineakd/Makefile.in Sat Jan 15 11:23:02 2005 +@@ -269,7 +269,7 @@ + lineakd_SOURCES = lineakd_core_functions.cpp cmdprefs.cpp main.cpp + lineakd_LDADD = -llineak -lXext -lX11 + +-EXTRA_DIST = main.cpp eakprocs.h cmdprefs.cpp cmdprefs.h lineakkb.def lineakd.1.bz2 OLDCODE lineakd_core_functions.h lineakd_core_functions.cpp ++EXTRA_DIST = main.cpp eakprocs.h cmdprefs.cpp cmdprefs.h lineakkb.def lineakd.1.gz OLDCODE lineakd_core_functions.h lineakd_core_functions.cpp + + ####### kdevelop will overwrite this part!!! (end)############ + # set the include path found by configure +@@ -574,10 +574,10 @@ + uninstall-local + + #man_MANS = lineakd.1.gz +-lineakd.1.bz2: +- bzip2 -c lineakd.1 > lineakd.1.bz2 ++lineakd.1.gz: ++ gzip lineakd.1 + +-install-data-local: lineakd.1.bz2 ++install-data-local: lineakd.1.gz + #>- $(mkinstalldirs) $(sysconfdir)/ + #>+ 1 + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/ +@@ -590,17 +590,17 @@ + #>- $(INSTALL_DATA) $(srcdir)/lineakkb.def $(sysconfdir)/lineakkb.def + #>+ 1 + $(INSTALL_DATA) $(srcdir)/lineakkb.def $(DESTDIR)$(sysconfdir)/lineakkb.def +-#>- $(INSTALL_DATA) $(srcdir)/lineakd.1.bz2 $(mandir)/man1/lineakd.1.bz2 ++#>- $(INSTALL_DATA) $(srcdir)/lineakd.1.gz $(mandir)/man1/lineakd.1.gz + #>+ 1 +- $(INSTALL_DATA) $(srcdir)/lineakd.1.bz2 $(DESTDIR)$(mandir)/man1/lineakd.1.bz2 ++ $(INSTALL_DATA) $(srcdir)/lineakd.1.gz $(DESTDIR)$(mandir)/man1/lineakd.1.gz + + uninstall-local: + #>- -rm -f $(sysconfdir)/lineakkb.def + #>+ 1 + -rm -f $(DESTDIR)$(sysconfdir)/lineakkb.def +-#>- -rm -f $(mandir)/man1/lineakd.1.bz2 ++#>- -rm -f $(mandir)/man1/lineakd.1.gz + #>+ 1 +- -rm -f $(DESTDIR)$(mandir)/man1/lineakd.1.bz2 ++ -rm -f $(DESTDIR)$(mandir)/man1/lineakd.1.gz + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/sysutils/lineakd/files/patch-lineakd__lineakd_core_functions.cpp b/sysutils/lineakd/files/patch-lineakd__lineakd_core_functions.cpp new file mode 100644 index 000000000000..57075468a18b --- /dev/null +++ b/sysutils/lineakd/files/patch-lineakd__lineakd_core_functions.cpp @@ -0,0 +1,97 @@ +--- 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 +@@ -46,6 +46,7 @@ + #include + } + ++#include + #include + #include + #include +@@ -256,7 +257,7 @@ + sigprocmask(SIG_SETMASK, &mask_set, &old_set); + + /* now do some cleaning... */ +- msg("Cleaning up xkb mappings"); ++ lineak_core_functions::msg("Cleaning up xkb mappings"); + /* Clean up X */ + if (X != 0) { + X->cleanup(myKbd); +@@ -275,7 +276,7 @@ + //msg("Unloading All Plugins DONE!"); + delete(plugins); + plugins = NULL; +- msg("Plugins all taken care of!"); ++ lineak_core_functions::msg("Plugins all taken care of!"); + } + } + +@@ -283,13 +284,13 @@ + //sigprocmask(SIG_SETMASK, &old_set, NULL); + + /* Remove the message queue */ +- msg("Removing message queue"); ++ lineak_core_functions::msg("Removing message queue"); + msgPasser myMsg; + if (!myMsg.start()) error("do_exit(): Cannot establish message queue to shutdown the queue.!"); + myMsg.quit(); + + /** Remove the lock */ +- msg("Removing lock"); ++ lineak_core_functions::msg("Removing lock"); + lockCtrl lock("lineakd"); + lock.unlock(); + // exit(true); +@@ -321,8 +322,8 @@ + sigprocmask(SIG_SETMASK, &mask_set, &old_set); + //bool verbose = cmdprefs.getVerbose(); + +- msg("Recieved a message to load a new configuration"); +- msg("Unmapping keys"); ++ lineak_core_functions::msg("Recieved a message to load a new configuration"); ++ lineak_core_functions::msg("Unmapping keys"); + X->cleanup(myKbd); + + //msg("Unloading all plugins"); +@@ -366,34 +367,34 @@ + cmdprefs.setDefaults(dnd); + + /* reload .conf and .def file */ +- msg("*** reloading config file " + myConfig.getFilename()); ++ lineak_core_functions::msg("*** reloading config file " + myConfig.getFilename()); + cout << "Config file to load is: " << myConfig.getFilename() << endl; + ConfigLoader ldr(myConfig.getFilename(),dnd); + myConfig.clear(); + myConfig = ldr.loadConfig(); + myConfig.print(cout); + //parseConfigs(dnd, myConfig); +- msg("*** setting config file options " + myConfig.getFilename()); ++ lineak_core_functions::msg("*** setting config file options " + myConfig.getFilename()); + cmdprefs.setOpts(myConfig); +- msg("*** reloading definition file " + myDef.getFilename()); ++ lineak_core_functions::msg("*** reloading definition file " + myDef.getFilename()); + parseDefinitions(cmdprefs, myDef); + + /* re-init the EAKeyboard */ +- msg("*** re-initializing the keyboard"); ++ lineak_core_functions::msg("*** re-initializing the keyboard"); + myKbd = myDef.getKeyboard(myConfig[_CD_KEYBOARD_TYPE]); + /** Update our keyboard with our configured commands */ + myKbd.setCommands(myConfig); + + /* re-init X/Xkb with our EAK keycodes/keysyms */ +- msg("*** reconfiguring Xkb keymap with new keys and buttons"); ++ lineak_core_functions::msg("*** reconfiguring Xkb keymap with new keys and buttons"); + X->initialize(myKbd); + + /* .. restore the old signal mask .. */ +- msg("*** rehash done"); ++ lineak_core_functions::msg("*** rehash done"); + sigprocmask(SIG_SETMASK, &old_set, NULL); + plugins->initializePlugins(myKbd, myConfig,plugins); + +- msg("*** Restarting On Screen Display..."); ++ lineak_core_functions::msg("*** Restarting On Screen Display..."); + myDisplay->init(myConfig); + plugins->initializePluginsDisplay(*myDisplay); + diff --git a/sysutils/lineakd/files/patch-lineakd__main.cpp b/sysutils/lineakd/files/patch-lineakd__main.cpp new file mode 100644 index 000000000000..246f0bccbf8b --- /dev/null +++ b/sysutils/lineakd/files/patch-lineakd__main.cpp @@ -0,0 +1,55 @@ +--- 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 @@ + watch_messages(); + + /* init X/Xkb with our EAK keycodes/keysyms */ +- msg("Initializing the display"); ++ lineak_core_functions::msg("Initializing the display"); + + if (!X->initialize(myKbd)) { + cerr << "Could not initialize all keys. Retrying.\n"; +@@ -345,7 +345,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 @@ + } + } + else { +- msg("Looking for CODE and PRESS"); ++ lineak_core_functions::msg("Looking for CODE and PRESS"); + + if (obj->getType() == CODE && obj->getEventType() == PRESS) + { + if (verbose) cout << xev.xkey.keycode << " = " << obj->getKeyCode() << endl; + + if (obj->hasModifier(xev.xkey.state)) +- msg("true"); ++ lineak_core_functions::msg("true"); + else +- msg("false"); ++ lineak_core_functions::msg("false"); + + if ((int)xev.xkey.keycode == obj->getKeyCode() + && obj->hasModifier((int)xev.xkey.state)) + { +- msg("getting to the right place!"); ++ lineak_core_functions::msg("getting to the right place!"); + 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); diff --git a/sysutils/lineakd/pkg-plist b/sysutils/lineakd/pkg-plist index 7b742bee690a..df548f9e472b 100644 --- a/sysutils/lineakd/pkg-plist +++ b/sysutils/lineakd/pkg-plist @@ -1,4 +1,35 @@ bin/lineakd etc/lineakkb.def +include/lineak/configdirectives.h +include/lineak/configloader.h +include/lineak/definitions.h +include/lineak/defloader.h +include/lineak/lconfig.h +include/lineak/lconfigdata.h +include/lineak/ldef.h +include/lineak/lobject.h +include/lineak/lkbd.h +include/lineak/lkey.h +include/lineak/lbutton.h +include/lineak/loader.h +include/lineak/msgpasser.h +include/lineak/saver.h +include/lineak/lcommand.h +include/lineak/lockctrl.h +include/lineak/lineak_util_functions.h +include/lineak/lineak_core_functions.h +include/lineak/cdromctrl.h +include/lineak/xmgr.h +include/lineak/displayctrl.h +include/lineak/plugin_definitions.h +include/lineak/commandexec.h +include/lineak/pluginmanager.h +lib/liblineak.so.8 +lib/liblineak.so +lib/liblineak.a +@exec mkdir -p %D/lib/lineakd/plugins %%EXAMPLESDIR%%/lineakd.conf.example @dirrm %%EXAMPLESDIR%% +@dirrm include/lineak +@dirrm lib/lineakd/plugins +@dirrm lib/lineakd -- cgit