From 862f8cf6d442e34d0559b4411658b98aae76d1e2 Mon Sep 17 00:00:00 2001
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Thu, 15 Aug 2013 09:16:32 +0000
Subject: - Do not use imake for the build; use provided Makefile.noimake: this
   allows to build it with bmake(1) (as well as other implementations) -
 Unbreak the build against Clang (main() must return int) - Sanitize
 formatting of the port description while I am here

Reported by:	marino
---
 misc/xtar/files/patch-ab | 47 ++++++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 19 deletions(-)

(limited to 'misc/xtar/files')

diff --git a/misc/xtar/files/patch-ab b/misc/xtar/files/patch-ab
index 7ffceb9efc10..de63c95e3f61 100644
--- a/misc/xtar/files/patch-ab
+++ b/misc/xtar/files/patch-ab
@@ -1,19 +1,28 @@
-*** xtar.c.orig	Wed Jul 31 18:16:22 1996
---- xtar.c	Wed Jul 31 18:15:30 1996
-***************
-*** 1164,1170 ****
-  static int xtar_attributes(TAR_FILE *tf, char *filename)
-  {
-      int retval = 0;
-!     struct utimbuf utimbuf;
-  
-      /* If the file type is not a directory then try and set the access
-         permissions. We exclude directories because if write permission
---- 1164,1170 ----
-  static int xtar_attributes(TAR_FILE *tf, char *filename)
-  {
-      int retval = 0;
-!     struct utimbuf {char utimbuf;} utimbuf;
-  
-      /* If the file type is not a directory then try and set the access
-         permissions. We exclude directories because if write permission
+--- xtar.c.orig	1995-07-17 19:44:19.000000000 +0800
++++ xtar.c	2013-08-15 17:00:58.000000000 +0800
+@@ -33,6 +33,7 @@
+ #include <sys/stat.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ 
+ #include <Xm/Xm.h>
+ #include <Xm/Form.h>
+@@ -408,7 +409,7 @@
+     int argc = 1;
+     char **argv;
+ #else
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+     char *mappings;
+ #endif
+@@ -1164,7 +1165,7 @@
+ static int xtar_attributes(TAR_FILE *tf, char *filename)
+ {
+     int retval = 0;
+-    struct utimbuf utimbuf;
++    struct utimbuf {char utimbuf;} utimbuf;
+ 
+     /* If the file type is not a directory then try and set the access
+        permissions. We exclude directories because if write permission
-- 
cgit v1.2.3