Date: Thu, 28 Nov 2013 08:32:27 +0400 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@freebsd.org Cc: mi@aldan.algebra.com Subject: ports/184345: [PATCH] graphics/nip2: multiple fixes and bugs Message-ID: <20131128043227.082B6427@hades.panopticon> Resent-Message-ID: <201311280440.rAS4e0Nn080466@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184345
>Category: ports
>Synopsis: [PATCH] graphics/nip2: multiple fixes and bugs
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 28 04:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 10.0-BETA3 amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 10.0-BETA3 FreeBSD 10.0-BETA3 #0 r258666: Wed Nov 27 03:06:10 MSK
>Description:
- Fix build on 10.x
- Fix build with recent graphviz
- Remove useless REINPLACE
The port also has leftovers when build with DOCS disabled (NOPORTDOCS):
---
=== Checking filesystem state after all packages deleted
================================================================
list of extra files and directories in / (not present on clean system but present after everything was deinstalled)
3052660 8 drwxr-xr-x 3 root wheel 512 Nov 28 01:56 usr/local/share/doc/nip2
3052661 8 drwxr-xr-x 2 root wheel 512 Nov 28 01:56 usr/local/share/doc/nip2/pdf
3052662 3072 -rw-r--r-- 1 root wheel 1517694 Nov 28 01:56 usr/local/share/doc/nip2/pdf/nipguide.pdf
================================================================
---
Port maintainer (mi@aldan.algebra.com) is cc'd.
Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:
--- nip2-7.26.3_2.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 335075)
+++ Makefile (working copy)
@@ -32,8 +32,13 @@
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
Index: files/extra-patch-src-parser.h
===================================================================
--- files/extra-patch-src-parser.h (revision 0)
+++ files/extra-patch-src-parser.h (working copy)
@@ -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
+ */
Index: files/patch-src-graphwindow.c
===================================================================
--- files/patch-src-graphwindow.c (revision 0)
+++ files/patch-src-graphwindow.c (working copy)
@@ -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 );
--- nip2-7.26.3_2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131128043227.082B6427>