Attachment 37125 Details for Bug 59212 – lineakd-0.7.2new.diff

[patch] lineakd-0.7.2new.diff

lineakd-0.7.2new.diff (text/plain), 10.68 KB, created by Kay Lehmann on 2003-11-12 15:14:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kay Lehmann

Created: 2003-11-12 15:14:38 UTC

Size: 10.68 KB

patch

obsolete

>diff -urN lineakd.old/Makefile lineakd/Makefile
>--- lineakd.old/Makefile	Mon Sep 29 16:32:13 2003
>+++ lineakd/Makefile	Wed Nov 12 15:58:19 2003
>@@ -2,15 +2,14 @@
> # Date created:				03 June 2002
> # Whom:					Kay Lehmann
> #
>-# $FreeBSD: ports/sysutils/lineakd/Makefile,v 1.1 2003/09/29 14:32:13 edwin Exp $
>+# $FreeBSD$
> #
> 
> PORTNAME=	lineakd
>-PORTVERSION=	0.4.p3
>+PORTVERSION=	0.7.2
> CATEGORIES=	sysutils
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=lineak
>-DISTNAME=	${PORTNAME}-0.4pre3
> 
> MAINTAINER=	kay_lehmann@web.de
> COMMENT=	Lineakd is a daemon which enables special keys on internet keyboards
>@@ -18,18 +17,35 @@
> LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext
> 
> USE_BISON=	yes
>+USE_AUTOCONF=	yes
> USE_GMAKE=	yes
> USE_XLIB=	yes
> GNU_CONFIGURE=	yes
> 
>-CFLAGS+=	-I${X11BASE}/include
>+CFLAGS+=	-I${X11BASE}/include -L${X11BASE}/lib
>+
>+.if defined(WITHOUT_XOSD)
>+CONFIGURE_ARGS+=--with-xosd=no
>+.else
>+LIB_DEPENDS+=	xosd.4:${PORTSDIR}/misc/xosd
>+.endif
> 
> .include <bsd.port.pre.mk>
> 
>-EXTRA_PATCHES=  ${FILESDIR}/extra-patch-lineakd.c-4
>+.if ${OSVERSION} < 500000
>+EXTRA_PATCHES=	${FILESDIR}/extra-patch-lineakd__soundctrl_cpp-4
>+.endif
>+
>+PORTDOCS=	INSTALL README TODO AUTHORS
> 
>-.if ${OSVERSION} >= 500000
>-EXTRA_PATCHES=	${FILESDIR}/extra-patch-lineakd.c-5
>+post-install:
>+.if !defined(NOPORTDOCS)
>+	@${MKDIR} ${DOCSDIR}
>+.for i in ${PORTDOCS}
>+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
>+.endfor
> .endif
>+	@${MKDIR} ${EXAMPLESDIR}
>+	${INSTALL_DATA} ${WRKSRC}/lineakd.conf.example ${EXAMPLESDIR}
> 
> .include <bsd.port.post.mk>
>diff -urN lineakd.old/distinfo lineakd/distinfo
>--- lineakd.old/distinfo	Mon Sep 29 16:32:13 2003
>+++ lineakd/distinfo	Wed Nov 12 15:58:19 2003
>@@ -1 +1 @@
>-MD5 (lineakd-0.4pre3.tar.gz) = 4606ec63a8af63aa9086395f9be42cba
>+MD5 (lineakd-0.7.2.tar.gz) = 986b947ce4f6e3dfa60fd66b4d26ea18
>diff -urN lineakd.old/files/extra-patch-lineakd.c-4 lineakd/files/extra-patch-lineakd.c-4
>--- lineakd.old/files/extra-patch-lineakd.c-4	Mon Sep 29 16:32:13 2003
>+++ lineakd/files/extra-patch-lineakd.c-4	Thu Jan  1 01:00:00 1970
>@@ -1,68 +0,0 @@
>---- src/lineakd.c.orig	Fri Sep  6 02:50:29 2002
>-+++ src/lineakd.c	Tue May 13 10:53:21 2003
>-@@ -57,18 +57,19 @@
>- #endif
>- #include <fcntl.h>
>- #include <sys/ioctl.h>
>--#include <linux/cdrom.h> /* linux specific?!! */
>- 
>- extern int mkdir(); /* in linux/fs.h ... other platforms!? */
>- 
>- #if defined (__FreeBSD__)
>- # include <machine/soundcard.h>
>-+# include <sys/cdio.h>
>- #else
>- # if defined (__NetBSD__) || defined (__OpenBSD__)
>- #  include <soundcard.h>          /* OSS emulation */
>- #  undef ioctl
>- # else
>- /* BSDI, Linux, Solaris */
>-+#  include <linux/cdrom.h> /* linux specific?!! */
>- #  include <sys/soundcard.h>
>- # endif
>- #endif
>-@@ -100,7 +101,7 @@
>-   signal(SIGABRT, signalexit);
>-   signal(SIGINT, signalexit);
>-   /* and one so we won't have to wait() for child processes ;) */
>--  signal(SIGCLD, SIG_IGN);
>-+  signal(SIGCHLD, SIG_IGN);
>-   /* and for a rehash when we catch SIGHUP */
>-   signal(SIGHUP,signalHUP);
>-   
>-@@ -598,12 +599,12 @@
>- 	/* try to open the device .. */
>-     if ( (fp = open(cdromdev, O_RDONLY | O_NONBLOCK)) != -1 ) {
>- 	  /* tell the drive to diable auto-eject */
>--	  if ( (ioctl(fp, CDROMEJECT_SW, 0)) == -1 )
>--        printf("... oops! error during CD-ROM init\n");
>--	  close(fp);
>--	} else {
>-+       if ( (ioctl(fp, CDIOCPREVENT)) == -1 )
>-+       printf("... oops! error during CD-ROM init\n");
>-+	 close(fp);
>-+         } else {
>- 	  printf("... oops! unable to open the CD-ROM device \"%s\" (CD-ROM init)\n",cdromdev);
>--	}
>-+	  }
>-   } else {
>- 	printf("no CD-ROM device configured! (CD-ROM init)\n");
>-   }
>-@@ -618,7 +619,7 @@
>-     if ( (fp = open(cdromdev, O_RDONLY | O_NONBLOCK)) != -1 ) {
>- 	  if (!cdromstatus) { /* assumed closed */
>- 		/* enable the drives software eject */
>--		if ( (ioctl(fp, CDROMEJECT_SW, 1)) == -1 )
>-+		if ( (ioctl(fp, CDIOCALLOW)) == -1 )
>-           printf("... oops! error enabling CD-ROM SW eject\n");
>- 		/* eject the cdrom tray */
>- 		if (verbosemode) printf("... ejecting the CD-ROM tray\n");
>-@@ -628,7 +629,7 @@
>- 		  cdromstatus = !cdromstatus;
>- 	  } else { /* assumed open */
>-         /* disable the drives software eject again.. */
>--        if ( (ioctl(fp, CDROMEJECT_SW, 0)) == -1 )
>-+        if ( (ioctl(fp, CDIOCPREVENT)) == -1 )
>-           printf("... oops! error disabling CD-ROM SW eject\n");
>- 		/* close the cdrom tray */
>- 		if (verbosemode) printf("... closing the CD-ROM tray\n");
>diff -urN lineakd.old/files/extra-patch-lineakd.c-5 lineakd/files/extra-patch-lineakd.c-5
>--- lineakd.old/files/extra-patch-lineakd.c-5	Mon Sep 29 16:32:13 2003
>+++ lineakd/files/extra-patch-lineakd.c-5	Thu Jan  1 01:00:00 1970
>@@ -1,69 +0,0 @@
>---- src/lineakd.c.orig	Fri Sep  6 02:50:29 2002
>-+++ src/lineakd.c	Sat May 24 18:01:00 2003
>-@@ -57,18 +57,19 @@
>- #endif
>- #include <fcntl.h>
>- #include <sys/ioctl.h>
>--#include <linux/cdrom.h> /* linux specific?!! */
>- 
>- extern int mkdir(); /* in linux/fs.h ... other platforms!? */
>- 
>- #if defined (__FreeBSD__)
>--# include <machine/soundcard.h>
>-+# include <sys/soundcard.h>
>-+# include <sys/cdio.h>
>- #else
>- # if defined (__NetBSD__) || defined (__OpenBSD__)
>- #  include <soundcard.h>          /* OSS emulation */
>- #  undef ioctl
>- # else
>- /* BSDI, Linux, Solaris */
>-+#  include <linux/cdrom.h> /* linux specific?!! */
>- #  include <sys/soundcard.h>
>- # endif
>- #endif
>-@@ -100,7 +101,7 @@
>-   signal(SIGABRT, signalexit);
>-   signal(SIGINT, signalexit);
>-   /* and one so we won't have to wait() for child processes ;) */
>--  signal(SIGCLD, SIG_IGN);
>-+  signal(SIGCHLD, SIG_IGN);
>-   /* and for a rehash when we catch SIGHUP */
>-   signal(SIGHUP,signalHUP);
>-   
>-@@ -598,12 +599,12 @@
>- 	/* try to open the device .. */
>-     if ( (fp = open(cdromdev, O_RDONLY | O_NONBLOCK)) != -1 ) {
>- 	  /* tell the drive to diable auto-eject */
>--	  if ( (ioctl(fp, CDROMEJECT_SW, 0)) == -1 )
>--        printf("... oops! error during CD-ROM init\n");
>--	  close(fp);
>--	} else {
>-+       if ( (ioctl(fp, CDIOCPREVENT)) == -1 )
>-+       printf("... oops! error during CD-ROM init\n");
>-+	 close(fp);
>-+         } else {
>- 	  printf("... oops! unable to open the CD-ROM device \"%s\" (CD-ROM init)\n",cdromdev);
>--	}
>-+	  }
>-   } else {
>- 	printf("no CD-ROM device configured! (CD-ROM init)\n");
>-   }
>-@@ -618,7 +619,7 @@
>-     if ( (fp = open(cdromdev, O_RDONLY | O_NONBLOCK)) != -1 ) {
>- 	  if (!cdromstatus) { /* assumed closed */
>- 		/* enable the drives software eject */
>--		if ( (ioctl(fp, CDROMEJECT_SW, 1)) == -1 )
>-+		if ( (ioctl(fp, CDIOCALLOW)) == -1 )
>-           printf("... oops! error enabling CD-ROM SW eject\n");
>- 		/* eject the cdrom tray */
>- 		if (verbosemode) printf("... ejecting the CD-ROM tray\n");
>-@@ -628,7 +629,7 @@
>- 		  cdromstatus = !cdromstatus;
>- 	  } else { /* assumed open */
>-         /* disable the drives software eject again.. */
>--        if ( (ioctl(fp, CDROMEJECT_SW, 0)) == -1 )
>-+        if ( (ioctl(fp, CDIOCPREVENT)) == -1 )
>-           printf("... oops! error disabling CD-ROM SW eject\n");
>- 		/* close the cdrom tray */
>- 		if (verbosemode) printf("... closing the CD-ROM tray\n");
>diff -urN lineakd.old/files/patch-aa lineakd/files/patch-aa
>--- lineakd.old/files/patch-aa	Mon Sep 29 16:32:13 2003
>+++ lineakd/files/patch-aa	Wed Nov 12 15:58:19 2003
>@@ -1,15 +1,13 @@
>---- src/lineakd.h.orig	Wed Aug 28 04:43:19 2002
>-+++ src/lineakd.h	Tue May 13 10:56:23 2003
>-@@ -127,6 +127,12 @@
>- #define VOLMUTE_VALUE 0
>- #define MAX_VOLUME 100
>- 
>-+/* we need this for freebsd */
>-+#if defined (__FreeBSD__)
>-+#define CDROMEJECT	CDIOCEJECT	/*_IO('c', 107)*/
>+--- lineakd/cdromctrl.cpp.orig	Wed Nov 12 10:08:14 2003
>++++ lineakd/cdromctrl.cpp	Wed Nov 12 10:08:58 2003
>+@@ -23,8 +23,8 @@
>+ #include <sys/ioctl.h>
>+ #if defined (__FreeBSD__)
>+ 	# include <sys/cdio.h>
>+-	#define CDROMEJECT     CDIOCEJECT      /*_IO('c', 107)*/
>+-	#define CDROMCLOSETRAY  CDIOCCLOSE
>++#define CDROMEJECT  CDIOCEJECT
> +#define CDROMCLOSETRAY  CDIOCCLOSE
>-+#endif
>-+
>- /* we might need this .. oss emulation under BSD */
>- #if defined (__NetBSD__) || defined (__OpenBSD__)
>- #define SOUND_IOCTL(a,b,c)      _oss_ioctl(a,b,c)
>+ #else
>+ 	#include <linux/cdrom.h> /* linux specific?!! */
>+ #endif
>diff -urN lineakd.old/files/patch-cc lineakd/files/patch-cc
>--- lineakd.old/files/patch-cc	Mon Sep 29 16:32:13 2003
>+++ lineakd/files/patch-cc	Thu Jan  1 01:00:00 1970
>@@ -1,16 +0,0 @@
>---- intl/dcigettext.c.orig	Sat Jun  8 21:56:27 2002
>-+++ intl/dcigettext.c	Tue May 13 10:56:23 2003
>-@@ -58,11 +58,11 @@
>- #include <stdlib.h>
>- 
>- #include <string.h>
>--#if !HAVE_STRCHR && !defined _LIBC
>-+/*#if !HAVE_STRCHR && !defined _LIBC
>- # ifndef strchr
>- #  define strchr index
>- # endif
>--#endif
>-+#endif*/
>- 
>- #if defined HAVE_UNISTD_H || defined _LIBC
>- # include <unistd.h>
>diff -urN lineakd.old/files/patch-dd lineakd/files/patch-dd
>--- lineakd.old/files/patch-dd	Mon Sep 29 16:32:13 2003
>+++ lineakd/files/patch-dd	Thu Jan  1 01:00:00 1970
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	Thu May 15 16:05:33 2003
>-+++ Makefile.in	Thu May 15 16:06:13 2003
>-@@ -112,7 +112,7 @@
>- 
>- SUBDIRS = intl po  src 
>- 
>--lineakddocdir = ${prefix}/doc/lineakd
>-+lineakddocdir = ${prefix}/share/doc/lineakd
>- lineakddoc_DATA = \
>- 	README\
>- 	COPYING\
>diff -urN lineakd.old/files/patch-ee lineakd/files/patch-ee
>--- lineakd.old/files/patch-ee	Mon Sep 29 16:32:13 2003
>+++ lineakd/files/patch-ee	Thu Jan  1 01:00:00 1970
>@@ -1,28 +0,0 @@
>---- Makefile.orig	Thu May 15 16:09:02 2003
>-+++ Makefile	Thu May 15 16:10:10 2003
>-@@ -83,14 +83,14 @@
>- LTLIBINTL = 
>- MKINSTALLDIRS = ./mkinstalldirs
>- NO_PREFIX_PACKAGE_DATA_DIR = share/lineakd
>--NO_PREFIX_PACKAGE_DOC_DIR = doc/lineakd
>-+NO_PREFIX_PACKAGE_DOC_DIR = share/doc/lineakd
>- NO_PREFIX_PACKAGE_HELP_DIR = share/lineakd/help
>- NO_PREFIX_PACKAGE_MENU_DIR = share/lineakd
>- NO_PREFIX_PACKAGE_PIXMAPS_DIR = share/lineakd/pixmaps
>- OBJEXT = o
>- PACKAGE = lineakd
>- PACKAGE_DATA_DIR = /usr/local/share/lineakd
>--PACKAGE_DOC_DIR = /usr/local/doc/lineakd
>-+PACKAGE_DOC_DIR = /usr/local/share/doc/lineakd
>- PACKAGE_HELP_DIR = /usr/local/share/lineakd/help
>- PACKAGE_MENU_DIR = /usr/local/share/lineakd
>- PACKAGE_PIXMAPS_DIR = /usr/local/share/lineakd/pixmaps
>-@@ -112,7 +112,7 @@
>- 
>- SUBDIRS = intl po  src 
>- 
>--lineakddocdir = ${prefix}/doc/lineakd
>-+lineakddocdir = ${prefix}/share/doc/lineakd
>- lineakddoc_DATA = \
>- 	README\
>- 	COPYING\
>diff -urN lineakd.old/pkg-plist lineakd/pkg-plist
>--- lineakd.old/pkg-plist	Mon Sep 29 16:32:13 2003
>+++ lineakd/pkg-plist	Wed Nov 12 15:58:19 2003
>@@ -1,13 +1,3 @@
> bin/lineakd
> etc/lineakkb.def
>-lib/charset.alias
>-share/locale/locale.alias
>-share/doc/lineakd/README
>-share/doc/lineakd/COPYING
>-share/doc/lineakd/AUTHORS
>-share/doc/lineakd/ChangeLog
>-share/doc/lineakd/INSTALL
>-share/doc/lineakd/NEWS
>-share/doc/lineakd/TODO
>-share/doc/lineakd/ABOUT-NLS
>-@dirrm share/doc/lineakd
>+%%EXAMPLESDIR%%/lineakd.conf.example

Actions: View | Diff

Attachments on bug 59212: 37124 | 37125 | 37126 | 37127