From owner-svn-ports-head@FreeBSD.ORG  Sat Nov 10 17:30:23 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9A488E2F;
 Sat, 10 Nov 2012 17:30:23 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5FCB88FC13;
 Sat, 10 Nov 2012 17:30:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAAHUN24068404;
 Sat, 10 Nov 2012 17:30:23 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAAHUN9q068402;
 Sat, 10 Nov 2012 17:30:23 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201211101730.qAAHUN9q068402@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Sat, 10 Nov 2012 17:30:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307296 - head/misc/xosd/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Nov 2012 17:30:23 -0000

Author: danfe
Date: Sat Nov 10 17:30:22 2012
New Revision: 307296
URL: http://svnweb.freebsd.org/changeset/ports/307296

Log:
  Forgot to actually commit patch rebase change.
  
  Feature safe:	yes

Modified:
  head/misc/xosd/files/extra-patch-msec-timeout

Modified: head/misc/xosd/files/extra-patch-msec-timeout
==============================================================================
--- head/misc/xosd/files/extra-patch-msec-timeout	Sat Nov 10 17:07:42 2012	(r307295)
+++ head/misc/xosd/files/extra-patch-msec-timeout	Sat Nov 10 17:30:22 2012	(r307296)
@@ -1,5 +1,5 @@
---- src/xosd.h.orig
-+++ src/xosd.h
+--- a/src/xosd.h
++++ b/src/xosd.h
 @@ -64,7 +64,7 @@ extern "C"
   *     font           X Logical Font Descriptor, see "xfontsel".
   *     colour         X colour, see "rgb.txt" that comes with your X11
@@ -18,8 +18,8 @@
   *
   * RETURNS
   *   0 on success
---- src/libxosd/xosd.c.orig
-+++ src/libxosd/xosd.c
+--- a/src/libxosd/xosd.c
++++ b/src/libxosd/xosd.c
 @@ -402,15 +402,13 @@ event_loop(void *osdv)
      }
      /* Calculate timeout delta or hide display. */
@@ -41,8 +41,8 @@
          tvp = &tv;
        } else {
          timerclear(&osd->timeout_start);
---- src/osd_cat.c.orig
-+++ src/osd_cat.c
+--- a/src/osd_cat.c
++++ b/src/osd_cat.c
 @@ -53,7 +53,7 @@ int percentage = 50;
  int outline_offset = 0;
  char *outline_colour = NULL;
@@ -52,8 +52,8 @@
  int forcewait = 0;
  xosd_pos pos = XOSD_top;
  int voffset = 0;
---- man/osd_cat.1.orig
-+++ man/osd_cat.1
+--- a/man/osd_cat.1
++++ b/man/osd_cat.1
 @@ -37,7 +37,7 @@ This option specifies the \fIFONT\fP to 
  This option specifies the \fICOLOR\fP to be used for displaying the text. The default is \fBred\fP. 
  .TP
@@ -63,8 +63,8 @@
  .TP
  \fB\-l\fP, \fB\-\-lines\fP=\fILINES\fP
  This option specifies the number of \fILINES\fP to scroll the display over. The default is \fB5\fP.
---- src/xmms_plugin/xmms_osd.c.orig
-+++ src/xmms_plugin/xmms_osd.c
+--- a/src/xmms_plugin/xmms_osd.c
++++ b/src/xmms_plugin/xmms_osd.c
 @@ -260,7 +260,7 @@ apply_config(void)
        DEBUG("invalid font %s", font);