Date: Tue, 10 Dec 2013 01:26:12 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336038 - in head/graphics/nip2: . files Message-ID: <201312100126.rBA1QC3t084973@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Dec 10 01:26:12 2013 New Revision: 336038 URL: http://svnweb.freebsd.org/changeset/ports/336038 Log: - Fix build on 10.x and with recent graphviz - Remove useless REINPLACE_CMD PR: 184345 Submitted by: amdmi3 Approved by: maintainer timeout Added: head/graphics/nip2/files/ head/graphics/nip2/files/extra-patch-src-parser.h (contents, props changed) head/graphics/nip2/files/patch-src-graphwindow.c (contents, props changed) Modified: head/graphics/nip2/Makefile Modified: head/graphics/nip2/Makefile ============================================================================== --- head/graphics/nip2/Makefile Tue Dec 10 01:25:12 2013 (r336037) +++ head/graphics/nip2/Makefile Tue Dec 10 01:26:12 2013 (r336038) @@ -32,8 +32,13 @@ MAKE_ENV+= UPDATE_MIME_DATABASE=update-m MAN1= nip2.1 +.include <bsd.port.options.mk> + +.if ${OSVERSION} >= 1000013 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-parser.h +.endif + post-patch: - ${REINPLACE_CMD} -e 's, malkovich,,' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|n_bytes|x_n_bytes|g' -e 's|text_size|x_text_size|g' \ ${WRKSRC}/src/gtkitementry.c Added: head/graphics/nip2/files/extra-patch-src-parser.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/nip2/files/extra-patch-src-parser.h Tue Dec 10 01:26:12 2013 (r336038) @@ -0,0 +1,11 @@ +--- src/parser.h.orig 2011-01-25 19:44:07.000000000 +0300 ++++ src/parser.h 2013-11-28 04:22:09.853554221 +0400 +@@ -54,7 +54,7 @@ + */ + void yyerror( const char *sub, ... ) + __attribute__((format(printf, 1, 2))); +-extern int yyleng; /* lex stuff */ ++extern size_t yyleng; /* lex stuff */ + + /* Lex gathers tokens here for workspace.c + */ Added: head/graphics/nip2/files/patch-src-graphwindow.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/nip2/files/patch-src-graphwindow.c Tue Dec 10 01:26:12 2013 (r336038) @@ -0,0 +1,11 @@ +--- src/graphwindow.c.orig 2011-01-25 19:44:07.000000000 +0300 ++++ src/graphwindow.c 2013-11-28 03:48:15.996694984 +0400 +@@ -260,7 +260,7 @@ + + IM_FREEF( agclose, graphwindow->graph ); + +- graphwindow->graph = agread( of->fp ); ++ graphwindow->graph = agread( of->fp, NULL ); + + ifile_close( of ); + unlinkf( "%s", tname );
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312100126.rBA1QC3t084973>