Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Jul 2016 00:45:13 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r419291 - head/sysutils/sformat
Message-ID:  <201607300045.u6U0jDMC052864@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Sat Jul 30 00:45:13 2016
New Revision: 419291
URL: https://svnweb.freebsd.org/changeset/ports/419291

Log:
  Prevent collision with getline(3)

Modified:
  head/sysutils/sformat/Makefile

Modified: head/sysutils/sformat/Makefile
==============================================================================
--- head/sysutils/sformat/Makefile	Sat Jul 30 00:41:00 2016	(r419290)
+++ head/sysutils/sformat/Makefile	Sat Jul 30 00:45:13 2016	(r419291)
@@ -44,6 +44,14 @@ post-patch:
 .for i in include/schily.h libschily/fexec.c libschily/libschily-mapvers
 	@${REINPLACE_CMD} -e 's|fexecve|js_fexecve|g' ${WRKSRC}/${i}
 .endfor
+	@${REINPLACE_CMD} -e 's|int	getline|int	get_line|g' ${WRKSRC}/include/schily.h
+	@${REINPLACE_CMD} -e 's|(getline(|(get_line(|g' ${WRKSRC}/sformat/io.c \
+		${WRKSRC}/libscg/scsitransp.c
+	@${REINPLACE_CMD} -e 's| getline(| get_line(|g' ${WRKSRC}/sformat/io.c \
+		${WRKSRC}/sformat/defect.c
+	@${REINPLACE_CMD} -e 's|^getline|get_line|g' ${WRKSRC}/libschily/stdio/fgetline.c
+	@${REINPLACE_CMD} -e 's|)getline|)get_line|g' ${WRKSRC}/sformat/diskfmt.c
+
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sformat/OBJ/${SFMTTARGET}/sformat \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607300045.u6U0jDMC052864>