Date: Mon, 13 Nov 2000 15:10:54 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/22832: Update port: graphics/graphviz to 1.7a (fix ports/22748) Message-ID: <20001113231054.5742237B4C5@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 22832 >Category: ports >Synopsis: Update port: graphics/graphviz to 1.7a (fix ports/22748) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Nov 13 15:20:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1.1-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.7a New file: files/patch-lefty:Makefile.am files/patch-lefty:ws:x11:Makefile.am files/patch-lefty:ws:x11:libfilereq:Makefile.am files/patch-tkspline:Makefile.am Remove file: files/patch-lefty:Makefile.in files/patch-lefty:ws:x11:Makefile.in files/patch-lefty:ws:x11:libfilereq:Makefile.in files/patch-tkspline:Makefile.in This PR supersedes ports/22553 and ports/22748. >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/graphviz/Makefile graphics/graphviz/Makefile --- /usr/ports/graphics/graphviz/Makefile Mon Nov 6 22:17:50 2000 +++ graphics/graphviz/Makefile Tue Nov 14 08:03:37 2000 @@ -6,31 +6,38 @@ # PORTNAME= graphviz -PORTVERSION= 1.6 +PORTVERSION= 1.7a CATEGORIES= graphics tk83 -MASTER_SITES= http://www.graphviz.org/pub/graphviz/ +MASTER_SITES= http://www.research.att.com/sw/tools/graphviz/ +DISTNAME= gviz17a +EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -BUILD_DEPENDS= automake:${PORTSDIR}/devel/automake LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.4:${PORTSDIR}/graphics/png \ - tk83.1:${PORTSDIR}/x11-toolkits/tk83 \ - ttf.4:${PORTSDIR}/print/freetype \ - Xpm.4:${PORTSDIR}/graphics/xpm - -# do not use USE_AUTOMAKE -- it only works if the configure script -# finds automake by itself -USE_AUTOCONF= yes + tk83.1:${PORTSDIR}/x11-toolkits/tk83 + +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + +USE_FREETYPE= yes +USE_XPM= yes +USE_GMAKE= yes +USE_AUTOMAKE= yes +AUTOMAKE= libtoolize --force && autoheader && automake --add-missing USE_LIBTOOL= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3 -DHAVE_TERMIOS" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3 -DHAVE_TERMIOS" \ + LDFLAGS="-L${LOCALBASE}/lib" \ TCLCONFIG=${LOCALBASE}/lib/tcl8.3/tclConfig.sh \ TKCONFIG=${LOCALBASE}/lib/tk8.3/tkConfig.sh -USE_GMAKE= yes +INSTALLS_SHLIB= yes +LDCONFIG_DIRS= ${PREFIX}/lib/graphviz MAN1= dot.1 dotty.1 lefty.1 neato.1 MAN3= agraph.3 cdt.3 graph.3 pathplan.3 MANN= gdtclft.n tcldgl.n tcldgr.n tcldot.n tkspline.n + +post-patch: + @cd ${WRKSRC} && aclocal .include <bsd.port.mk> diff -urN /usr/ports/graphics/graphviz/distinfo graphics/graphviz/distinfo --- /usr/ports/graphics/graphviz/distinfo Mon Oct 23 23:23:24 2000 +++ graphics/graphviz/distinfo Tue Nov 14 05:25:10 2000 @@ -1 +1 @@ -MD5 (graphviz-1.6.tar.gz) = bad03a6a1bee4c2bb0928dd017d61f2b +MD5 (gviz17a.tgz) = a077970c1a010d3c7bcd1ed82eaa22a0 diff -urN /usr/ports/graphics/graphviz/files/patch-ae graphics/graphviz/files/patch-ae --- /usr/ports/graphics/graphviz/files/patch-ae Mon Oct 23 23:23:26 2000 +++ graphics/graphviz/files/patch-ae Fri Nov 3 04:20:43 2000 @@ -1,11 +1,14 @@ ---- lefty/lefty.c.orig Tue Apr 18 05:55:50 2000 -+++ lefty/lefty.c Tue Oct 17 18:47:51 2000 -@@ -32,6 +32,8 @@ +--- lefty/lefty.c.orig Mon Oct 9 09:19:43 2000 ++++ lefty/lefty.c Fri Nov 3 04:20:09 2000 +@@ -44,7 +44,11 @@ + #define canread(fp) ((fp)->_IO_read_end > (fp)->_IO_read_ptr) #else - #ifdef _CNT_IN_FILESTRUCT - #define canread(fp) ((fp)->_cnt > 0) -+#elif __FreeBSD__ + #ifdef NO_CNT_IN_FILESTRUCT ++#ifdef __FreeBSD__ +#define canread(fp) ((fp)->_r > 0) - #else ++#else #define canread(fp) ((fp)->_IO_read_end > (fp)->_IO_read_ptr) ++#endif + #else + #define canread(fp) ((fp)->_cnt > 0) #endif diff -urN /usr/ports/graphics/graphviz/files/patch-doc:Makefile.am graphics/graphviz/files/patch-doc:Makefile.am --- /usr/ports/graphics/graphviz/files/patch-doc:Makefile.am Mon Oct 23 21:37:30 2000 +++ graphics/graphviz/files/patch-doc:Makefile.am Fri Nov 3 04:41:50 2000 @@ -5,6 +5,6 @@ DOCS = dotguide.ps dotty.ps gd.html lefty.ps neatoguide.ps tcldot.html -docdir = $(prefix)/doc -+docdir = $(datadir)/doc/graphviz ++docdir = $(datadir)/doc/@PACKAGE@ doc_DATA = $(DOCS) EXTRA_DIST = $(DOCS) diff -urN /usr/ports/graphics/graphviz/files/patch-lefty:Makefile.am graphics/graphviz/files/patch-lefty:Makefile.am --- /usr/ports/graphics/graphviz/files/patch-lefty:Makefile.am Thu Jan 1 09:00:00 1970 +++ graphics/graphviz/files/patch-lefty:Makefile.am Fri Nov 3 03:24:17 2000 @@ -0,0 +1,10 @@ +--- lefty/Makefile.am.orig Sun Oct 15 16:53:05 2000 ++++ lefty/Makefile.am Fri Nov 3 03:24:02 2000 +@@ -21,6 +21,7 @@ + nmakefile makefile.old + + INCLUDES = \ ++ @X_CFLAGS@ \ + -I$(srcdir)/ws/x11 \ + -I$(srcdir)/os/unix \ + -I$(srcdir)/dot2l diff -urN /usr/ports/graphics/graphviz/files/patch-lefty:Makefile.in graphics/graphviz/files/patch-lefty:Makefile.in --- /usr/ports/graphics/graphviz/files/patch-lefty:Makefile.in Mon Oct 23 21:37:30 2000 +++ graphics/graphviz/files/patch-lefty:Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,13 +0,0 @@ ---- lefty/Makefile.in.orig Tue Oct 17 18:18:57 2000 -+++ lefty/Makefile.in Tue Oct 17 18:44:21 2000 -@@ -195,8 +195,8 @@ - lefty_DEPENDENCIES = dot2l/libdot2l.la ws/x11/libws.la \ - ws/x11/libfilereq/libfilereq.la os/unix/libos.la - lefty_LDFLAGS = --COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(X_CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(X_CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ - man1dir = $(mandir)/man1 diff -urN /usr/ports/graphics/graphviz/files/patch-lefty:ws:x11:Makefile.am graphics/graphviz/files/patch-lefty:ws:x11:Makefile.am --- /usr/ports/graphics/graphviz/files/patch-lefty:ws:x11:Makefile.am Thu Jan 1 09:00:00 1970 +++ graphics/graphviz/files/patch-lefty:ws:x11:Makefile.am Fri Nov 3 03:25:47 2000 @@ -0,0 +1,11 @@ +--- lefty/ws/x11/Makefile.am.orig Sat May 27 03:07:57 2000 ++++ lefty/ws/x11/Makefile.am Fri Nov 3 03:25:30 2000 +@@ -9,7 +9,7 @@ + noinst_HEADERS = gcommon.h + noinst_LTLIBRARIES = libws.la + +-INCLUDES = -I../.. ++INCLUDES = @X_CFLAGS@ -I../.. + + libws_la_SOURCES = garray.c gbutton.c gcanvas.c gcommon.c glabel.c \ + gmenu.c gpcanvas.c gquery.c gscroll.c gtext.c gview.c gcommon.h diff -urN /usr/ports/graphics/graphviz/files/patch-lefty:ws:x11:Makefile.in graphics/graphviz/files/patch-lefty:ws:x11:Makefile.in --- /usr/ports/graphics/graphviz/files/patch-lefty:ws:x11:Makefile.in Mon Oct 23 21:37:30 2000 +++ graphics/graphviz/files/patch-lefty:ws:x11:Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,13 +0,0 @@ ---- lefty/ws/x11/Makefile.in.orig Tue Oct 17 18:19:04 2000 -+++ lefty/ws/x11/Makefile.in Tue Oct 17 18:36:21 2000 -@@ -184,8 +184,8 @@ - libws_la_OBJECTS = garray.lo gbutton.lo gcanvas.lo gcommon.lo glabel.lo \ - gmenu.lo gpcanvas.lo gquery.lo gscroll.lo gtext.lo gview.lo - CFLAGS = @CFLAGS@ --COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(X_CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(X_CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ - HEADERS = $(noinst_HEADERS) diff -urN /usr/ports/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Makefile.am graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Makefile.am --- /usr/ports/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Makefile.am Thu Jan 1 09:00:00 1970 +++ graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Makefile.am Fri Nov 3 04:07:47 2000 @@ -0,0 +1,11 @@ +--- lefty/ws/x11/libfilereq/Makefile.am.orig Sun Oct 15 14:31:01 2000 ++++ lefty/ws/x11/libfilereq/Makefile.am Fri Nov 3 03:27:59 2000 +@@ -7,6 +7,8 @@ + noinst_HEADERS = SFinternal.h xstat.h + noinst_LTLIBRARIES = libfilereq.la + ++INCLUDES = @X_CFLAGS@ ++ + libfilereq_la_SOURCES = Dir.c Draw.c Path.c SelFile.c SFinternal.h xstat.h + + EXTRA_DIST = README.selfile diff -urN /usr/ports/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Makefile.in graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Makefile.in --- /usr/ports/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Makefile.in Mon Oct 23 21:37:30 2000 +++ graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,13 +0,0 @@ ---- lefty/ws/x11/libfilereq/Makefile.in.orig Tue Oct 17 18:19:07 2000 -+++ lefty/ws/x11/libfilereq/Makefile.in Tue Oct 17 18:31:58 2000 -@@ -179,8 +179,8 @@ - libfilereq_la_LIBADD = - libfilereq_la_OBJECTS = Dir.lo Draw.lo Path.lo SelFile.lo - CFLAGS = @CFLAGS@ --COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(X_CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(X_CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ - HEADERS = $(noinst_HEADERS) diff -urN /usr/ports/graphics/graphviz/files/patch-tkspline:Makefile.am graphics/graphviz/files/patch-tkspline:Makefile.am --- /usr/ports/graphics/graphviz/files/patch-tkspline:Makefile.am Thu Jan 1 09:00:00 1970 +++ graphics/graphviz/files/patch-tkspline:Makefile.am Fri Nov 3 03:24:39 2000 @@ -0,0 +1,10 @@ +--- tkspline/Makefile.am.orig Sat May 27 03:07:57 2000 ++++ tkspline/Makefile.am Fri Nov 3 03:22:50 2000 +@@ -10,6 +10,7 @@ + man_MANS = tkspline.n + + INCLUDES = \ ++ @X_CFLAGS@ \ + @TCL_CFLAGS@ \ + @TK_CFLAGS@ \ + -I@TK_EXEC_PREFIX@/include \ diff -urN /usr/ports/graphics/graphviz/files/patch-tkspline:Makefile.in graphics/graphviz/files/patch-tkspline:Makefile.in --- /usr/ports/graphics/graphviz/files/patch-tkspline:Makefile.in Mon Oct 23 21:37:32 2000 +++ graphics/graphviz/files/patch-tkspline:Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,13 +0,0 @@ ---- tkspline/Makefile.in.orig Tue Oct 17 18:50:03 2000 -+++ tkspline/Makefile.in Tue Oct 17 18:52:16 2000 -@@ -191,8 +191,8 @@ - ../tclstubs/libtclstubs.la - libtkspline_la_OBJECTS = tkspline.lo - CFLAGS = @CFLAGS@ --COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(X_CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(X_CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ - manndir = $(mandir)/mann diff -urN /usr/ports/graphics/graphviz/pkg-plist graphics/graphviz/pkg-plist --- /usr/ports/graphics/graphviz/pkg-plist Mon Oct 23 23:23:34 2000 +++ graphics/graphviz/pkg-plist Tue Nov 14 07:58:47 2000 @@ -1,7 +1,8 @@ -bin/dotneato +bin/dot bin/dotty bin/lefty bin/lneato +bin/neato lib/graphviz/demo/dge lib/graphviz/demo/dge.README lib/graphviz/demo/dge.example1.dot @@ -64,11 +65,18 @@ lib/graphviz/graphs/undirected/ER.dot lib/graphviz/graphs/undirected/ngk10_4.dot lib/graphviz/graphs/undirected/process.dot +lib/graphviz/lefty/box.lefty +lib/graphviz/lefty/def.lefty lib/graphviz/lefty/dotty.lefty lib/graphviz/lefty/dotty_draw.lefty lib/graphviz/lefty/dotty_edit.lefty lib/graphviz/lefty/dotty_layout.lefty lib/graphviz/lefty/dotty_ui.lefty +lib/graphviz/lefty/fractal.lefty +lib/graphviz/lefty/fractal2.lefty +lib/graphviz/lefty/lefty.psp +lib/graphviz/lefty/slides.lefty +lib/graphviz/lefty/tree.lefty lib/graphviz/libgdtclft.so lib/graphviz/libgdtclft.so.0 lib/graphviz/libtcldgl.so >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001113231054.5742237B4C5>