Date: Tue, 17 Dec 2013 02:46:50 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/184856: converters/ish: Fix build on -current Message-ID: <20131217024650.08e12e2bc9bd4a615cfb3272@yahoo.com> Resent-Message-ID: <201312161810.rBGIAF6W016244@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184856
>Category: ports
>Synopsis: converters/ish: Fix build on -current
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 16 18:10:15 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build on -current
New file:
files/patch-mvol.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/converters/ish/Makefile converters/ish/Makefile
--- /usr/ports/converters/ish/Makefile 2013-11-06 22:05:05.000000000 +0900
+++ converters/ish/Makefile 2013-12-17 00:00:00.000000000 +0900
@@ -13,11 +13,11 @@
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>
diff -urN /usr/ports/converters/ish/files/patch-mvol.c converters/ish/files/patch-mvol.c
--- /usr/ports/converters/ish/files/patch-mvol.c 1970-01-01 09:00:00.000000000 +0900
+++ converters/ish/files/patch-mvol.c 2013-12-17 00:00:00.000000000 +0900
@@ -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;
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131217024650.08e12e2bc9bd4a615cfb3272>