Index: head/archivers/mtf/Makefile =================================================================== --- head/archivers/mtf/Makefile (revision 405447) +++ head/archivers/mtf/Makefile (revision 405448) @@ -1,28 +1,32 @@ # Created by: Philippe Casidy # $FreeBSD$ PORTNAME= mtf PORTVERSION= 0.2.1 PORTREVISION= 1 CATEGORIES= archivers 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} .include Index: head/archivers/mtf/files/patch-mtfread.c =================================================================== --- head/archivers/mtf/files/patch-mtfread.c (revision 405447) +++ head/archivers/mtf/files/patch-mtfread.c (revision 405448) @@ -1,33 +1,33 @@ ---- 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 #include #include +#if defined(BSD) +#include +#else #include +#endif #include #include #include -@@ -363,7 +367,7 @@ +@@ -363,7 +367,7 @@ INT32 readTapeBlock(void) { stream = (MTF_STREAM_HDR*) ((char*) tape + dbHdr->off); result = skipToNextBlock(); - if (result != 1) + if (result != 0) /* skipToNextBlock returns 0 upon success -1 otherwise */ { 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]; - int i, output; + int i; + int output=-1; /* Initialized to avoid gcc warning */ struct tm tbuf; struct utimbuf utbuf; UINT32 threshold;