From owner-svn-ports-head@freebsd.org  Mon Aug  1 06:36:54 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 245A0BAD4AA;
 Mon,  1 Aug 2016 06:36:54 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E8C0F14AB;
 Mon,  1 Aug 2016 06:36:53 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u716aria059473;
 Mon, 1 Aug 2016 06:36:53 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u716arIE059472;
 Mon, 1 Aug 2016 06:36:53 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201608010636.u716arIE059472@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 1 Aug 2016 06:36:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r419429 - head/irc/ircservices/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-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Aug 2016 06:36:54 -0000

Author: bapt
Date: Mon Aug  1 06:36:52 2016
New Revision: 419429
URL: https://svnweb.freebsd.org/changeset/ports/419429

Log:
  Fix collision with getline(3)

Added:
  head/irc/ircservices/files/patch-lang_langcomp.c   (contents, props changed)

Added: head/irc/ircservices/files/patch-lang_langcomp.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/irc/ircservices/files/patch-lang_langcomp.c	Mon Aug  1 06:36:52 2016	(r419429)
@@ -0,0 +1,20 @@
+--- lang/langcomp.c.orig	2009-07-11 14:53:19 UTC
++++ lang/langcomp.c
+@@ -115,7 +115,7 @@ static int stringnum(const char *name)
+ /* Read a non-comment, non-blank line from the input file.  Return NULL at
+  * end of file. */
+ 
+-static char *getline(FILE *f)
++static char *get_line(FILE *f)
+ {
+     static char buf[1024];
+     char *s;
+@@ -196,7 +196,7 @@ int main(int ac, char **av)
+         return 1;
+     }
+ 
+-    while (maxerr > 0 && (line = getline(in)) != NULL) {
++    while (maxerr > 0 && (line = get_line(in)) != NULL) {
+         if (*line == '\t') {
+             if (curstring == -2) {
+                 fprintf(stderr, "%s:%d: Junk at beginning of file\n",