From owner-svn-ports-head@FreeBSD.ORG  Sat Aug  9 03:58:38 2014
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 4763E97B
 for <svn-ports-head@freebsd.org>; Sat,  9 Aug 2014 03:58:38 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1F3B425E0
 for <svn-ports-head@freebsd.org>; Sat,  9 Aug 2014 03:58:38 +0000 (UTC)
Received: from adamw (uid 959) (envelope-from adamw@FreeBSD.org) id 2b21
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Sat, 09 Aug 2014 03:58:37 +0000
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Sat, 9 Aug 2014 03:58:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r364396 - in head/net-mgmt/disco: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e59c6e.2b21.58cd389c@svn.freebsd.org>
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
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: Sat, 09 Aug 2014 03:58:38 -0000

Author: adamw
Date: Sat Aug  9 03:58:37 2014
New Revision: 364396
URL: http://svnweb.freebsd.org/changeset/ports/364396
QAT: https://qat.redports.org/buildarchive/r364396/

Log:
  Fix build with clang.
  
  While here, avoid unnecessary bsd.port.options.mk inclusion.

Added:
  head/net-mgmt/disco/files/
  head/net-mgmt/disco/files/patch-disco.c   (contents, props changed)
Modified:
  head/net-mgmt/disco/Makefile

Modified: head/net-mgmt/disco/Makefile
==============================================================================
--- head/net-mgmt/disco/Makefile	Sat Aug  9 03:53:18 2014	(r364395)
+++ head/net-mgmt/disco/Makefile	Sat Aug  9 03:58:37 2014	(r364396)
@@ -20,14 +20,10 @@ PLIST_FILES=	bin/disco bin/disco.fp
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-install:
-.if ! ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in README
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>

Added: head/net-mgmt/disco/files/patch-disco.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/disco/files/patch-disco.c	Sat Aug  9 03:58:37 2014	(r364396)
@@ -0,0 +1,11 @@
+--- disco.c.orig	2014-08-08 23:55:22.000000000 -0400
++++ disco.c	2014-08-08 23:56:40.000000000 -0400
+@@ -1031,7 +1031,7 @@
+     if (!fp_file)
+     {
+         fprintf(stderr, "No fingerprint file found\n");
+-        return;
++        return -1;
+     }
+ 
+     while (fgets(infile, 1500, fp_file) != NULL && infile[0] != '\n')