Update to 1.31

Rename patches to sensible names
Sync port with archivers/star

PR:		29092
Submitted by:	maintainer

9 files changed, 63 insertions, 38 deletions

diff --git a/sysutils/sdd/Makefile b/sysutils/sdd/Makefile
index 9baa530c4c22..1da6c8d454b1 100644
--- a/sysutils/sdd/Makefile
+++ b/sysutils/sdd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sdd
-PORTVERSION=	1.22
+PORTVERSION=	1.31
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/sdd/
 
@@ -18,14 +18,14 @@ MAN1=		sdd.1
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != i386 || ${CC} != cc
-do-configure:
-	@${CP} -f ${WRKSRC}/RULES/i386-freebsd-cc.rul \
-		${WRKSRC}/RULES/${ARCH}-freebsd-${CC}.rul
+.if ${MACHINE_ARCH} != "i386" || ${CC} != "cc"
+post-extract:
+	@${LN} -sf i386-freebsd-cc.rul \
+		${WRKSRC}/RULES/${MACHINE_ARCH}-freebsd-${CC}.rul
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sdd/OBJ/${ARCH}-freebsd-${CC}/sdd \
+	${INSTALL_PROGRAM} ${WRKSRC}/sdd/OBJ/${MACHINE_ARCH}-freebsd-${CC}/sdd \
 		${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/sdd/sdd.1 ${PREFIX}/man/man1
 
diff --git a/sysutils/sdd/distinfo b/sysutils/sdd/distinfo
index eff928fc779a..faf8f07680ed 100644
--- a/sysutils/sdd/distinfo
+++ b/sysutils/sdd/distinfo
@@ -1 +1 @@
-MD5 (sdd-1.22.tar.gz) = 2046babedb375af6bc4ce11ba2db8b0a
+MD5 (sdd-1.31.tar.gz) = 430783f281d22e408c74ce1cb472a059
diff --git a/sysutils/sdd/files/patch-aa b/sysutils/sdd/files/patch-RULES_i386-openbsd-cc.rul
index 92db3e7bbaaa..cc97f666aec1 100644
--- a/sysutils/sdd/files/patch-aa
+++ b/sysutils/sdd/files/patch-RULES_i386-openbsd-cc.rul
@@ -1,5 +1,8 @@
---- RULES/i386-freebsd-cc.rul.orig	Sun Apr 27 01:46:00 1997
-+++ RULES/i386-freebsd-cc.rul	Thu May  6 02:12:08 1999
+
+$FreeBSD$
+
+--- RULES/i386-openbsd-cc.rul.orig	Sun Aug 29 16:09:56 1999
++++ RULES/i386-openbsd-cc.rul	Fri Jul 20 00:51:13 2001
 @@ -24,7 +24,7 @@
  ###########################################################################
  
@@ -34,6 +37,6 @@
  TSORT=		tsort
  
  RMDEP=		:
--MKDEP=		@echo "	==> MAKE DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
+-MKDEP=		@echo "	==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
 +MKDEP=		@echo "	==> MAKE DEPENDENCIES \"$@\""; $(RMDEP); ${CCOM} -M
  MKDEP_OUT=
diff --git a/sysutils/sdd/files/patch-ac b/sysutils/sdd/files/patch-ac
deleted file mode 100644
index b19d5ff6da92..000000000000
--- a/sysutils/sdd/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- include/standard.h.orig	Sun Sep 19 19:12:55 1999
-+++ include/standard.h	Sun Sep 19 19:14:12 1999
-@@ -23,6 +23,8 @@
- #ifndef _STANDARD_H
- #define _STANDARD_H
- 
-+#include <sys/types.h>
-+
- #ifdef	M68000
- #	ifndef	tos
- #		define	JOS	1
-@@ -182,7 +184,7 @@
- extern	int	wait_chld __PR((int));
- extern	int	geterrno __PR((void));
- extern	void	raisecond __PR((const char *, long));
--extern	int	snprintf __PR((char *, unsigned, const char *, ...));
-+extern	int	snprintf __PR((char *, size_t, const char *, ...));
- /*extern	int	sprintf __PR((char *, const char *, ...)); ist woanders falsch deklariert !!!*/
- extern	char	*strcatl __PR((char *, ...));
- extern	int	streql __PR((const char *, const char *));
diff --git a/sysutils/sdd/files/patch-conf_configure b/sysutils/sdd/files/patch-conf_configure
new file mode 100644
index 000000000000..0b2147b56206
--- /dev/null
+++ b/sysutils/sdd/files/patch-conf_configure
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- conf/configure.orig	Sun Jul  8 13:38:41 2001
++++ conf/configure	Fri Jul 20 00:51:13 2001
+@@ -6590,7 +6590,7 @@
+ fi
+ done
+ 
+-for ac_func in setreuid setresuid seteuid setuid
++for ac_func in seteuid setuid
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+ echo "configure:6597: checking for $ac_func" >&5
diff --git a/sysutils/sdd/files/patch-sdd_sdd.1 b/sysutils/sdd/files/patch-sdd_sdd.1
new file mode 100644
index 000000000000..dd3a23001e7a
--- /dev/null
+++ b/sysutils/sdd/files/patch-sdd_sdd.1
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- sdd/sdd.1.orig	Tue Jul 17 14:21:13 2001
++++ sdd/sdd.1	Fri Jul 20 00:51:14 2001
+@@ -346,7 +346,7 @@
+ This is done by using the
+ rcmd(3) interface to get a connection to a rmt(1) server.
+ .PP
+-.B Star
++.B Sdd
+ resets its effective uid back to the real user id immediately after setting up
+ the remote connection to the rmt server and before opening any other file.
+ .SH BUGS
diff --git a/sysutils/sdd/files/patch-ab b/sysutils/sdd/files/patch-sdd_sdd.c
index d6e676fd32b5..cf6bc51218fd 100644
--- a/sysutils/sdd/files/patch-ab
+++ b/sysutils/sdd/files/patch-sdd_sdd.c
@@ -1,6 +1,9 @@
---- sdd/sdd.c.orig	Wed May  5 17:54:07 1999
-+++ sdd/sdd.c	Wed May  5 17:56:34 1999
-@@ -1378,11 +1378,13 @@
+
+$FreeBSD$
+
+--- sdd/sdd.c.orig	Tue Jul 17 14:22:28 2001
++++ sdd/sdd.c	Fri Jul 20 00:51:14 2001
+@@ -1542,11 +1542,13 @@
  usage(ex)
  	int ex;
  {
@@ -16,7 +19,7 @@
  	if=name		  Read  input from name instead of stdin\n\
  	of=name		  Write output to name instead of stdout\n\
  	-inull		  Do not read input from file (use null char's)\n\
-@@ -1396,7 +1398,7 @@
+@@ -1560,7 +1562,7 @@
  	seek=#,skip=#	  Seek/skip # bytes on input/output before starting\n\
  	ivseek=#,ovseek=# Seek # bytes on input/output volumes before starting\n\
  ");
@@ -25,3 +28,14 @@
  	-notrunc	  Do not trunctate existing output file\n\
  	-pg		  Print a dot on each write to indicate progress\n\
  	-noerror	  Do not stop on error\n\
+@@ -1571,8 +1573,8 @@
+ 	-fill		  Fill each record with zeros up to obs\n\
+ 	-swab,-block,-unblock,-lcase,-ucase,-ascii,-ebcdic,-ibm\n\
+ ");
+-	error("\t-help\t\t  print this online help\n");
+-	error("\t-version\t  print version number\n");
++	fprintf(fp, "\t-help\t\t  print this online help\n");
++	fprintf(fp, "\t-version\t  print version number\n");
+ 	exit(ex);
+ }
+ 
diff --git a/sysutils/sdd/pkg-descr b/sysutils/sdd/pkg-descr
index ed5e80fa3964..4067c5eccdac 100644
--- a/sysutils/sdd/pkg-descr
+++ b/sysutils/sdd/pkg-descr
@@ -4,7 +4,9 @@ sdd is a replacement for dd(1).
   to the output block size (obs).
 - sdd does not share the design bugs of dd that cause fragments to be
   read from a pipe and filled up to input block size.
-- Statistics are much better readable as from 'dd'.
+- Statistics are much better readable than from 'dd'.
+- rmt support for if= & of=
+- Output file is sync'd before doing statistic report.
 - Timing available, -time option will print transfer speed
 - Timing & Statistics available at any time with SIGQUIT (^\)
 - Can seek on input and output
@@ -14,6 +16,3 @@ sdd is a replacement for dd(1).
   input block size
 - Debug printing
 - Progress printing
-
-Author: Joerg Schilling <schilling@fokus.gmd.de>
-Please mail bugs and suggestions to him.
diff --git a/sysutils/sdd/pkg-plist b/sysutils/sdd/pkg-plist
index 6f39f2fd4f0a..c381ddd16429 100644
--- a/sysutils/sdd/pkg-plist
+++ b/sysutils/sdd/pkg-plist
@@ -1 +1,2 @@
+@comment $FreeBSD$
 bin/sdd