From owner-svn-ports-all@FreeBSD.ORG  Sun Jun 16 11:27:35 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id EB6CFB6F;
 Sun, 16 Jun 2013 11:27:35 +0000 (UTC) (envelope-from wg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C2A2815F6;
 Sun, 16 Jun 2013 11:27:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5GBRZuk095185;
 Sun, 16 Jun 2013 11:27:35 GMT (envelope-from wg@svn.freebsd.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5GBRZg5095182;
 Sun, 16 Jun 2013 11:27:35 GMT (envelope-from wg@svn.freebsd.org)
Message-Id: <201306161127.r5GBRZg5095182@svn.freebsd.org>
From: William Grzybowski <wg@FreeBSD.org>
Date: Sun, 16 Jun 2013 11:27:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r321036 - in head/security/slurpie: . 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Jun 2013 11:27:36 -0000

Author: wg
Date: Sun Jun 16 11:27:34 2013
New Revision: 321036
URL: http://svnweb.freebsd.org/changeset/ports/321036

Log:
  security/slurpie: fix build with clang
  
  - Fix build with clang, main int arg
  - NOPORTDOCS -> PORT_OPTIONS:MDOCS
  - Trim Makefile header
  
  Approved by:	culot / jpaetzel (mentors, implicit)

Added:
  head/security/slurpie/files/patch-src_mater.c   (contents, props changed)
  head/security/slurpie/files/patch-src_node.c   (contents, props changed)
Modified:
  head/security/slurpie/Makefile

Modified: head/security/slurpie/Makefile
==============================================================================
--- head/security/slurpie/Makefile	Sun Jun 16 11:24:56 2013	(r321035)
+++ head/security/slurpie/Makefile	Sun Jun 16 11:27:34 2013	(r321036)
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:  slurpie
-# Date created:			  Sun Feb 12, 2000
-# Whom:				  David O'Brien (obrien@NUXI.com)
-#
+# Created by: David O'Brien (obrien@NUXI.com)
 # $FreeBSD$
-#
 
 PORTNAME=	slurpie
 PORTVERSION=	2.0b
@@ -20,6 +15,8 @@ COMMENT=	A passwd file cracker (supports
 PLIST_FILES=	sbin/slurp sbin/slurpie
 PORTDOCS=	README
 
+.include <bsd.port.options.mk>
+
 post-patch:
 # Fix for GCC 4.2
 	@${REINPLACE_CMD} -e \
@@ -28,7 +25,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/slurp* ${PREFIX}/sbin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif

Added: head/security/slurpie/files/patch-src_mater.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/slurpie/files/patch-src_mater.c	Sun Jun 16 11:27:34 2013	(r321036)
@@ -0,0 +1,13 @@
+diff --git src/master.c src/master.c
+index 4b24f9b..683d9a6 100644
+--- src/master.c
++++ src/master.c
+@@ -132,7 +132,7 @@ char *get_time_str( u_int seconds )
+    return timestr;
+ }
+ 
+-int main( int argc, u_char **argv )
++int main( int argc, char **argv )
+ {
+    static unsigned id, init_time;
+ 

Added: head/security/slurpie/files/patch-src_node.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/slurpie/files/patch-src_node.c	Sun Jun 16 11:27:34 2013	(r321036)
@@ -0,0 +1,13 @@
+diff --git src/node.c src/node.c
+index 28d5d8a..3135ea0 100644
+--- src/node.c
++++ src/node.c
+@@ -102,7 +102,7 @@ void clean_up( int exit_status )
+ 
+ 
+ /////////////////////////////
+-int main( int argc, u_char **argv )
++int main( int argc, char **argv )
+ {
+    u_int exit_state = 0;
+    global.self.addr.sin_port = 0;