From lizard@informatik.unibw-muenchen.de  Sun May 12 03:30:38 2002
Return-Path: <lizard@informatik.unibw-muenchen.de>
Received: from gatesrv.RZ.UniBw-Muenchen.de (gatesrv.RZ.UniBw-Muenchen.de [137.193.11.27])
	by hub.freebsd.org (Postfix) with ESMTP id 3F4EC37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 12 May 2002 03:30:22 -0700 (PDT)
Received: from nemesis.informatik.unibw-muenchen.de (nemesis.Informatik.UniBw-Muenchen.de [137.193.60.30])
	by gatesrv.RZ.UniBw-Muenchen.de (8.11.2/8.11.2) with ESMTP id g4CA03t16019
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 12 May 2002 12:00:04 +0200 (MEST)
Received: from localhost (localhost.informatik.unibw-muenchen.de [127.0.0.1])
	by nemesis.informatik.unibw-muenchen.de (Postfix) with ESMTP id 13F4F5A548
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 12 May 2002 12:00:02 +0200 (CEST)
Received: by nemesis.informatik.unibw-muenchen.de (Postfix, from userid 1001)
	id A0C9A5A547; Sun, 12 May 2002 12:00:00 +0200 (CEST)
Message-Id: <20020512100000.A0C9A5A547@nemesis.informatik.unibw-muenchen.de>
Date: Sun, 12 May 2002 12:00:00 +0200 (CEST)
From: Oliver Braun <obraun@informatik.unibw-muenchen.de>
Reply-To:
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Fix build on -current: x11-toolkits/xview --- bento error
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         37987
>Category:       ports
>Synopsis:       Fix build on -current: x11-toolkits/xview --- bento error
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 12 03:40:01 PDT 2002
>Closed-Date:    Wed May 15 13:05:08 PDT 2002
>Last-Modified:  Wed May 15 13:05:08 PDT 2002
>Originator:     Oliver Braun
>Release:        FreeBSD 4.6-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD nemesis.informatik.unibw-muenchen.de 4.6-PRERELEASE FreeBSD 4.6-PRERELEASE #0: Thu May 2 11:59:09 CEST 2002 root@nemesis.informatik.unibw-muenchen.de:/usr/obj/usr/src/sys/NEMESIS_OB i386


>Description:

Fix declaration of sys_nerr.

Regards,
         Olli
>How-To-Repeat:
>Fix:

diff -ruN xview.old/files/patch-li xview/files/patch-li
--- xview.old/files/patch-li	Thu Jan 20 03:38:24 2000
+++ xview/files/patch-li	Sun May 12 11:43:18 2002
@@ -130,7 +130,7 @@
 *** 18,27 ****
   
   /* Unix system error variables */
-  extern int      sys_nerr;
+! extern int      sys_nerr;
   extern char    *sys_errlist[];
   extern int      errno;
   
@@ -141,7 +141,7 @@
 --- 19,32 ----
   
   /* Unix system error variables */
-  extern int      sys_nerr;
+! extern const int sys_nerr;
 + #if (defined(BSD) && (BSD >= 199306))
 + extern const char *const sys_errlist[];
 + #else
@@ -1847,15 +1847,26 @@
 *** ../old/xview3.2p1-X11R6/lib/libxview/textsw/es_file.c	Tue Jun 29 01:17:34 1993
 --- ./lib/libxview/textsw/es_file.c	Sun Nov 20 13:39:11 1994
 ***************
-*** 110,117 ****
---- 110,122 ----
+*** 109,117 ****
+  #include <xview_private/txt_18impl.h>
   
   
-  extern int      errno, sys_nerr;
-+ #if (defined(BSD) && (BSD >= 199306))
-+ extern const char *const sys_err_list[];
-+ extern off_t	lseek();
-+ #else
+! extern int      errno, sys_nerr;
+  extern char    *sys_errlist[];
+  extern long     lseek();
+  
+  static void update_read_buf();  /* update the read buf if overlaps write buf */
+  static Es_status es_file_commit();
+--- 109,123 ----
+  #include <xview_private/txt_18impl.h>
+  
+  
+! extern int      errno;
+! extern const sys_nerr;
+! #if (defined(BSD) && (BSD >= 199306))
+! extern const char *const sys_err_list[];
+! extern off_t  lseek();
+! #else
   extern char    *sys_errlist[];
   extern long     lseek();
 + #endif
