- Clarify LICENSE

- Add LICENSE_FILE
- Switch to options helpers
- Regenerate patches with `make makepatch`

2 files changed, 11 insertions, 7 deletions

diff --git a/archivers/mtf/Makefile b/archivers/mtf/Makefile
index 1fa7df8303d6..1f20b3c314d0 100644
--- a/archivers/mtf/Makefile
+++ b/archivers/mtf/Makefile
@@ -10,18 +10,22 @@ MASTER_SITES=	SUNSITE/system/backup
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unix reader for the Microsoft Tape Format used by NT Backup
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		tar:tgz
 ALL_TARGET=	# empty
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
+
 PLIST_FILES=	bin/mtf
 PORTDOCS=	README
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mtf ${STAGEDIR}${PREFIX}/bin
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
diff --git a/archivers/mtf/files/patch-mtfread.c b/archivers/mtf/files/patch-mtfread.c
index b31776f69f46..3a3e079c6798 100644
--- a/archivers/mtf/files/patch-mtfread.c
+++ b/archivers/mtf/files/patch-mtfread.c
@@ -1,6 +1,6 @@
---- mtfread.c.orig	Wed Sep 13 23:14:33 2000
-+++ mtfread.c	Wed Jun 26 14:28:48 2002
-@@ -42,7 +42,11 @@
+--- mtfread.c.orig	2000-09-13 15:14:33 UTC
++++ mtfread.c
+@@ -42,7 +42,11 @@ See mtf.c for version history, contribut
  #include <limits.h>
  #include <sys/stat.h>
  #include <sys/fcntl.h>
@@ -12,7 +12,7 @@
  #include <utime.h>
  #include <unistd.h>
  #include <time.h>
-@@ -363,7 +367,7 @@
+@@ -363,7 +367,7 @@ INT32 readTapeBlock(void)
  	{
  		stream = (MTF_STREAM_HDR*) ((char*) tape + dbHdr->off);
  		result = skipToNextBlock();
@@ -21,7 +21,7 @@
  		{
  			fprintf(stderr, "Error traversing to end of descriptor block!\n");
  			return(-1);
-@@ -671,7 +675,8 @@
+@@ -671,7 +675,8 @@ INT32 readFileBlock(void)
  	INT32 result;
  	char *ptr, *ptr2, filePath[MAXPATHLEN + 1], fullPath[MAXPATHLEN + 1];
  	char tmpPath[MAXPATHLEN + 1];