svn commit: r337019 - in branches/2014Q1/converters/ish: . files

[Mathieu Arnold]

Author: mat
Date: Fri Dec 20 14:50:04 2013
New Revision: 337019
URL: http://svnweb.freebsd.org/changeset/ports/337019

Log:
  MFH: r337009
  
  - Fix build with clang
  - Support staging
  
  PR:		ports/184856
  Submitted by:	KATO Tsuguru <tkato432 at yahoo.com>
  Approved by:	portmgr (implicit)

Added:
  branches/2014Q1/converters/ish/files/patch-mvol.c
     - copied unchanged from r337009, head/converters/ish/files/patch-mvol.c
Modified:
  branches/2014Q1/converters/ish/Makefile   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/converters/ish/Makefile
==============================================================================
--- branches/2014Q1/converters/ish/Makefile	Fri Dec 20 14:48:28 2013	(r337018)
+++ branches/2014Q1/converters/ish/Makefile	Fri Dec 20 14:50:04 2013	(r337019)
@@ -13,11 +13,11 @@ COMMENT=	Binary-to-text file-encoder
 
 MAKEFILE=	makefile
 MAKE_ARGS=	CFLAGS="${CFLAGS}" DEST=${PREFIX}/bin
-PLIST_FILES=	bin/ish
 ALL_TARGET=	ish
 
-NO_STAGE=	yes
+PLIST_FILES=	bin/ish
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ish ${STAGEDIR}${PREFIX}/bin)
 
 .include <bsd.port.mk>

Copied: branches/2014Q1/converters/ish/files/patch-mvol.c (from r337009, head/converters/ish/files/patch-mvol.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/converters/ish/files/patch-mvol.c	Fri Dec 20 14:50:04 2013	(r337019, copy of r337009, head/converters/ish/files/patch-mvol.c)
@@ -0,0 +1,27 @@
+--- mvol.c.orig
++++ mvol.c
+@@ -4,6 +4,7 @@
+ /*    930823    modified (aka)		 */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <fcntl.h>
+ #include <ctype.h>
+ #include <string.h>
+@@ -25,6 +26,8 @@
+ extern char   tname[];
+ extern int    delvol;
+ 
++void restore_done(char *, char *, long);
++
+ #define	ID    "ID block for multi volume ish file"
+ 
+ typedef    struct {
+@@ -208,6 +211,7 @@
+ 
+ #define    COPY_BUF    1024
+ 
++void
+ restore_done(src, dst,sz)
+ char    *src;
+ char    *dst;