7 files changed, 33 insertions, 36 deletions

diff --git a/archivers/tardy/Makefile b/archivers/tardy/Makefile
index 73e74370980d..c3e5d2d26f35 100644
--- a/archivers/tardy/Makefile
+++ b/archivers/tardy/Makefile
@@ -7,17 +7,24 @@
 #
 
 PORTNAME=	tardy
-PORTVERSION=	1.11
+PORTVERSION=	1.12
 CATEGORIES=	archivers
-MASTER_SITES=	http://www.canb.auug.org.au/~millerp/
+MASTER_SITES=	http://tardy.sourceforge.net/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ehaupt@critical.ch
 COMMENT=	Manipulate the file headers in tar archive files in various ways
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-MAN1=	tardy.1
+MAN1=		tardy.1
 PLIST_FILES=	bin/tardy
 
+post-patch:
+.for var in CFLAGS LDFLAGS
+	@${REINPLACE_CMD} -e 's|^\(${var}\)\ =\ \(.*\)|\1 ?= \2|' \
+		${WRKSRC}/Makefile.in
+.endfor
+
 .include <bsd.port.mk>
diff --git a/archivers/tardy/distinfo b/archivers/tardy/distinfo
index 3d2a17c08861..84f420f85a74 100644
--- a/archivers/tardy/distinfo
+++ b/archivers/tardy/distinfo
@@ -1,2 +1,2 @@
-MD5 (tardy-1.11.tar.gz) = de9d9c6d8634589c0e6567b70054a0a6
-SIZE (tardy-1.11.tar.gz) = 163320
+MD5 (tardy-1.12.tar.gz) = 7cc18880df66f8e2693e3df210006b6c
+SIZE (tardy-1.12.tar.gz) = 185481
diff --git a/archivers/tardy/files/patch-common_error.cc b/archivers/tardy/files/patch-common_error.cc
new file mode 100644
index 000000000000..84d69b3bec67
--- /dev/null
+++ b/archivers/tardy/files/patch-common_error.cc
@@ -0,0 +1,10 @@
+--- common/error.cc.orig	Fri Jun 24 08:58:42 2005
++++ common/error.cc	Fri Jun 24 08:59:00 2005
+@@ -23,6 +23,7 @@
+ #include <ac/assert.h>
+ #include <ac/ctype.h>
+ #include <ac/errno.h>
++#include <sys/types.h>
+ #include <ac/grp.h>
+ #include <ac/pwd.h>
+ #include <ac/stdarg.h>
diff --git a/archivers/tardy/files/patch-common_tar_output_filter_gzip.cc b/archivers/tardy/files/patch-common_tar_output_filter_gzip.cc
new file mode 100644
index 000000000000..3ec9a027f607
--- /dev/null
+++ b/archivers/tardy/files/patch-common_tar_output_filter_gzip.cc
@@ -0,0 +1,10 @@
+--- common/tar/output/filter/gzip.cc.orig	Fri Jun 24 09:17:36 2005
++++ common/tar/output/filter/gzip.cc	Fri Jun 24 09:17:57 2005
+@@ -26,6 +26,7 @@
+ #include <ac/stdlib.h>
+ #include <ac/string.h>
+ #include <tar/output/filter/gzip.h>
++#include <unistd.h>
+ 
+ #ifndef Z_BUFSIZE
+ #ifdef MAXSEG_64K
diff --git a/archivers/tardy/files/patch-error.cc b/archivers/tardy/files/patch-error.cc
deleted file mode 100644
index f4da6594060f..000000000000
--- a/archivers/tardy/files/patch-error.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- common/error.cc.orig	Tue Jan 14 00:59:18 2003
-+++ common/error.cc	Tue Jan 14 00:59:40 2003
-@@ -28,6 +28,7 @@
- #include <ac/stdlib.h>
- #include <ac/string.h>
- 
-+#include <sys/types.h>
- #include <grp.h>
- #include <pwd.h>
- #include <ac/unistd.h>
diff --git a/archivers/tardy/files/patch-filename.cc b/archivers/tardy/files/patch-filename.cc
deleted file mode 100644
index c4aff0ffceed..000000000000
--- a/archivers/tardy/files/patch-filename.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- common/tar/input/filename.cc.orig	Tue Jan 14 01:00:31 2003
-+++ common/tar/input/filename.cc	Tue Jan 14 01:01:33 2003
-@@ -27,7 +27,6 @@
- #include <ac/unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <sys/sysmacros.h>
- #include <pwd.h>
- #include <grp.h>
- 
diff --git a/archivers/tardy/files/patch-tardy.cc b/archivers/tardy/files/patch-tardy.cc
deleted file mode 100644
index 4d12793c1f01..000000000000
--- a/archivers/tardy/files/patch-tardy.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- tardy/tardy.cc.orig	Tue Jan 14 00:58:28 2003
-+++ tardy/tardy.cc	Tue Jan 14 00:58:44 2003
-@@ -22,6 +22,7 @@
- 
- #include <vector>
- #include <ac/stdio.h> /* need for grp.h on OSF/1 */
-+#include <sys/types.h>
- #include <grp.h>
- #include <pwd.h>
-