From bogorodskiy@inbox.ru  Mon Aug 23 06:11:12 2004
Return-Path: <bogorodskiy@inbox.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0821A16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 23 Aug 2004 06:11:12 +0000 (GMT)
Received: from mx2.mail.ru (mx2.mail.ru [194.67.23.122])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2767E43D2F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 23 Aug 2004 06:11:11 +0000 (GMT)
	(envelope-from bogorodskiy@inbox.ru)
Received: from [194.186.150.58] (port=59852 helo=inbox.ru)
	by mx2.mail.ru with esmtp 
	id 1Bz82v-0000RH-00
	for FreeBSD-gnats-submit@freebsd.org; Mon, 23 Aug 2004 10:11:09 +0400
Message-Id: <E1Bz82v-0000RH-00.bogorodskiy-inbox-ru@mx2.mail.ru>
Date: Mon, 23 Aug 2004 10:11:09 +0400
From: Roman Bogorodskiy <bogorodskiy@inbox.ru>
Reply-To: Roman Bogorodskiy <bogorodskiy@inbox.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [ patch ] sysutils/roottail: update to 1.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify: vs

>Number:         70844
>Category:       ports
>Synopsis:       [ patch ] sysutils/roottail: update to 1.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jedgar
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 23 06:20:10 GMT 2004
>Closed-Date:    Tue Nov 23 11:12:24 GMT 2004
>Last-Modified:  Tue Nov 23 11:12:24 GMT 2004
>Originator:     Roman Bogorodskiy
>Release:        FreeBSD 5.3-BETA1 i386
>Organization:
>Environment:
System: FreeBSD lame.novel.ru 5.3-BETA1 FreeBSD 5.3-BETA1 #0: Sat Aug 21 13:33:06 MSD 2004 root@lame.novel.ru:/usr/obj/usr/home/novel/current/src/sys/NOVEL i386


>Description:
	Update to 1.2. Remove patch-aa since roottail compiles with C89 compilers now.
	See project's page for changelog.
>How-To-Repeat:
>Fix:

diff -ruN roottail.orig/Makefile roottail/Makefile
--- roottail.orig/Makefile	Mon Aug 23 10:01:27 2004
+++ roottail/Makefile	Mon Aug 23 10:01:50 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	roottail
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.goof.com/pcg/marc/data/
 DISTNAME=	root-tail-${PORTVERSION}
