From owner-svn-ports-head@freebsd.org  Sat Jul 30 00:41:01 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 51B8DBA8FCC;
 Sat, 30 Jul 2016 00:41:01 +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 1EAFC1C23;
 Sat, 30 Jul 2016 00:41:01 +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 u6U0f0oE050060;
 Sat, 30 Jul 2016 00:41:00 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6U0f08N050059;
 Sat, 30 Jul 2016 00:41:00 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201607300041.u6U0f08N050059@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: Sat, 30 Jul 2016 00:41:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r419290 - head/sysutils/cdrdao
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: Sat, 30 Jul 2016 00:41:01 -0000

Author: bapt
Date: Sat Jul 30 00:41:00 2016
New Revision: 419290
URL: https://svnweb.freebsd.org/changeset/ports/419290

Log:
  Prevent collision with getline(3)

Modified:
  head/sysutils/cdrdao/Makefile

Modified: head/sysutils/cdrdao/Makefile
==============================================================================
--- head/sysutils/cdrdao/Makefile	Sat Jul 30 00:20:02 2016	(r419289)
+++ head/sysutils/cdrdao/Makefile	Sat Jul 30 00:41:00 2016	(r419290)
@@ -87,6 +87,9 @@ post-patch:
 .for i in include/schily.h libschily/fexec.c
 	@${REINPLACE_CMD} -e 's|fexecve|js_fexecve|g' ${WRKSRC}/scsilib/${i}
 .endfor
+	@${REINPLACE_CMD} -e 's|int	getline|int	get_line|g' ${WRKSRC}/scsilib/include/schily.h
+	@${REINPLACE_CMD} -e 's|(getline|(get_line|g' ${WRKSRC}/scsilib/libscg/scsitransp.c
+	@${REINPLACE_CMD} -e 's|^getline|get_line|g' ${WRKSRC}/scsilib/libschily/stdio/fgetline.c
 .if ${PORTNAME} == "gcdmaster"
 	@${REINPLACE_CMD} -E -e 's|(^SUBDIRS.+) utils|\1|' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -E -e 's|(^gladedir.+=).+|\1 ${DATADIR}|' \