[Midnightbsd-cvs] mports [20418] trunk/graphics/graphviz: fix graphviz build
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Oct 3 14:12:33 EDT 2015
Revision: 20418
http://svnweb.midnightbsd.org/mports/?rev=20418
Author: laffer1
Date: 2015-10-03 14:12:32 -0400 (Sat, 03 Oct 2015)
Log Message:
-----------
fix graphviz build
Modified Paths:
--------------
trunk/graphics/graphviz/Makefile
trunk/graphics/graphviz/pkg-plist
Added Paths:
-----------
trunk/graphics/graphviz/files/patch-cmd-tools-gmlscan.l
trunk/graphics/graphviz/files/patch-lib-cgraph-scan.l
Modified: trunk/graphics/graphviz/Makefile
===================================================================
--- trunk/graphics/graphviz/Makefile 2015-10-03 15:27:24 UTC (rev 20417)
+++ trunk/graphics/graphviz/Makefile 2015-10-03 18:12:32 UTC (rev 20418)
@@ -2,6 +2,7 @@
PORTNAME= graphviz
PORTVERSION= 2.38.0
+PORTREVISION= 2
CATEGORIES= graphics tk
MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/
@@ -11,7 +12,6 @@
LICENSE= epl
LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl \
- libjpeg.so:${PORTSDIR}/graphics/jpeg \
libpng.so:${PORTSDIR}/graphics/png \
libfreetype.so:${PORTSDIR}/print/freetype2 \
libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
@@ -18,7 +18,7 @@
libexpat.so:${PORTSDIR}/textproc/expat2 \
libgd.so:${PORTSDIR}/${GD_PORT}
-USES= cpe gmake bison libtool:keepla pkgconfig pathfix shebangfix
+USES= bison cpe gmake jpeg libtool:keepla pkgconfig pathfix shebangfix
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
@@ -48,7 +48,7 @@
PDOCS_PDF= doc/*.pdf */*/*.pdf
PDOCS_HTML= doc/*.html doc/info/*.gif
-USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
+USE_LDCONFIG= ${TRUE_PREFIX}/lib/${PORTNAME}
OPTIONS_DEFINE= XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO LIBRSVG2 POPPLER \
ANN GTS GTK2 GDK GDK_PIXBUF GNOMEUI SMYRNA GVEDIT MING DEVIL \
@@ -313,9 +313,9 @@
${WRKSRC}/Makefile.in
.endif
-post-install: install-ldconfig-file
+post-install:
cd ${WRKSRC}/lib/expr && \
- ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET}
+ ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${FAKE_MAKEARGS} ${INSTALL_TARGET}
cd ${WRKSRC} && \
${INSTALL_DATA} ${FIX_INCLUDE} ${PREFIX}/include/graphviz/
.if ${PORT_OPTIONS:MDOCS}
Added: trunk/graphics/graphviz/files/patch-cmd-tools-gmlscan.l
===================================================================
--- trunk/graphics/graphviz/files/patch-cmd-tools-gmlscan.l (rev 0)
+++ trunk/graphics/graphviz/files/patch-cmd-tools-gmlscan.l 2015-10-03 18:12:32 UTC (rev 20418)
@@ -0,0 +1,11 @@
+--- cmd/tools/gmlscan.l.orig 2014-04-13 22:40:25.000000000 +0200
++++ cmd/tools/gmlscan.l 2015-07-29 14:51:42.000000000 +0200
+@@ -127,7 +127,7 @@
+ return;
+ errors = 1;
+ sprintf(buf," %s in line %d near '%s'\n", str,line_num,yytext);
+- agerr(AGWARN,buf);
++ agerr(AGWARN, "%s", buf);
+ }
+
+ int gmlerrors()
Property changes on: trunk/graphics/graphviz/files/patch-cmd-tools-gmlscan.l
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/graphviz/files/patch-lib-cgraph-scan.l
===================================================================
--- trunk/graphics/graphviz/files/patch-lib-cgraph-scan.l (rev 0)
+++ trunk/graphics/graphviz/files/patch-lib-cgraph-scan.l 2015-10-03 18:12:32 UTC (rev 20418)
@@ -0,0 +1,20 @@
+--- lib/cgraph/scan.l.orig 2014-04-13 22:40:25.000000000 +0200
++++ lib/cgraph/scan.l 2015-07-29 14:51:27.000000000 +0200
+@@ -149,7 +149,7 @@
+ agxbput(&xb,buf);
+ agxbput(&xb,fname);
+ agxbput(&xb, " splits into two tokens\n");
+- agerr(AGWARN,agxbuse(&xb));
++ agerr(AGWARN, "%s", agxbuse(&xb));
+
+ agxbfree(&xb);
+ return 1;
+@@ -225,7 +225,7 @@
+ agxbput (&xb, buf);
+ agxbput (&xb, yytext);
+ agxbput (&xb,"'\n");
+- agerr(AGERR,agxbuse(&xb));
++ agerr(AGERR, "%s", agxbuse(&xb));
+ agxbfree(&xb);
+ }
+ /* must be here to see flex's macro defns */
Property changes on: trunk/graphics/graphviz/files/patch-lib-cgraph-scan.l
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/graphics/graphviz/pkg-plist
===================================================================
--- trunk/graphics/graphviz/pkg-plist 2015-10-03 15:27:24 UTC (rev 20417)
+++ trunk/graphics/graphviz/pkg-plist 2015-10-03 18:12:32 UTC (rev 20418)
@@ -166,6 +166,10 @@
%%TCL%%lib/graphviz/tcl/libtclplan.so
%%TCL%%lib/graphviz/tcl/libtclplan.so.0
%%TCL%%lib/graphviz/tcl/libtclplan.so.0.0.0
+%%TK%%lib/graphviz/tcl/libtkspline.la
+%%TK%%lib/graphviz/tcl/libtkspline.so
+%%TK%%lib/graphviz/tcl/libtkspline.so.0
+%%TK%%lib/graphviz/tcl/libtkspline.so.0.0.0
%%TCL%%lib/graphviz/tcl/pkgIndex.tcl
%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgdtclft.la
%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgdtclft.so
@@ -185,15 +189,11 @@
%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.so
%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.so.0
%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.so.0.0.0
-%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.la
-%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.so
-%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.so.0
-%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.so.0.0.0
+%%TK%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.la
+%%TK%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.so
+%%TK%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.so.0
+%%TK%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.so.0.0.0
%%TCL%%lib/tcl%%TCL_VER%%/graphviz/pkgIndex.tcl
-%%TK%%lib/graphviz/tcl/libtkspline.la
-%%TK%%lib/graphviz/tcl/libtkspline.so
-%%TK%%lib/graphviz/tcl/libtkspline.so.0
-%%TK%%lib/graphviz/tcl/libtkspline.so.0.0.0
%%LUA%%lib/graphviz/lua/gv.so
%%LUA%%lib/graphviz/lua/libgv_lua.la
%%LUA%%lib/graphviz/lua/libgv_lua.so
More information about the Midnightbsd-cvs
mailing list