diff -ruN roottail.orig/distinfo roottail/distinfo
--- roottail.orig/distinfo	Mon Aug 23 10:01:27 2004
+++ roottail/distinfo	Mon Aug 23 10:02:32 2004
@@ -1,2 +1,2 @@
-MD5 (root-tail-1.1.tar.gz) = adb925c2781892bb5dcbdf9d5e579032
-SIZE (root-tail-1.1.tar.gz) = 20124
+MD5 (root-tail-1.2.tar.gz) = 5a4b3c4c7ab3bed1f4575e9688aac5de
+SIZE (root-tail-1.2.tar.gz) = 20805
diff -ruN roottail.orig/files/patch-aa roottail/files/patch-aa
--- roottail.orig/files/patch-aa	Mon Aug 23 10:01:27 2004
+++ roottail/files/patch-aa	Thu Jan  1 03:00:00 1970
@@ -1,64 +0,0 @@
---- root-tail.c.orig	Thu Apr  8 21:58:28 2004
-+++ root-tail.c	Wed Jun 23 14:06:13 2004
-@@ -152,6 +152,7 @@
- void list_files (int);
- void force_reopen (int);
- void force_refresh (int);
-+void exit_now (int);
- void blank_window (int);
- 
- void InitWindow (void);
-@@ -198,6 +199,13 @@
- }
- 
- void
-+exit_now (int signal)
-+{
-+  fprintf (stderr, "Program exiting due to signal: %d\n", signal);
-+  exit(-1);
-+}
-+
-+void
- blank_window (int dummy)
- {
-   XClearArea (disp, root, win_x, win_y, width + MARGIN_OF_ERROR, height, False);
-@@ -655,11 +663,12 @@
- char *
- concat_line (char *p1, const char *p2)
- {
-+  int l1,l2;
-+  char *r;
-   assert(p2);
- 
--  int l1 = p1 ? strlen (p1) : 0;
--  int l2 = strlen (p2);
--  char *r;
-+  l1 = p1 ? strlen (p1) : 0;
-+  l2 = strlen (p2);
- 
-   if (p1)
-     r = xrealloc(p1, l1 + l2 + 1);
-@@ -925,6 +934,7 @@
-       int wrapped = 0;
-       char *break_p = NULL;
-       int width_at_break_p = 0;
-+      int prefix_len;
-       spaces = 0;
- 
-       if (opt_justify)
-@@ -992,7 +1002,6 @@
-       if (!wrapped)
-         break;
- 
--      int prefix_len;
- 
-       /* choose where to break the line */
-       if (opt_wordwrap && break_p && break_p != beg)
-@@ -1501,6 +1510,7 @@
-   install_signal (SIGHUP, force_reopen);
-   install_signal (SIGUSR1, list_files);
-   install_signal (SIGUSR2, force_refresh);
-+  install_signal (SIGSEGV, exit_now);
- 
-   if (opt_daemonize)
-     daemonize ();
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jedgar  
Responsible-Changed-By: krion 
Responsible-Changed-When: Mon Aug 23 07:49:31 GMT 2004 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=70844 
State-Changed-From-To: open->feedback 
State-Changed-By: vs 
State-Changed-When: Fri Nov 19 16:10:36 GMT 2004 
State-Changed-Why:  
Does not build on 4.10 

http://www.freebsd.org/cgi/query-pr.cgi?pr=70844 

From: "Volker Stolz" <vs@freebsd.org>
To: freebsd-gnats-submit@freebsd.org, bogorodskiy@inbox.ru
Cc:  
Subject: Re: ports/70844: [ patch ] sysutils/roottail: update to 1.2
Date: Fri, 19 Nov 2004 17:10:13 +0100

 Does not build on 4.10 (standard gcc2 vs. 3-issue):
 
 ===>  Building for roottail-1.2
 cc -O2 -pipe -g        -I/usr/X11R6/include    -DCSRG_BASED   
 -DFUNCPROTO=15 -DNARROWPROTO     -c root-tail.c
 root-tail.c: In function `find_root_window':
 root-tail.c:240: syntax error before `unused'
 root-tail.c:249: `type' undeclared (first use in this function)
 root-tail.c:249: (Each undeclared identifier is reported only once
 root-tail.c:249: for each function it appears in.)
 root-tail.c:249: `format' undeclared (first use in this function)
 root-tail.c:250: `nitems' undeclared (first use in this function)
 root-tail.c:250: `bytes_after_return' undeclared (first use in this  
 function)
 root-tail.c:251: `virtual_root_window' undeclared (first use in this  
 function)
 root-tail.c:254: `unused' undeclared (first use in this function)
 root-tail.c:254: `windows' undeclared (first use in this function)
 root-tail.c:254: `count' undeclared (first use in this function)
 *** Error code 1

From: Roman Bogorodskiy <bogorodskiy@inbox.ru>
To: Volker Stolz <vs@freebsd.org>
Cc: freebsd-gnats-submit@freebsd.org
Subject: Re: ports/70844: [ patch ] sysutils/roottail: update to 1.2
Date: Sat, 20 Nov 2004 19:10:33 +0300

 --7ZAtKRhVyVSsbBD2
 Content-Type: multipart/mixed; boundary="mYCpIKhGyMATD0i+"
 Content-Disposition: inline
 
 
 --mYCpIKhGyMATD0i+
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
  Volker wrote:
 
 > Does not build on 4.10 (standard gcc2 vs. 3-issue):
 >=20
 > =3D=3D=3D>  Building for roottail-1.2
 > cc -O2 -pipe -g        -I/usr/X11R6/include    -DCSRG_BASED  =20
 > -DFUNCPROTO=3D15 -DNARROWPROTO     -c root-tail.c
 > root-tail.c: In function `find_root_window':
 > root-tail.c:240: syntax error before `unused'
 > root-tail.c:249: `type' undeclared (first use in this function)
 > root-tail.c:249: (Each undeclared identifier is reported only once
 > root-tail.c:249: for each function it appears in.)
 > root-tail.c:249: `format' undeclared (first use in this function)
 > root-tail.c:250: `nitems' undeclared (first use in this function)
 > root-tail.c:250: `bytes_after_return' undeclared (first use in this =20
 > function)
 > root-tail.c:251: `virtual_root_window' undeclared (first use in this =20
 > function)
 > root-tail.c:254: `unused' undeclared (first use in this function)
 > root-tail.c:254: `windows' undeclared (first use in this function)
 > root-tail.c:254: `count' undeclared (first use in this function)
 > *** Error code 1
 
 It seems I have a patch for that. In C89 we should initialize variables
 in the beginning of the code segment.=20
 
 -Roman Bogorodskiy
 
 --mYCpIKhGyMATD0i+
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="patch-root-tail.c"
 Content-Transfer-Encoding: quoted-printable
 
 --- root-tail.c.orig	Fri Nov 19 20:56:03 2004
 +++ root-tail.c	Sat Nov 20 18:52:34 2004
 @@ -233,17 +233,18 @@
  {
    if (!root)
      {
 +			Window unused;
 +			Window *windows;
 +			unsigned int count;
 +
 +			Atom type;
 +			int format;
 +			unsigned long nitems, bytes_after_return;
 +			unsigned char *virtual_root_window;
 +		=09
        Atom SWM_VROOT =3D XInternAtom (display, "__SWM_VROOT", False);
        Atom NAUTILUS_DESKTOP_WINDOW_ID =3D XInternAtom (display, "NAUTILUS_=
 DESKTOP_WINDOW_ID", False);
        root =3D RootWindow (display, screen_number);
 -
 -      Window unused, *windows =3D 0;
 -      unsigned int count;
 -
 -      Atom type;
 -      int format;
 -      unsigned long nitems, bytes_after_return;
 -      unsigned char *virtual_root_window;
 =20
        if (XGetWindowProperty (display, root, NAUTILUS_DESKTOP_WINDOW_ID,
                                0, 1, False, XA_WINDOW, &type, &format,
 
 --mYCpIKhGyMATD0i+--
 
 --7ZAtKRhVyVSsbBD2
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (FreeBSD)
 
 iQCVAwUBQZ9seYB0WzgdqspGAQKS9AQAjnCF0NgA+Qs3X3nQyBsAULgUINgDffPA
 SMiM8W4dmxvqEzNc4TfcZq16EfF44qyyrsmZO23dYQBf2jquR940g3Dl1QfvVxaY
 cT9RaZbvsFjw3OJeLhWaUix9ZDZp5c4rMucP5uHZJhC6nkvJyvGOxnugqPIYpk4j
 sfL/vdbahAU=
 =AK+d
 -----END PGP SIGNATURE-----
 
 --7ZAtKRhVyVSsbBD2--
State-Changed-From-To: feedback->closed 
State-Changed-By: vs 
State-Changed-When: Tue Nov 23 11:12:11 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=70844 
>Unformatted:
