Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 9 Aug 2014 03:58:37 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
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
Message-ID:  <53e59c6e.2b21.58cd389c@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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')



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e59c6e.2b21.58cd389c>