diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2013-12-10 09:26:12 +0800 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2013-12-10 09:26:12 +0800 |
| commit | 8e18b3daec8e687205e998d8da943b40972a0bbf (patch) | |
| tree | 81764c19dc4af587f25558d91ce2bb04995b7201 /graphics | |
| parent | 51d9803e1fd0526f45bb9ee377f69a4919bd82e7 (diff) | |
| download | freebsd-ports-gnome-8e18b3daec8e687205e998d8da943b40972a0bbf.tar.gz freebsd-ports-gnome-8e18b3daec8e687205e998d8da943b40972a0bbf.tar.zst freebsd-ports-gnome-8e18b3daec8e687205e998d8da943b40972a0bbf.zip | |
- Fix build on 10.x and with recent graphviz
- Remove useless REINPLACE_CMD
PR: 184345
Submitted by: amdmi3
Approved by: maintainer timeout
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/nip2/Makefile | 7 | ||||
| -rw-r--r-- | graphics/nip2/files/extra-patch-src-parser.h | 11 | ||||
| -rw-r--r-- | graphics/nip2/files/patch-src-graphwindow.c | 11 |
3 files changed, 28 insertions, 1 deletions
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile index b1e5b77e4fa2..311503e20a57 100644 --- a/graphics/nip2/Makefile +++ b/graphics/nip2/Makefile @@ -32,8 +32,13 @@ MAKE_ENV+= UPDATE_MIME_DATABASE=update-mime-database \ 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 diff --git a/graphics/nip2/files/extra-patch-src-parser.h b/graphics/nip2/files/extra-patch-src-parser.h new file mode 100644 index 000000000000..99565d9e1796 --- /dev/null +++ b/graphics/nip2/files/extra-patch-src-parser.h @@ -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 + */ diff --git a/graphics/nip2/files/patch-src-graphwindow.c b/graphics/nip2/files/patch-src-graphwindow.c new file mode 100644 index 000000000000..e8c5c6e1c528 --- /dev/null +++ b/graphics/nip2/files/patch-src-graphwindow.c @@ -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 ); |