From owner-svn-ports-all@freebsd.org  Thu Jan  7 14:44:10 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0C6DEA652EC;
 Thu,  7 Jan 2016 14:44:10 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B7F141386;
 Thu,  7 Jan 2016 14:44:09 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u07Ei8cP025190;
 Thu, 7 Jan 2016 14:44:08 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u07Ei889025188;
 Thu, 7 Jan 2016 14:44:08 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201601071444.u07Ei889025188@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 7 Jan 2016 14:44:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r405448 - in head/archivers/mtf: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jan 2016 14:44:10 -0000

Author: amdmi3
Date: Thu Jan  7 14:44:08 2016
New Revision: 405448
URL: https://svnweb.freebsd.org/changeset/ports/405448

Log:
  - Clarify LICENSE
  - Add LICENSE_FILE
  - Switch to options helpers
  - Regenerate patches with `make makepatch`

Modified:
  head/archivers/mtf/Makefile
  head/archivers/mtf/files/patch-mtfread.c

Modified: head/archivers/mtf/Makefile
==============================================================================
--- head/archivers/mtf/Makefile	Thu Jan  7 14:43:55 2016	(r405447)
+++ head/archivers/mtf/Makefile	Thu Jan  7 14:44:08 2016	(r405448)
@@ -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}
 

Modified: head/archivers/mtf/files/patch-mtfread.c
==============================================================================
--- head/archivers/mtf/files/patch-mtfread.c	Thu Jan  7 14:43:55 2016	(r405447)
+++ head/archivers/mtf/files/patch-mtfread.c	Thu Jan  7 14:44:08 2016	(r405448)
@@ -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];