[119214] trunk/dports/games/larn

[ryandesign at macports.org]

Revision: 119214
          https://trac.macports.org/changeset/119214
Author:   ryandesign at macports.org
Date:     2014-04-20 12:31:11 -0700 (Sun, 20 Apr 2014)
Log Message:
-----------
larn: fix build failure "too few arguments to function call, expected 1, have 0" (#43364)

Modified Paths:
--------------
    trunk/dports/games/larn/Portfile
    trunk/dports/games/larn/files/patch-diag.c
    trunk/dports/games/larn/files/patch-io.c

Added Paths:
-----------
    trunk/dports/games/larn/files/patch-header.h

Modified: trunk/dports/games/larn/Portfile
===================================================================
--- trunk/dports/games/larn/Portfile	2014-04-20 19:15:54 UTC (rev 119213)
+++ trunk/dports/games/larn/Portfile	2014-04-20 19:31:11 UTC (rev 119214)
@@ -25,6 +25,7 @@
 patchfiles	patch-diag.c \
             patch-display.c \
             patch-global.c \
+            patch-header.h \
             patch-help.c \
             patch-io.c \
             patch-main.c \

Modified: trunk/dports/games/larn/files/patch-diag.c
===================================================================
--- trunk/dports/games/larn/files/patch-diag.c	2014-04-20 19:15:54 UTC (rev 119213)
+++ trunk/dports/games/larn/files/patch-diag.c	2014-04-20 19:31:11 UTC (rev 119214)
@@ -1,5 +1,5 @@
---- diag.c.orig	2002-05-30 17:04:11.000000000 -0400
-+++ diag.c	2006-04-17 22:24:21.000000000 -0400
+--- diag.c.orig	2002-05-30 16:04:11.000000000 -0500
++++ diag.c	2014-04-20 14:21:54.000000000 -0500
 @@ -31,10 +31,10 @@
  
  /*	for the character attributes	*/
@@ -99,3 +99,30 @@
  		nap(2000); c[GOLD]=c[BANKACCOUNT]=0;  died(-265); return;
  		}
  
+@@ -209,7 +209,7 @@
+ 		if (beenhere[k])
+ 			lrfill((char*)&cell[k*MAXX*MAXY],sizeof(struct cel)*MAXY*MAXX);
+ 
+-	lrfill((char*)&c[0],100*sizeof(long));	gtime = lrint();
++	lrfill((char*)&c[0],100*sizeof(long));	gtime = lrint_x();
+ 	level = c[CAVELEVEL] = lgetc();
+ 	playerx = lgetc();		playery = lgetc();
+ 	lrfill((char*)iven,26);		lrfill((char*)ivenarg,26*sizeof(short));
+@@ -240,7 +240,7 @@
+ 		}
+ 
+ 	time(&zzz);
+-	initialtime = zzz-lrint();
++	initialtime = zzz-lrint_x();
+ 	fstat(fd,&filetimes);	/*	get the creation and modification time of file	*/
+ 	lrfill((char*)&zzz,sizeof(long));	zzz += 6;
+ 	if (filetimes.st_ctime > zzz) fsorry();	/*	file create time	*/
+@@ -248,7 +248,7 @@
+ 	if (c[HP]<0) { died(284); return; }	/* died a post mortem death */
+ 
+ 	oldx = oldy = 0;
+-	i = lrint();  /* inode # */
++	i = lrint_x();  /* inode # */
+ 	if (i && (filetimes.st_ino!=i)) fsorry();
+ 	lrclose();
+ 	if (strcmp(fname,ckpfile) == 0)

Added: trunk/dports/games/larn/files/patch-header.h
===================================================================
--- trunk/dports/games/larn/files/patch-header.h	                        (rev 0)
+++ trunk/dports/games/larn/files/patch-header.h	2014-04-20 19:31:11 UTC (rev 119214)
@@ -0,0 +1,11 @@
+--- header.h.orig	2002-05-08 15:39:10.000000000 -0500
++++ header.h	2014-04-20 14:21:13.000000000 -0500
+@@ -360,7 +360,7 @@
+ 
+ char *fortune(),*lgetw(),*lgetl();
+ char *tmcapcnv();
+-long paytaxes(),lgetc(),lrint();
++long paytaxes(),lgetc(),lrint_x();
+ unsigned long readnum();
+ 
+ 	/* macro to create scroll #'s with probability of occurrence */


Property changes on: trunk/dports/games/larn/files/patch-header.h
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/dports/games/larn/files/patch-io.c
===================================================================
--- trunk/dports/games/larn/files/patch-io.c	2014-04-20 19:15:54 UTC (rev 119213)
+++ trunk/dports/games/larn/files/patch-io.c	2014-04-20 19:31:11 UTC (rev 119214)
@@ -1,5 +1,14 @@
---- io.c.orig	2006-04-17 04:21:08.000000000 -0400
-+++ io.c	2006-04-17 22:33:36.000000000 -0400
+--- io.c.orig	2002-05-08 15:39:10.000000000 -0500
++++ io.c	2014-04-20 14:21:54.000000000 -0500
+@@ -24,7 +24,7 @@
+  *	FILE INPUT ROUTINES
+  *
+  *	long lgetc()				read one character from input buffer
+- *	long lrint()				read one integer from input buffer
++ *	long lrint_x()				read one integer from input buffer
+  *	lrfill(address,number)		put input bytes into a buffer
+  *	char *lgetw()				get a whitespace ended word from input
+  *	char *lgetl()				get a \n or EOF ended line from input
 @@ -81,7 +81,7 @@
  #endif /* not SYSV */
  
@@ -37,6 +46,24 @@
  	fmt = va_arg(ap, char *);	/* pointer to format string */
  	if (lpnt >= lpend) lflush();
  	outb = lpnt;
+@@ -345,7 +344,7 @@
+     }
+ 
+ /*
+- *	long lrint()			Read one integer from input buffer
++ *	long lrint_x()			Read one integer from input buffer
+  *
+  *		+---------+---------+---------+---------+
+  *		|	high  |			|		  |	  low	|
+@@ -357,7 +356,7 @@
+  *	The save order is low order first, to high order (4 bytes total)
+  *	Returns the int read
+  */
+-long lrint()
++long lrint_x()
+ 	{
+ 	unsigned long i;
+ 	i  = 255 & lgetc();				i |= (255 & lgetc()) << 8;
 @@ -454,7 +453,7 @@
  	if (str==NULL) return(lfd=1);
  	if ((lfd=creat(str,0644)) < 0)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140420/6ec3929c/attachment.html>