From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 13 02:20:11 2003 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 9198F37B401 for ; Tue, 13 May 2003 02:20:11 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49B4E43FBF for ; Tue, 13 May 2003 02:20:10 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h4D9KAUp063087 for ; Tue, 13 May 2003 02:20:10 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h4D9KAnV063086; Tue, 13 May 2003 02:20:10 -0700 (PDT) Resent-Date: Tue, 13 May 2003 02:20:10 -0700 (PDT) Resent-Message-Id: <200305130920.h4D9KAnV063086@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 5BE3437B401 for ; Tue, 13 May 2003 02:14:35 -0700 (PDT) Received: from mail-in-01.arcor-online.net (mail-in-01.arcor-online.net [151.189.21.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BF2043FA3 for ; Tue, 13 May 2003 02:14:34 -0700 (PDT) (envelope-from kay_lehmann@web.de) Received: from bippes.wg-berlin.de (dsl-213-023-128-069.arcor-ip.net [213.23.128.69]) by mail-in-01.arcor-online.net (Postfix) with ESMTP id C9889128A5 for ; Tue, 13 May 2003 11:14:31 +0200 (CEST) Received: from bippes.wg-berlin.de (localhost.wg-berlin.de [127.0.0.1]) by bippes.wg-berlin.de (8.12.8/8.12.8) with ESMTP id h4D9H2ar045898 for ; Tue, 13 May 2003 11:17:02 +0200 (CEST) (envelope-from kay@bippes.wg-berlin.de) Received: (from kay@localhost) by bippes.wg-berlin.de (8.12.8/8.12.8/Submit) id h4D9H0R9045857; Tue, 13 May 2003 11:17:00 +0200 (CEST) (envelope-from kay) Message-Id: <200305130917.h4D9H0R9045857@bippes.wg-berlin.de> Date: Tue, 13 May 2003 11:17:00 +0200 (CEST) From: Kay Lehmann To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/52158: Update to pr:ports/52129 sysutils/lineakd: patches do not apply clean X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Kay Lehmann List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 May 2003 09:20:11 -0000 >Number: 52158 >Category: ports >Synopsis: Update to pr:ports/52129 sysutils/lineakd: patches do not apply clean >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: Tue May 13 02:20:09 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Kay Lehmann >Release: FreeBSD 4.8-RC i386 >Organization: >Environment: System: FreeBSD bippes.wg-berlin.de 4.8-RC FreeBSD 4.8-RC #24: Sat Mar 22 10:31:09 CET 2003 kay@bippes.wg-berlin.de:/usr/obj/usr/src/sys/bippes i386 >Description: The patches included in pr:ports/52129 didn't apply clean. It seems the code on the server has changed. So linenumbers have to be corrected. I include the complete shar-output to this pr. When this is wrong, please tell me how to do it next time (just the diffs?). >How-To-Repeat: >Fix: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # lineakd # lineakd/files # lineakd/files/patch-aa # lineakd/files/patch-bb # lineakd/files/patch-cc # lineakd/Makefile # lineakd/pkg-plist # lineakd/pkg-descr # lineakd/distinfo # echo c - lineakd mkdir -p lineakd > /dev/null 2>&1 echo c - lineakd/files mkdir -p lineakd/files > /dev/null 2>&1 echo x - lineakd/files/patch-aa sed 's/^X//' >lineakd/files/patch-aa << 'END-of-lineakd/files/patch-aa' X--- src/lineakd.h.orig Wed Aug 28 04:43:19 2002 X+++ src/lineakd.h Tue May 13 10:56:23 2003 X@@ -127,6 +127,12 @@ X #define VOLMUTE_VALUE 0 X #define MAX_VOLUME 100 X X+/* we need this for freebsd */ X+#if defined (__FreeBSD__) X+#define CDROMEJECT CDIOCEJECT /*_IO('c', 107)*/ X+#define CDROMCLOSETRAY CDIOCCLOSE X+#endif X+ X /* we might need this .. oss emulation under BSD */ X #if defined (__NetBSD__) || defined (__OpenBSD__) X #define SOUND_IOCTL(a,b,c) _oss_ioctl(a,b,c) END-of-lineakd/files/patch-aa echo x - lineakd/files/patch-bb sed 's/^X//' >lineakd/files/patch-bb << 'END-of-lineakd/files/patch-bb' X--- src/lineakd.c.orig Fri Sep 6 02:50:29 2002 X+++ src/lineakd.c Tue May 13 10:53:21 2003 X@@ -57,18 +57,19 @@ X #endif X #include X #include X-#include /* linux specific?!! */ X X extern int mkdir(); /* in linux/fs.h ... other platforms!? */ X X #if defined (__FreeBSD__) X # include X+# include X #else X # if defined (__NetBSD__) || defined (__OpenBSD__) X # include /* OSS emulation */ X # undef ioctl X # else X /* BSDI, Linux, Solaris */ X+# include /* linux specific?!! */ X # include X # endif X #endif X@@ -100,7 +101,7 @@ X signal(SIGABRT, signalexit); X signal(SIGINT, signalexit); X /* and one so we won't have to wait() for child processes ;) */ X- signal(SIGCLD, SIG_IGN); X+ signal(SIGCHLD, SIG_IGN); X /* and for a rehash when we catch SIGHUP */ X signal(SIGHUP,signalHUP); X X@@ -598,12 +599,12 @@ X /* try to open the device .. */ X if ( (fp = open(cdromdev, O_RDONLY | O_NONBLOCK)) != -1 ) { X /* tell the drive to diable auto-eject */ X- if ( (ioctl(fp, CDROMEJECT_SW, 0)) == -1 ) X- printf("... oops! error during CD-ROM init\n"); X- close(fp); X- } else { X+ if ( (ioctl(fp, CDIOCPREVENT)) == -1 ) X+ printf("... oops! error during CD-ROM init\n"); X+ close(fp); X+ } else { X printf("... oops! unable to open the CD-ROM device \"%s\" (CD-ROM init)\n",cdromdev); X- } X+ } X } else { X printf("no CD-ROM device configured! (CD-ROM init)\n"); X } X@@ -618,7 +619,7 @@ X if ( (fp = open(cdromdev, O_RDONLY | O_NONBLOCK)) != -1 ) { X if (!cdromstatus) { /* assumed closed */ X /* enable the drives software eject */ X- if ( (ioctl(fp, CDROMEJECT_SW, 1)) == -1 ) X+ if ( (ioctl(fp, CDIOCALLOW)) == -1 ) X printf("... oops! error enabling CD-ROM SW eject\n"); X /* eject the cdrom tray */ X if (verbosemode) printf("... ejecting the CD-ROM tray\n"); X@@ -628,7 +629,7 @@ X cdromstatus = !cdromstatus; X } else { /* assumed open */ X /* disable the drives software eject again.. */ X- if ( (ioctl(fp, CDROMEJECT_SW, 0)) == -1 ) X+ if ( (ioctl(fp, CDIOCPREVENT)) == -1 ) X printf("... oops! error disabling CD-ROM SW eject\n"); X /* close the cdrom tray */ X if (verbosemode) printf("... closing the CD-ROM tray\n"); END-of-lineakd/files/patch-bb echo x - lineakd/files/patch-cc sed 's/^X//' >lineakd/files/patch-cc << 'END-of-lineakd/files/patch-cc' X--- intl/dcigettext.c.orig Sat Jun 8 21:56:27 2002 X+++ intl/dcigettext.c Tue May 13 10:56:23 2003 X@@ -58,11 +58,11 @@ X #include X X #include X-#if !HAVE_STRCHR && !defined _LIBC X+/*#if !HAVE_STRCHR && !defined _LIBC X # ifndef strchr X # define strchr index X # endif X-#endif X+#endif*/ X X #if defined HAVE_UNISTD_H || defined _LIBC X # include END-of-lineakd/files/patch-cc echo x - lineakd/Makefile sed 's/^X//' >lineakd/Makefile << 'END-of-lineakd/Makefile' X# New ports collection makefile for: lineakd X# Date created: 03 June 2002 X# Whom: Kay Lehmann X# X# $FreeBSD: ports/sysutils/lineakd/Makefile,v 1.1 2002/05/15 22:37:50 cy Exp $ X# X XPORTNAME= lineakd XPORTVERSION= 0.4.p3 XCATEGORIES= sysutils XMASTER_SITES= ${MASTER_SITE_SOURCEFORGE} XMASTER_SITE_SUBDIR=lineak XDISTNAME= ${PORTNAME}-0.4pre3 X XMAINTAINER= kay_lehmann@web.de XCOMMENT= Lineakd is a daemon which enables special keys on internet keyboards. X XBUILD_DEPENDS= bison:${PORTSDIR}/devel/bison XLIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext X XUSE_GMAKE= yes XUSE_XLIB= yes XGNU_CONFIGURE= yes X XCFLAGS+= -I/usr/X11R6/include X X.include END-of-lineakd/Makefile echo x - lineakd/pkg-plist sed 's/^X//' >lineakd/pkg-plist << 'END-of-lineakd/pkg-plist' Xbin/lineakd Xetc/lineakkb.def Xlib/charset.alias Xshare/locale/locale.alias Xdoc/lineakd/README Xdoc/lineakd/COPYING Xdoc/lineakd/AUTHORS Xdoc/lineakd/ChangeLog Xdoc/lineakd/INSTALL Xdoc/lineakd/NEWS Xdoc/lineakd/TODO Xdoc/lineakd/ABOUT-NLS X@dirrm share/locale X@dirrm doc/lineakd X@dirrm doc END-of-lineakd/pkg-plist echo x - lineakd/pkg-descr sed 's/^X//' >lineakd/pkg-descr << 'END-of-lineakd/pkg-descr' XLinEAK is a utility designed to enable the use and configuration Xof those special keys on Internet, Easy Access and Multimedia Xkeyboards in Linux (and other unices, like now FreeBSD). X XWWW: http://lineak.sourceforge.net X X- Lehmann Xkay_lehmann@web.de END-of-lineakd/pkg-descr echo x - lineakd/distinfo sed 's/^X//' >lineakd/distinfo << 'END-of-lineakd/distinfo' XMD5 (lineakd-0.4pre3.tar.gz) = 4606ec63a8af63aa9086395f9be42cba END-of-lineakd/distinfo exit >Release-Note: >Audit-Trail: >Unformatted: