From owner-svn-ports-head@FreeBSD.ORG  Fri Dec 20 13:16:22 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8BCC83A7;
 Fri, 20 Dec 2013 13:16:22 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 77C4F1378;
 Fri, 20 Dec 2013 13:16:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKDGM6b061601;
 Fri, 20 Dec 2013 13:16:22 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKDGMFh061599;
 Fri, 20 Dec 2013 13:16:22 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201312201316.rBKDGMFh061599@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Fri, 20 Dec 2013 13:16:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r337009 - in head/converters/ish: . 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-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Dec 2013 13:16:22 -0000

Author: pawel
Date: Fri Dec 20 13:16:21 2013
New Revision: 337009
URL: http://svnweb.freebsd.org/changeset/ports/337009

Log:
  - Fix build with clang
  - Support staging
  
  PR:		ports/184856
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Added:
  head/converters/ish/files/patch-mvol.c   (contents, props changed)
Modified:
  head/converters/ish/Makefile   (contents, props changed)

Modified: head/converters/ish/Makefile
==============================================================================
--- head/converters/ish/Makefile	Fri Dec 20 13:13:31 2013	(r337008)
+++ head/converters/ish/Makefile	Fri Dec 20 13:16:21 2013	(r337009)
@@ -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>

Added: head/converters/ish/files/patch-mvol.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/converters/ish/files/patch-mvol.c	Fri Dec 20 13:16:21 2013	(r337009)
@@ -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;