Date: Sun, 02 Jan 2005 20:09:08 +0300 From: Roman Bogorodskiy <bogorodskiy@inbox.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/75724: [ maintainer ] russian/prawda: try to fix build on 6.x/i386 and 6.x/sparc64 Message-ID: <E1Cl9E3-0006HU-00.bogorodskiy-inbox-ru@mx1.mail.ru> Resent-Message-ID: <200501021710.j02HA8dt053169@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 75724
>Category: ports
>Synopsis: [ maintainer ] russian/prawda: try to fix build on 6.x/i386 and 6.x/sparc64
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 02 17:10:07 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Roman Bogorodskiy
>Release: FreeBSD 5.3-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD lame.novel.ru 5.3-RELEASE-p2 FreeBSD 5.3-RELEASE-p2 #3: Sat Dec 11 21:01:26 MSK 2004 root@lame.novel.ru:/usr/obj/usr/src/sys/MIRRORBOX i386
>Description:
Attemt to fix build on 6.x/i386 and 6.x/sparc64.
Added files:
files/patch-src-trans-slowo3.cpp
files/patch-src-trans-slowo3.h
>How-To-Repeat:
>Fix:
--- port.prawda.fix begins here ---
diff -ruN prawda.orig/files/patch-aa prawda/files/patch-aa
--- prawda.orig/files/patch-aa Sun Jan 2 19:39:28 2005
+++ prawda/files/patch-aa Sun Jan 2 19:52:40 2005
@@ -126,16 +126,6 @@
# include <stdlib.h>
# define Err_Memory -2
---- src/trans/slowo3.cpp.orig Wed Jul 28 19:36:02 2004
-+++ src/trans/slowo3.cpp Wed Jul 28 19:38:33 2004
-@@ -7,7 +7,6 @@
- /***************************************************************************/
-
- # include <stdio.h>
--# include <malloc.h>
- # include <string.h>
- # include <stdlib.h>
-
--- src/utils/kod.c.orig Wed Jul 28 19:36:02 2004
+++ src/utils/kod.c Wed Jul 28 19:54:22 2004
@@ -3,7 +3,6 @@
diff -ruN prawda.orig/files/patch-src-trans-slowo3.cpp prawda/files/patch-src-trans-slowo3.cpp
--- prawda.orig/files/patch-src-trans-slowo3.cpp Thu Jan 1 03:00:00 1970
+++ prawda/files/patch-src-trans-slowo3.cpp Sun Jan 2 19:59:31 2005
@@ -0,0 +1,24 @@
+--- src/trans/slowo3.cpp.orig Sat Jul 31 23:59:35 2004
++++ src/trans/slowo3.cpp Sun Jan 2 19:38:38 2005
+@@ -7,7 +7,6 @@
+ /***************************************************************************/
+
+ # include <stdio.h>
+-# include <malloc.h>
+ # include <string.h>
+ # include <stdlib.h>
+
+@@ -1516,13 +1515,6 @@
+ t_sTree * t_Slowo3 :: tree( long i_tree )
+ {
+ return &Tree[i_tree] ;
+-}
+-/***************************************************************************/
+-//
+-/***************************************************************************/
+-t_sStruct * t_Slowo3 :: sstruct( long i_struct )
+-{
+- return &Struct[i_struct] ;
+ }
+ /***************************************************************************/
+ // дать переводимую структуру
diff -ruN prawda.orig/files/patch-src-trans-slowo3.h prawda/files/patch-src-trans-slowo3.h
--- prawda.orig/files/patch-src-trans-slowo3.h Thu Jan 1 03:00:00 1970
+++ prawda/files/patch-src-trans-slowo3.h Sun Jan 2 19:59:40 2005
@@ -0,0 +1,11 @@
+--- src/trans/slowo3.h.orig Sun Jan 2 19:38:50 2005
++++ src/trans/slowo3.h Sun Jan 2 19:42:19 2005
+@@ -110,7 +110,7 @@
+ long n_record( void );
+ char is_atom( long i_record );
+ t_sTree *tree( long i_tree );
+- inline t_sStruct *sstruct( long i_struct );
++ inline t_sStruct *sstruct( long i_struct ) { return &Struct[i_struct]; };
+ t_sStruct *get_from( long i_slowo );
+ t_sStruct *get_to( long i_slowo, long i_slowo1=0 );
+ t_RelationList1 get_relation( long i_slowo, long i_variant );
--- port.prawda.fix ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1Cl9E3-0006HU-00.bogorodskiy-inbox-ru>