- Fix build on >= 5.3

- Use gtar to extract tarball

PR:		ports/75011
Submitted by:	Mike Meyer (maintainer)

4 files changed, 68 insertions, 3 deletions

diff --git a/math/unixstat/Makefile b/math/unixstat/Makefile
index 34141f45517c..389046438a96 100644
--- a/math/unixstat/Makefile
+++ b/math/unixstat/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	unixstat
 PORTVERSION=	5.4
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	# must fetch manually
 DISTNAME=	stat
@@ -17,14 +18,22 @@ COMMENT=	A statistics package designed for use with the Unix shell
 
 RESTRICTED=	"License does not allow redistribution of binaries"
 
+.include <bsd.port.pre.mk>
+
+.if ( ${OSVERSION} < 500000 )
+EXTRACT_DEPENDS=gtar:${PORTSDIR}/archivers/gtar
+.endif
+
+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 \
 		manstat.1 oneway.1 pair.1 perm.1 probdist.1 rankind.1 \
 		rankrel.1 ranksort.1 regress.1 repeat.1 reverse.1 series.1 \
 		stats.1 transpose.1 ts.1 unixstat.1 validata.1
 
-.include <bsd.port.pre.mk>
-
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
 IGNORE="Gary Perlman requires that users agree to his license"\
 "before he will allow access to the distfile."\
diff --git a/math/unixstat/files/patch-Makefile b/math/unixstat/files/patch-Makefile
index 9bba6ccb7f40..9d621641d9b6 100644
--- a/math/unixstat/files/patch-Makefile
+++ b/math/unixstat/files/patch-Makefile
@@ -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 --git a/math/unixstat/files/patch-src b/math/unixstat/files/patch-src
new file mode 100644
index 000000000000..706524851cda
--- /dev/null
+++ b/math/unixstat/files/patch-src
@@ -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 --git a/math/unixstat/pkg-plist b/math/unixstat/pkg-plist
index 4061c805e7e1..da09dfad58b9 100644
--- a/math/unixstat/pkg-plist
+++ b/math/unixstat/pkg-plist
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
 bin/abut
 bin/anova
+bin/calc
 bin/colex
 bin/contab
 bin/desc