ports/75011: [PATCH] math/unixstat port has rotten bits in it

[Mike Meyer]

>Number:         75011
>Category:       ports
>Synopsis:       [PATCH] math/unixstat port has rotten bits in it
>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:   Mon Dec 13 08:20:22 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Mike Meyer
>Release:        FreeBSD 5.3-RELEASE i386
>Organization:
Meyer Consulting
>Environment:
System: FreeBSD guru.mired.org 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Nov 5 04:19:18 UTC 2004 root at harlow.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386


>Description:

	The math/unixstat package has components that don't compile properly on
	5.3, as well as a tarball that causes bsdtar to throw up.

>How-To-Repeat:
	Try to install math/unixstat on a 5.3 system.
>Fix:
Aplly the attached patch to the unixstat port.
diff -Nru unixstat-orig/Makefile unixstat/Makefile
--- unixstat-orig/Makefile	Sun Dec 12 12:12:30 2004
+++ unixstat/Makefile	Sun Dec 12 23:18:08 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	unixstat
 PORTVERSION=	5.4
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	# must fetch manually
 DISTNAME=	stat
@@ -16,6 +17,10 @@
 COMMENT=	A statistics package designed for use with the Unix shell
 
 RESTRICTED=	"License does not allow redistribution of binaries"
+
+EXTRACT_CMD=	uncompress
+EXTRACT_BEFORE_ARGS=-c
+EXTRACT_AFTER_ARGS=| gtar -xf -
 
 MAN1=		abut.1 anova.1 calc.1 colex.1 contab.1 desc.1 dm.1 dprime.1 \
 		dsort.1 features.1 ff.1 fls.1 fpack.1 linex.1 maketrix.1 \
diff -Nru unixstat-orig/files/patch-Makefile unixstat/files/patch-Makefile
--- unixstat-orig/files/patch-Makefile	Sun Dec 12 12:12:30 2004
+++ unixstat/files/patch-Makefile	Sun Dec 12 23:01:34 2004
@@ -1,5 +1,5 @@
 --- src/makefile.orig	Tue Jun 22 18:00:21 1993
-+++ src/makefile	Thu Aug 23 15:57:48 2001
++++ src/makefile	Sun Dec 12 22:51:48 2004
 @@ -14,14 +14,13 @@
  ##########################################################################
  
diff -Nru unixstat-orig/files/patch-src unixstat/files/patch-src
--- unixstat-orig/files/patch-src	Wed Dec 31 18:00:00 1969
+++ unixstat/files/patch-src	Sun Dec 12 23:12:51 2004
@@ -0,0 +1,55 @@
+--- src/ff.c.orig	Sun Dec 12 22:56:48 2004
++++ src/ff.c	Sun Dec 12 22:59:17 2004
+@@ -911,7 +911,7 @@
+ 	
+ 	strcpy (numbuf, oldexpand (title, gpage, page, file));
+ 	if (Needfls)
+-		fls (file, numbuf, answer);
++		usfls (file, numbuf, answer);
+ 	else
+ 		strcpy (answer, numbuf);
+ 	return (answer);
+--- src/fls.c.orig	Sun Dec 12 22:59:31 2004
++++ src/fls.c	Sun Dec 12 23:00:12 2004
+@@ -183,7 +183,7 @@
+ statstdin (statptr)
+ struct	stat	*statptr;
+ 	{
+-	long 	clock, time ();
++	long 	clock ;
+ 	clock = time (0);
+ 	statptr->st_atime = clock;
+ 	statptr->st_mtime = clock;
+@@ -200,7 +200,7 @@
+ 
+ /*FUNCTION fls: formated listing of file */
+ Status
+-fls (file, format, bptr) /* put formatted file listing in buffer */
++usfls (file, format, bptr) /* put formatted file listing in buffer */
+ char	*file;           /* name of the file to print */
+ char	*format;         /* print format control string, like printf */
+ char	*bptr;           /* pointer to buffer in which to print stats */
+--- src/calc.c.orig	Sun Dec 12 23:08:23 2004
++++ src/calc.c	Sun Dec 12 23:11:21 2004
+@@ -1,4 +1,3 @@
+-extern char *malloc(), *realloc();
+ 
+ # line 2 "calc.y"
+ /*  Copyright 1981 Gary Perlman */
+@@ -79,7 +78,7 @@
+ double	eval (), Answer;
+ double	*Constant;
+ char	*getline ();
+-FILE	*Outfile = stdout;
++FILE	*Outfile;
+ 
+ # line 83 "calc.y"
+ typedef union 
+@@ -222,6 +221,7 @@
+ 	{
+ 	int 	i;
+ 	signal (SIGINT, SIG_IGN);
++	Outfile = stdout;
+ 	if (isatty (fileno (stdin)))
+ 		{
+ 		Interactive = 1;
diff -Nru unixstat-orig/pkg-plist unixstat/pkg-plist
--- unixstat-orig/pkg-plist	Sun Dec 12 12:12:30 2004
+++ unixstat/pkg-plist	Sun Dec 12 12:52:50 2004
@@ -1,6 +1,7 @@
 @comment $FreeBSD: ports/math/unixstat/pkg-plist,v 1.2 2004/10/12 08:14:08 sergei Exp $
 bin/abut
 bin/anova
+bin/calc
 bin/colex
 bin/contab
 bin/desc



>Release-Note:
>Audit-Trail:
>Unformatted: