Date: Thu, 6 Jul 2006 05:30:15 GMT From: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/99401: [Maintainer Update] sysutils/lineakd: Update to version 0.9 Message-ID: <200607060530.k665UFDa056963@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/99401; it has been noted by GNATS.
From: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org>
Cc:
Subject: Re: ports/99401: [Maintainer Update] sysutils/lineakd: Update to
version 0.9
Date: Thu, 6 Jul 2006 08:23:14 +0300
--Sig_c.lvBmu8hnesB4pEP3BoWXc
Content-Type: multipart/mixed; boundary=MP_Z_xElUu9LBqHo78D7B2pF.P
--MP_Z_xElUu9LBqHo78D7B2pF.P
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
The new patch wasn't send to gnats also, so forward here the new patch.
--=20
IOnut - Un^d^dregistered ;) FreeBSD "user"
"Intellectual Property" is nowhere near as valuable as "Intellect"
BOFH excuse #104:
backup tape overwritten with copy of system manager's favourite CD
--MP_Z_xElUu9LBqHo78D7B2pF.P
Content-Type: text/x-patch; name=patch-lineakd-0.8.3-0.9
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename=patch-lineakd-0.8.3-0.9
diff -urN -x .svn lineakd.orig/Makefile lineakd/Makefile
--- lineakd.orig/Makefile Sun Jul 2 14:24:41 2006
+++ lineakd/Makefile Sun Jul 2 14:24:02 2006
@@ -6,8 +6,7 @@
#
=20
PORTNAME=3D lineakd
-PORTVERSION=3D 0.8.3
-PORTREVISION=3D 1
+PORTVERSION=3D 0.9
CATEGORIES=3D sysutils
MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=3Dlineak
@@ -28,7 +27,7 @@
PORTDOCS=3D README TODO AUTHORS
=20
MAN1=3D lineakd.1
-MANCOMPRESSED=3D yes
+#MANCOMPRESSED=3D yes
=20
.include <bsd.port.pre.mk>
=20
diff -urN -x .svn lineakd.orig/distinfo lineakd/distinfo
--- lineakd.orig/distinfo Sun Jul 2 14:24:41 2006
+++ lineakd/distinfo Thu May 25 18:59:54 2006
@@ -1,3 +1,3 @@
-MD5 (lineak/lineakd-0.8.3.tar.gz) =3D fc1d3add18afbb8e61b8277b89c525c6
-SHA256 (lineak/lineakd-0.8.3.tar.gz) =3D cfde4a06df9fb4f26f8629d4ed3320ea8=
13ba05a25217ec4ff55bbe5da04f504
-SIZE (lineak/lineakd-0.8.3.tar.gz) =3D 852158
+MD5 (lineak/lineakd-0.9.tar.gz) =3D 8a45672a6cea666873398ecc36a5070c
+SHA256 (lineak/lineakd-0.9.tar.gz) =3D 39fd34f8df4d31d16adacce1191b34cef5e=
510b536701120906ec708be21010b
+SIZE (lineak/lineakd-0.9.tar.gz) =3D 991376
diff -urN -x .svn lineakd.orig/files/patch-Makefile.in lineakd/files/patch-=
Makefile.in
--- lineakd.orig/files/patch-Makefile.in Sun Jul 2 14:24:41 2006
+++ lineakd/files/patch-Makefile.in Fri May 26 14:55:36 2006
@@ -1,11 +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 @@
+--- Makefile.in.orig Fri May 26 14:44:53 2006
++++ Makefile.in Fri May 26 14:45:14 2006
+@@ -224,7 +224,7 @@
+ COMPILE_FIRST =3D lineak
COMPILE_LAST =3D lineakd
-=20
####### kdevelop will overwrite this part!!! (begin)##########
--SUBDIRS =3D lineak lineakd utils
+-SUBDIRS =3D lineak utils lineakd
+SUBDIRS =3D lineak lineakd
-=20
EXTRA_DIST =3D lineakd.kdevprj admin AUTHORS COPYING ChangeLog INSTALL RE=
ADME TODO lineakd.lsm lineakd.spec lineakd-noarch.spec README_LINEAK_LIBRAR=
Y DIRECTIVES=20
=20
+ ####### kdevelop will overwrite this part!!! (end)############
diff -urN -x .svn lineakd.orig/files/patch-lineak__cdromctrl.cpp lineakd/fi=
les/patch-lineak__cdromctrl.cpp
--- lineakd.orig/files/patch-lineak__cdromctrl.cpp Sun Jul 2 14:24:41 2006
+++ lineakd/files/patch-lineak__cdromctrl.cpp Fri May 26 14:56:29 2006
@@ -1,19 +1,23 @@
---- 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 @@
+--- lineak/cdromctrl.cpp.orig Fri May 26 14:34:03 2006
++++ lineak/cdromctrl.cpp Fri May 26 14:39:48 2006
+@@ -21,7 +21,7 @@
+ extern "C" {
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+-#if defined (__FreeBSD_kernel__) || defined(__FreeBSD_kernel__)
++#if defined (__FreeBSD__) || defined(__FreeBSD__)
+ # include <sys/cdio.h>
# define CDROMEJECT CDIOCEJECT /*_IO('c', 107)*/
# define CDROMCLOSETRAY CDIOCCLOSE
- #else
+@@ -37,6 +37,7 @@
+ # include <scsi/scsi.h>
+ # include <scsi/sg.h>
+ # include <scsi/scsi_ioctl.h>
+# include <sys/mount.h>
-+
-+# include <scsi/scsi.h>
-+# include <scsi/sg.h>
-+# include <scsi/scsi_ioctl.h>
-+
- # include <linux/version.h>
- # if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,5,70)
- typedef unsigned char u8;
-@@ -37,16 +43,11 @@
+ #endif
+ #if defined (__CYGWIN__)
+ # include <windows.h>
+@@ -47,7 +48,6 @@
=20
#include <sys/stat.h>
#include <sys/types.h>
@@ -21,30 +25,3 @@
=20
#include <stdio.h>
#include <errno.h>
- #include <unistd.h>
-=20
--#include <scsi/scsi.h>
--#include <scsi/sg.h>
--#include <scsi/scsi_ioctl.h>
--
- }
- #include <iostream>
-=20
-@@ -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 ne=
scessary) */
- if ( cdromdev !=3D snull && initialized) {
- lineak_core_functions::msg("... ejecting the SCSI CD-ROM tray");
-@@ -196,6 +200,7 @@
- status =3D ioctl(fp, BLKRRPART);
- // return (status =3D=3D 0);
- }
-+#endif
- }
- /** Set or disable the auto-eject mode. If auto-eject mode is enabled, th=
e cdrom device
- will eject when we issue a close(fp); */
diff -urN -x .svn lineakd.orig/files/patch-lineakd__Makefile.am lineakd/fil=
es/patch-lineakd__Makefile.am
--- lineakd.orig/files/patch-lineakd__Makefile.am Sun Jul 2 14:24:41 2006
+++ lineakd/files/patch-lineakd__Makefile.am Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- 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
-=20
- lineakd_SOURCES =3D lineakd_core_functions.cpp cmdprefs.cpp main.cpp=20
--lineakd_LDADD =3D -lpthread -llineak -lXext -lX11 -ldl
-+lineakd_LDADD =3D -lpthread -llineak -lXext -lX11
-=20
- EXTRA_DIST =3D main.cpp eakprocs.h cmdprefs.cpp cmdprefs.h lineakkb.def l=
ineakd.1.bz2 OLDCODE lineakd_core_functions.h lineakd_core_functions.cpp=20
- #man_MANS =3D lineakd.1.gz
diff -urN -x .svn lineakd.orig/files/patch-lineakd__Makefile.in lineakd/fil=
es/patch-lineakd__Makefile.in
--- lineakd.orig/files/patch-lineakd__Makefile.in Sun Jul 2 14:24:41 2006
+++ lineakd/files/patch-lineakd__Makefile.in Mon Jun 5 17:07:41 2006
@@ -1,47 +1,46 @@
---- 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/Makefile.in.orig Wed May 24 17:26:52 2006
++++ lineakd/Makefile.in Mon Jun 5 17:07:33 2006
+@@ -239,9 +239,9 @@
+ unsermake_enable_pch_FALSE =3D @unsermake_enable_pch_FALSE@
+ unsermake_enable_pch_TRUE =3D @unsermake_enable_pch_TRUE@
lineakd_SOURCES =3D lineakd_core_functions.cpp cmdprefs.cpp main.cpp=20
- lineakd_LDADD =3D -llineak -lXext -lX11=20
-=20
+-lineakd_LDADD =3D -lpthread -llineak -lXext -lX11 -ldl
++lineakd_LDADD =3D -llineak -lXext -lX11=20
+ lineakd_LDFLAGS =3D -rdynamic -L../lineak $(all_libraries) @X_LIBS@ @X_PR=
E_LIBS@
-EXTRA_DIST =3D main.cpp eakprocs.h cmdprefs.cpp cmdprefs.h lineakkb.def l=
ineakd.1.bz2 OLDCODE lineakd_core_functions.h lineakd_core_functions.cpp=20
+EXTRA_DIST =3D main.cpp eakprocs.h cmdprefs.cpp cmdprefs.h lineakkb.def l=
ineakd.1.gz OLDCODE lineakd_core_functions.h lineakd_core_functions.cpp=20
-=20
- ####### kdevelop will overwrite this part!!! (end)############
- # set the include path found by configure
-@@ -574,10 +574,10 @@
- uninstall-local
+ INCLUDES =3D $(all_includes) -I$(top_srcdir)/lineak -I. -I..
+ AM_CPPFLAGS =3D -I$(top_srcdir) -I$(top_srcdir)/lineak -I$(top_srcdir)/li=
neakd -I. -I.. $(all_includes)=20
+ #>- all: all-am
+@@ -544,10 +544,10 @@
=20
#man_MANS =3D lineakd.1.gz
+=20
-lineakd.1.bz2:
- bzip2 -c lineakd.1 > lineakd.1.bz2
+lineakd.1.gz:
-+ gzip lineakd.1
++ gzip -c lineakd.1 > lineakd.1.gz
=20
-install-data-local: lineakd.1.bz2
+install-data-local: lineakd.1.gz
- #>- $(mkinstalldirs) $(sysconfdir)/
+ #>- $(mkinstalldirs) ${DESTDIR}$(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
-=20
- uninstall-local:
- #>- -rm -f $(sysconfdir)/lineakkb.def
+ $(mkinstalldirs) $(DESTDIR)${DESTDIR}$(sysconfdir)/
+@@ -562,7 +562,7 @@
+ $(INSTALL_DATA) $(srcdir)/lineakkb.def $(DESTDIR)${DESTDIR}$(sysconfdir)=
/lineakkb.def
+ #>- $(INSTALL_DATA) $(srcdir)/lineakd.1.bz2 ${DESTDIR}$(mandir)/man1/lin=
eakd.1.bz2
#>+ 1
- -rm -f $(DESTDIR)$(sysconfdir)/lineakkb.def
--#>- -rm -f $(mandir)/man1/lineakd.1.bz2
-+#>- -rm -f $(mandir)/man1/lineakd.1.gz
+- $(INSTALL_DATA) $(srcdir)/lineakd.1.bz2 $(DESTDIR)${DESTDIR}$(mandir)/ma=
n1/lineakd.1.bz2
++ $(INSTALL_DATA) $(srcdir)/lineakd.1.gz $(DESTDIR)${DESTDIR}$(mandir)/man=
1/lineakd.1.gz
+ if test "$(SETKEYCODES_SUID)" !=3D "no" ; then \
+ chown root `which setkeycodes` ; \
+ chmod +s `which setkeycodes` ; \
+@@ -574,7 +574,7 @@
+ -rm -f $(DESTDIR)${DESTDIR}$(sysconfdir)/lineakkb.def
+ #>- -rm -f ${DESTDIR}$(mandir)/man1/lineakd.1.bz2
#>+ 1
-- -rm -f $(DESTDIR)$(mandir)/man1/lineakd.1.bz2
-+ -rm -f $(DESTDIR)$(mandir)/man1/lineakd.1.gz
+- -rm -f $(DESTDIR)${DESTDIR}$(mandir)/man1/lineakd.1.bz2
++ -rm -f $(DESTDIR)${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 -urN -x .svn 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 Sun Jul 2=
14:24:41 2006
+++ lineakd/files/patch-lineakd__lineakd_core_functions.cpp Fri May 26 14:5=
7:20 2006
@@ -1,14 +1,6 @@
---- 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 <sys/wait.h>
- }
-=20
-+#include <lineak/lineak_core_functions.h>
- #include <lineak/definitions.h>
- #include <lineak/configdirectives.h>
- #include <lineak/saver.h>
-@@ -256,7 +257,7 @@
+--- lineakd/lineakd_core_functions.cpp.orig Fri May 26 14:49:04 2006
++++ lineakd/lineakd_core_functions.cpp Fri May 26 14:51:07 2006
+@@ -261,7 +261,7 @@
sigprocmask(SIG_SETMASK, &mask_set, &old_set);
=20
/* now do some cleaning... */
@@ -17,7 +9,7 @@
/* Clean up X */
if (X !=3D 0) {
X->cleanup(myKbd);
-@@ -270,12 +271,12 @@
+@@ -275,12 +275,12 @@
if (!plugincleanup) {
plugincleanup =3D true;
if ( plugins !=3D NULL) {
@@ -33,7 +25,7 @@
}
}
=20
-@@ -283,13 +284,13 @@
+@@ -288,13 +288,13 @@
//sigprocmask(SIG_SETMASK, &old_set, NULL);
=20
/* Remove the message queue */
@@ -49,7 +41,7 @@
lockCtrl lock("lineakd");
lock.unlock();
// exit(true);
-@@ -321,16 +322,16 @@
+@@ -326,16 +326,16 @@
sigprocmask(SIG_SETMASK, &mask_set, &old_set);
//bool verbose =3D cmdprefs.getVerbose();
=20
@@ -70,7 +62,7 @@
/** Load the plugins */
plugins->loadPlugins(pluginlist);
/** Define the list of macros we support */
-@@ -370,34 +371,34 @@
+@@ -375,37 +375,37 @@
cmdprefs.setDefaults(dnd);
=20
/* reload .conf and .def file */
@@ -109,6 +101,10 @@
=20
- msg("*** Restarting On Screen Display...");
+ lineak_core_functions::msg("*** Restarting On Screen Display...");
- myDisplay->init(myConfig);
+ myDisplay =3D plugins->getDisplay(myConfig);
+ //myDisplay->init(myConfig);
+- msg("*** InitializePluginsDisplay...");
++ lineak_core_functions::msg("*** InitializePluginsDisplay...");
plugins->initializePluginsDisplay(*myDisplay);
=20
+ donehup=3Dfalse;
diff -urN -x .svn lineakd.orig/files/patch-lineakd__main.cpp lineakd/files/=
patch-lineakd__main.cpp
--- lineakd.orig/files/patch-lineakd__main.cpp Sun Jul 2 14:24:41 2006
+++ lineakd/files/patch-lineakd__main.cpp Fri May 26 14:57:40 2006
@@ -1,6 +1,6 @@
---- 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 @@
+--- lineakd/main.cpp.orig Fri May 26 14:51:44 2006
++++ lineakd/main.cpp Fri May 26 14:53:46 2006
+@@ -136,19 +136,19 @@
/** Load the plugins */
plugins->loadPlugins(pluginlist);
if (verbose) {
@@ -26,7 +26,7 @@
plugins->defineDirectivesLists();
//if (verbose) plugins->listPlugins();
/** Get a list of macros we support so that we can inform other classe=
s */
-@@ -307,7 +307,7 @@
+@@ -318,7 +318,7 @@
watch_messages();
=20
/* init X/Xkb with our EAK keycodes/keysyms */
@@ -35,7 +35,7 @@
=20
if (!X->initialize(myKbd)) {
cerr << "Could not initialize all keys. Retrying.\n";
-@@ -329,7 +329,7 @@
+@@ -340,7 +340,7 @@
myDisplay =3D new displayCtrl(myConfig);
myDisplay->init();
}
@@ -44,7 +44,7 @@
plugins->initializePluginsDisplay(*myDisplay);
=20
/* alright, we're going to loop forever now. only signals can interrupt=
us. */
-@@ -362,23 +362,23 @@
+@@ -375,23 +375,23 @@
// like VMWare.
if (xev.type =3D=3D MappingNotify) {
// if (!X->xkbRemapped()) {
@@ -73,8 +73,8 @@
+ lineak_core_functions::msg("Restarting the OSD.");
myDisplay =3D plugins->getDisplay(myConfig);
if (myDisplay !=3D NULL) {
- if (very_verbose) cout << "Reiniting plugin provided On Screen Di=
splay" << endl;
-@@ -390,7 +390,7 @@
+ //if (very_verbose) cout << "Reiniting plugin provided On Screen =
Display" << endl;
+@@ -405,7 +405,7 @@
myDisplay->init();
}
// Initialize the plugin displays again.
@@ -83,38 +83,21 @@
plugins->initializePluginsDisplay(*myDisplay);
// set exec.setDisplayCtrl(myDisplay) again.
exec.setDisplayCtrl(myDisplay);
-@@ -414,7 +414,7 @@
- }=20
+@@ -433,7 +433,7 @@
=20
if (obj !=3D NULL) {
-- msg("Got an object!");
-+ lineak_core_functions::msg("Got an object!");
+ vmsg("Got an object!");
+- msg("Looking for SYM and PRESS");
++ lineak_core_functions::msg("Looking for SYM and PRESS=
");
if (obj->getType() =3D=3D SYM && obj->getEventType() =3D=3D =
PRESS) {
- cout << "xev.xkey.keycode =3D " << xev.xkey.keycode << endl;
- cout << "obj->getKeyCode() =3D " << obj->getKeyCode() << endl;
-@@ -435,21 +435,21 @@
+ if (verbose) {
+ cout << "xev.xkey.keycode =3D " << xev.xkey.keycode << endl;
+@@ -451,7 +451,7 @@
}
}
else {
-- msg("Looking for CODE and PRESS");
-+ lineak_core_functions::msg("Looking for CODE and PRESS");
- =09
+- msg("Looking for CODE and PRESS");
++ lineak_core_functions::msg("Looking for CODE and PRESS");
if (obj->getType() =3D=3D CODE && obj->getEventType() =3D=
=3D PRESS)
{
- if (verbose) cout << xev.xkey.keycode << " =3D " << obj->getK=
eyCode() << endl;
- =20
- if (obj->hasModifier(xev.xkey.state))
-- msg("true");
-+ lineak_core_functions::msg("true");
- else
-- msg("false");
-+ lineak_core_functions::msg("false");
- =20
- if ((int)xev.xkey.keycode =3D=3D obj->getKeyCode()
- && obj->hasModifier((int)xev.xkey.state))
- {
-- msg("getting to the right place!");
-+ lineak_core_functions::msg("getting to the right place!");
- execute =3D plugins->exec(obj,xev);
- if (execute !=3D NULL)
- execute(obj,xev);
+ if (very_verbose) cout << xev.xkey.keycode << " =3D " << obj-=
>getKeyCode() << endl;
--MP_Z_xElUu9LBqHo78D7B2pF.P--
--Sig_c.lvBmu8hnesB4pEP3BoWXc
Content-Type: application/pgp-signature; name=signature.asc
Content-Disposition: attachment; filename=signature.asc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (FreeBSD)
iD8DBQFErJ5DBX6fi0k6KXsRApKGAJsHc0Zfyrld3GjwXPvoGQACVJU72gCgiTB7
xzJQbjYJkf9U5M+lf2cU/yg=
=5ePJ
-----END PGP SIGNATURE-----
--Sig_c.lvBmu8hnesB4pEP3BoWXc--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607060530.k665UFDa056963>