@@ -2054,14 +2065,24 @@
 *** ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_file.c	Tue Jun 29 01:17:48 1993
 --- ./lib/libxview/textsw/txt_file.c	Sun Nov 20 13:39:12 1994
 ***************
-*** 51,57 ****
---- 51,61 ----
+*** 50,57 ****
+  #else
   extern char    *getwd();
   #endif /* SVR4 */
-  extern int      errno, sys_nerr;
-+ #if (defined(BSD) && (BSD >= 199306))
-+ extern const char *const sys_errlist[];
-+ #else
+! extern int      errno, sys_nerr;
+  extern char    *sys_errlist[];
+  
+  Pkg_private int textsw_change_directory();
+  Pkg_private void textsw_display(), textsw_display_view_margins();
+--- 50,62 ----
+  #else
+  extern char    *getwd();
+  #endif /* SVR4 */
+! extern int      errno;
+! extern const int sys_nerr;
+! #if (defined(BSD) && (BSD >= 199306))
+! extern const char *const sys_errlist[];
+! #else
   extern char    *sys_errlist[];
 + #endif
   
>Release-Note:
>Audit-Trail:

From: "David W. Chapman Jr." <dwcjr@inethouston.net>
To: freebsd-gnats-submit@FreeBSD.org,
	obraun@informatik.unibw-muenchen.de
Cc:  
Subject: Re: ports/37987: Fix build on -current: x11-toolkits/xview --- bento
 error
Date: Wed, 15 May 2002 09:07:45 -0500

 I get this after applying your patch, but I think its a problem with my 
 -current.
 
 DOS_HAS_LOCALE -DOS_HAS_MMAP                        -DDYNAMICLIB 
 -I../../../build/include  -I/usr/X11R6/include    -DCSRG_BASED -DFULL_R5 
 -I/include -DSUNOS41 -DX11R6 -DFUNCPROTO=15 -DNARROWPROTO 
 -DOS_HAS_LOCALE -DOS_HAS_MMAP                              -DDYNAMICLIB 
    -c gettext.c  -o shared/gettext.o
 gettext.c:16: conflicting types for `mmap'
 /usr/include/stdio.h:296: previous declaration of `mmap'
 gettext.c:454: warning: static declaration for `_gettext' follows non-static
 *** Error code 1
 

From: Oliver Braun <obraun@informatik.unibw-muenchen.de>
To: "David W. Chapman Jr." <dwcjr@inethouston.net>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/37987: Fix build on -current: x11-toolkits/xview --- bento error
Date: Wed, 15 May 2002 16:23:16 +0200

 * David W. Chapman Jr. <dwcjr@inethouston.net> [2002-05-15 16:08]:
 > I get this after applying your patch, but I think its a problem with my 
 > -current.
 
 > DOS_HAS_LOCALE -DOS_HAS_MMAP                        -DDYNAMICLIB 
 > -I../../../build/include  -I/usr/X11R6/include    -DCSRG_BASED -DFULL_R5 
 > -I/include -DSUNOS41 -DX11R6 -DFUNCPROTO=15 -DNARROWPROTO 
 > -DOS_HAS_LOCALE -DOS_HAS_MMAP                              -DDYNAMICLIB 
 >   -c gettext.c  -o shared/gettext.o
 > gettext.c:16: conflicting types for `mmap'
 > /usr/include/stdio.h:296: previous declaration of `mmap'
 > gettext.c:454: warning: static declaration for `_gettext' follows non-static
 > *** Error code 1
 
 I am going to retry this at home.
 
 Regards,
          Olli
 -- 
 Institute for Software Technology  &  Institute for Information Systems
 Department of Computing Science, Federal Armed Forces University Munich
 --------------------------- http://ist.unibw-muenchen.de/People/obraun/
State-Changed-From-To: open->closed 
State-Changed-By: dwcjr 
State-Changed-When: Wed May 15 13:03:52 PDT 2002 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=37963 
State-Changed-From-To: open->closed 
State-Changed-By: dwcjr 
State-Changed-When: Wed May 15 13:03:52 PDT 2002 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=37966 
State-Changed-From-To: open->closed 
State-Changed-By: dwcjr 
State-Changed-When: Wed May 15 13:03:52 PDT 2002 
State-Changed-Why:  
Committed, thanks! 

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