svn commit: r319206 - in head/archivers/zipmix: . files

[Baptiste Daroussin]

Author: bapt
Date: Mon May 27 10:34:54 2013
New Revision: 319206
URL: http://svnweb.freebsd.org/changeset/ports/319206

Log:
  Fix build with recent clang

Modified:
  head/archivers/zipmix/Makefile
  head/archivers/zipmix/files/patch-zipmix.c

Modified: head/archivers/zipmix/Makefile
==============================================================================
--- head/archivers/zipmix/Makefile	Mon May 27 10:31:49 2013	(r319205)
+++ head/archivers/zipmix/Makefile	Mon May 27 10:34:54 2013	(r319206)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	zipmix
-# Date created:		Fri Jan 9 2009 00:00:37 UTC
-# Whom:			Mario Sergio Fujikawa Ferreira <lioux at FreeBSD.org>
-#
+# Created by: Mario Sergio Fujikawa Ferreira <lioux at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	zipmix
 DISTVERSION=	20070221

Modified: head/archivers/zipmix/files/patch-zipmix.c
==============================================================================
--- head/archivers/zipmix/files/patch-zipmix.c	Mon May 27 10:31:49 2013	(r319205)
+++ head/archivers/zipmix/files/patch-zipmix.c	Mon May 27 10:34:54 2013	(r319206)
@@ -1,6 +1,6 @@
---- zipmix.c.orig	2009-01-08 22:05:10.000000000 -0200
-+++ zipmix.c	2009-01-08 22:10:30.000000000 -0200
-@@ -4,6 +4,17 @@
+--- zipmix.c.orig	2013-05-27 12:33:32.795062151 +0200
++++ zipmix.c	2013-05-27 12:33:52.048486869 +0200
+@@ -4,6 +4,17 @@ zipmix.exe: zipmix.c; cl zipmix.c /O1 /G
  !if 0
  #endif
  
@@ -18,3 +18,17 @@
  #if defined(_WIN32)
  
  #include <windows.h>
+@@ -167,10 +178,11 @@ void showhelp ()
+ }
+ 
+ enum { BOOL_NONE=0,BOOL_OR,BOOL_AND,BOOL_SUB };
+-int main (long argc, char **argv)
++int main (int argc, char **argv)
+ {
+ 	unsigned long leng[2];
+-	long i, j, k, l, fileng[3], score[4], fmax, ftell43;
++	int i;
++	long j, k, l, fileng[3], score[4], fmax, ftell43;
+ 	long filespecified = 0, boolop = BOOL_NONE, quiet = 0, overwriteyesmode = 0;
+ 	short s;
+ 	char ch, *cptr, *cptr2;