head 1.17; access; symbols OPENPKG_E1_MP_HEAD:1.8 OPENPKG_E1_MP:1.8 OPENPKG_E1_MP_2_STABLE:1.8 OPENPKG_E1_FP:1.8 OPENPKG_2_STABLE_MP:1.8 OPENPKG_2_STABLE_20061018:1.8 OPENPKG_2_STABLE_20060622:1.8 OPENPKG_2_STABLE:1.8.0.4 OPENPKG_2_STABLE_BP:1.8 OPENPKG_2_5_RELEASE:1.8 OPENPKG_2_5_SOLID:1.8.0.2 OPENPKG_2_5_SOLID_BP:1.8 OPENPKG_2_4_RELEASE:1.7 OPENPKG_2_4_SOLID:1.7.0.4 OPENPKG_2_4_SOLID_BP:1.7 OPENPKG_CW_FP:1.7 OPENPKG_2_3_RELEASE:1.7 OPENPKG_2_3_SOLID:1.7.0.2 OPENPKG_2_3_SOLID_BP:1.7 OPENPKG_2_2_RELEASE:1.5 OPENPKG_2_2_SOLID:1.5.0.2 OPENPKG_2_2_SOLID_BP:1.5 OPENPKG_2_1_RELEASE:1.4 OPENPKG_2_1_SOLID:1.4.0.2 OPENPKG_2_1_SOLID_BP:1.4 OPENPKG_2_0_RELEASE:1.3 OPENPKG_2_0_SOLID:1.3.0.2 OPENPKG_2_0_SOLID_BP:1.3 OPENPKG_1_3_RELEASE:1.2.2.1 OPENPKG_1_3_SOLID:1.2.2.1.0.2 OPENPKG_1_3_SOLID_BP:1.2.2.1 OPENPKG_1_STABLE_MP:1.3 OPENPKG_1_2_SOLID:1.2.0.4 OPENPKG_1_2_SOLID_BP:1.2 OPENPKG_1_STABLE:1.2.0.2 OPENPKG_1_STABLE_BP:1.2 OPENPKG_1_1_RELEASE:1.1 OPENPKG_1_1_SOLID:1.1.0.2 OPENPKG_1_1_SOLID_BP:1.1; locks; strict; comment @# @; 1.17 date 2009.03.12.18.38.04; author rse; state Exp; branches; next 1.16; commitid YEjo7ITFE6Cc3MFt; 1.16 date 2009.03.11.19.54.44; author rse; state Exp; branches; next 1.15; commitid AdvRAfILooUuvEFt; 1.15 date 2009.03.04.22.10.45; author rse; state Exp; branches; next 1.14; commitid qUHR9CdsyY07uLEt; 1.14 date 2008.06.21.16.20.15; author rse; state Exp; branches; next 1.13; commitid 2NSf9t9eVWx1MP7t; 1.13 date 2008.03.11.19.56.44; author rse; state Exp; branches; next 1.12; commitid uYKm6WiGpbsAfKUs; 1.12 date 2007.11.10.17.54.03; author rse; state Exp; branches; next 1.11; commitid mpkXYeKa9njDu3Fs; 1.11 date 2007.08.29.11.21.43; author rse; state Exp; branches; next 1.10; commitid ydcc5CeZVRawFDvs; 1.10 date 2007.08.03.17.54.28; author rse; state Exp; branches; next 1.9; commitid xX7NbMeBP9T4Gkss; 1.9 date 2007.07.31.10.15.19; author rse; state Exp; branches; next 1.8; commitid FjmPGwRUIZxweUrs; 1.8 date 2005.08.01.11.06.45; author thl; state Exp; branches; next 1.7; 1.7 date 2005.01.20.15.51.35; author ms; state Exp; branches; next 1.6; 1.6 date 2004.12.14.11.57.14; author ms; state Exp; branches; next 1.5; 1.5 date 2004.08.31.11.07.28; author tho; state Exp; branches; next 1.4; 1.4 date 2004.06.07.12.25.33; author thl; state Exp; branches; next 1.3; 1.3 date 2003.02.18.14.21.53; author rse; state Exp; branches; next 1.2; 1.2 date 2002.10.02.19.42.54; author rse; state dead; branches 1.2.2.1; next 1.1; 1.1 date 2002.08.05.11.06.49; author ms; state Exp; branches; next ; 1.2.2.1 date 2003.07.24.20.44.11; author rse; state Exp; branches; next ; desc @@ 1.17 log @fix building under with_perl=yes @ text @Index: lib/graph/graphio.c --- lib/graph/graphio.c.orig 2009-03-09 19:16:00 +0100 +++ lib/graph/graphio.c 2009-03-11 20:43:50 +0100 @@@@ -193,7 +193,7 @@@@ { if (myfgets) AG.fgets = myfgets; if (myfwrite) AG.fwrite = myfwrite; -#if defined(__SUNPRO_C) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__FreeBSD__) +#if 1 || defined(__SUNPRO_C) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__FreeBSD__) #undef ferror #endif if (myferror) AG.ferror = myferror; @@@@ -581,7 +581,7 @@@@ free(dict); } -#ifdef ferror +#if 1 /* if ferror is a macro (__SUNPRO_C __CYGWIN__ __MINGW32__ __FreeBSD__ and poss others) * then wrap it in a function */ static int agferror(FILE *stream) @@@@ -600,7 +600,7 @@@@ AG.fwrite = fwrite; /* init to system version of fwrite() */ } if (AG.ferror == NULL) { -#ifdef ferror +#if 1 #undef ferror /* if ferror is a macro, then use our wrapper function, but * undef the macro first so it doesn't subst in "AG.ferror" */ Index: lib/sfio/Makefile sed: -e expression #1, char 19: unknown option to `s' Index: lib/sfio/sfhdr.h --- lib/sfio/sfhdr.h.orig 2009-02-05 20:21:15 +0100 +++ lib/sfio/sfhdr.h 2009-03-11 20:39:44 +0100 @@@@ -143,6 +143,10 @@@@ #include #include +#ifndef va_copy +#define va_copy(to,fr) ((to)=(fr)) +#endif + #if vt_threaded /* initialization */ @@@@ -254,7 +258,9 @@@@ #include #else #if _hdr_values +#ifdef HAVE_VALUES_H #include +#endif #if !defined(SF_MAXDOUBLE) && defined(MAXDOUBLE) #define SF_MAXDOUBLE MAXDOUBLE #endif Index: plugin/gd/gvrender_gd.c --- plugin/gd/gvrender_gd.c.orig 2009-02-18 14:36:50 +0100 +++ plugin/gd/gvrender_gd.c 2009-03-11 20:39:44 +0100 @@@@ -33,6 +33,10 @@@@ #ifdef HAVE_LIBGD #include "gd.h" +#ifndef HAVE_GD_FONTCONFIG +#define HAVE_GD_FONTCONFIG +#endif + typedef enum { FORMAT_GIF, FORMAT_JPEG, Index: plugin/gd/gvtextlayout_gd.c --- plugin/gd/gvtextlayout_gd.c.orig 2008-10-30 23:06:59 +0100 +++ plugin/gd/gvtextlayout_gd.c 2009-03-11 20:39:44 +0100 @@@@ -26,6 +26,10 @@@@ #ifdef HAVE_LIBGD #include "gd.h" +#ifndef HAVE_GD_FONTCONFIG +#define HAVE_GD_FONTCONFIG +#endif + #if defined(HAVE_LIBGD) && defined(HAVE_GD_FREETYPE) /* fontsize at which text is omitted entirely */ Index: GraphViz-Data-Structure-0.17/Makefile.PL --- GraphViz-Data-Structure-0.17/Makefile.PL.orig 2007-09-13 20:17:00 +0200 +++ GraphViz-Data-Structure-0.17/Makefile.PL 2009-03-12 17:36:27 +0100 @@@@ -8,7 +8,7 @@@@ die "You must install the graphviz package (http://www.graphviz.org) before using this module.\n"; } else { - my (@@v) = ($dot_version =~ /dot (?:- Graphviz )?version (\d+)\.(\d+)/); + my (@@v) = ($dot_version =~ /dot (?:- Graphviz )?version (\d+)\.(\d+)/i); if ( $v[0] < 2 || $v[1] < 2 ) { die "You must have at least version 2.2 of dot to use this module (found $v[0].$v[1])"; } @ 1.16 log @upgrading package: graphviz 2.22.0 -> 2.22.1 @ text @d85 12 @ 1.15 log @upgrading package: graphviz 2.20.3 -> 2.22.0 @ text @d1 32 d34 2 a35 2 --- lib/sfio/sfhdr.h.orig 2008-02-22 15:21:42 +0100 +++ lib/sfio/sfhdr.h 2008-03-11 08:09:41 +0100 d58 3 a60 3 --- plugin/gd/gvrender_gd.c.orig 2008-03-04 00:01:52 +0100 +++ plugin/gd/gvrender_gd.c 2008-03-11 08:09:41 +0100 @@@@ -34,6 +34,10 @@@@ d72 3 a74 3 --- plugin/gd/gvtextlayout_gd.c.orig 2008-03-06 22:40:02 +0100 +++ plugin/gd/gvtextlayout_gd.c 2008-03-11 08:09:41 +0100 @@@@ -29,6 +29,10 @@@@ a84 30 Index: lib/graph/graphio.c --- lib/graph/graphio.c.orig 2009-03-02 18:46:34 +0100 +++ lib/graph/graphio.c 2009-03-04 23:03:28 +0100 @@@@ -193,7 +193,7 @@@@ { if (myfgets) AG.fgets = myfgets; if (myfwrite) AG.fwrite = myfwrite; -#if defined(__SUNPRO_C) || defined(__CYGWIN__) || defined(__MINGW32__) +#if 1 || defined(__SUNPRO_C) || defined(__CYGWIN__) || defined(__MINGW32__) #undef ferror #endif if (myferror) AG.ferror = myferror; @@@@ -581,7 +581,7 @@@@ free(dict); } -#if defined(__SUNPRO_C) || defined(__CYGWIN__) || defined(__MINGW32__) +#if 1 || defined(__SUNPRO_C) || defined(__CYGWIN__) || defined(__MINGW32__) /* for systems where ferror is a macro */ static int agferror(FILE *stream) { @@@@ -599,7 +599,7 @@@@ AG.fwrite = fwrite; /* init to system version of fwrite() */ } if (AG.ferror == NULL) { -#if defined(__SUNPRO_C) || defined(__CYGWIN__) || defined(__MINGW32__) +#if 1 || defined(__SUNPRO_C) || defined(__CYGWIN__) || defined(__MINGW32__) #undef ferror AG.ferror = agferror; /* init to ferror macro wrapper function */ #else @ 1.14 log @upgrading package: graphviz 2.18 -> 2.20.0 @ text @d53 30 @ 1.13 log @upgrading package: graphviz 2.16.1 -> 2.18 @ text @a0 56 Index: cmd/dot/Makefile.am --- cmd/dot/Makefile.am.orig 2008-02-23 01:48:35 +0100 +++ cmd/dot/Makefile.am 2008-03-11 18:46:16 +0100 @@@@ -70,26 +70,52 @@@@ # like $(top_srcdir)/lib/gvc/dot_builtins.c dot_static_SOURCES = dot.c $(top_srcdir)/lib/gvc/no_demand_loading.c dot_static_LDFLAGS = -export-dynamic -dlpreopen self -export-symbols-regex '.*_LTX_library' +if WITH_PANGOCAIRO +dot_static_LDADD = \ + $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \ + $(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \ + $(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \ + $(top_builddir)/lib/gvc/libgvc_C.la \ + $(top_builddir)/lib/pathplan/libpathplan_C.la \ + $(top_builddir)/lib/graph/libgraph_C.la \ + $(top_builddir)/lib/cdt/libcdt_C.la \ + @@ICONV_LIBS@@ @@EXPAT_LIBS@@ @@Z_LIBS@@ @@LIBGEN_LIBS@@ @@LIBLTDL@@ @@SOCKET_LIBS@@ @@IPSEPCOLA_LIBS@@ @@MATH_LIBS@@ +else dot_static_LDADD = \ $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \ $(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \ $(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \ + $(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a \ $(top_builddir)/lib/gvc/libgvc_C.la \ $(top_builddir)/lib/pathplan/libpathplan_C.la \ $(top_builddir)/lib/graph/libgraph_C.la \ $(top_builddir)/lib/cdt/libcdt_C.la \ @@ICONV_LIBS@@ @@EXPAT_LIBS@@ @@Z_LIBS@@ @@LIBGEN_LIBS@@ @@LIBLTDL@@ @@SOCKET_LIBS@@ @@IPSEPCOLA_LIBS@@ @@MATH_LIBS@@ +endif dot_builtins_SOURCES = dot.c $(top_srcdir)/lib/gvc/dot_builtins.c $(top_srcdir)/lib/gvc/no_demand_loading.c +if WITH_PANGOCAIRO +dot_builtins_LDADD = \ + $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \ + $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \ + $(top_builddir)/plugin/core/libgvplugin_core.la \ + $(top_builddir)/lib/gvc/libgvc_builtins.la \ + $(top_builddir)/lib/pathplan/libpathplan.la \ + $(top_builddir)/lib/graph/libgraph.la \ + $(top_builddir)/lib/cdt/libcdt.la \ + @@ICONV_LIBS@@ @@EXPAT_LIBS@@ @@Z_LIBS@@ @@LIBGEN_LIBS@@ @@LIBLTDL@@ @@SOCKET_LIBS@@ @@IPSEPCOLA_LIBS@@ @@MATH_LIBS@@ +else dot_builtins_LDADD = \ $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \ $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \ $(top_builddir)/plugin/core/libgvplugin_core.la \ + $(top_builddir)/plugin/gd/libgvplugin_gd.la \ $(top_builddir)/lib/gvc/libgvc_builtins.la \ $(top_builddir)/lib/pathplan/libpathplan.la \ $(top_builddir)/lib/graph/libgraph.la \ $(top_builddir)/lib/cdt/libcdt.la \ @@ICONV_LIBS@@ @@EXPAT_LIBS@@ @@Z_LIBS@@ @@LIBGEN_LIBS@@ @@LIBLTDL@@ @@SOCKET_LIBS@@ @@IPSEPCOLA_LIBS@@ @@MATH_LIBS@@ +endif if WITH_LIBGD if WITH_MYLIBGD @ 1.12 log @upgrading package: graphviz 2.14.1 -> 2.16 @ text @d1 56 d58 2 a59 2 --- lib/sfio/sfhdr.h.orig Fri Apr 27 04:17:42 2001 +++ lib/sfio/sfhdr.h Tue Feb 18 19:26:37 2003 d72 1 a72 1 #include d82 2 a83 2 --- plugin/gd/gvrender_gd.c.orig 2007-11-08 20:42:15 +0100 +++ plugin/gd/gvrender_gd.c 2007-11-10 18:37:15 +0100 d96 2 a97 2 --- plugin/gd/gvtextlayout_gd.c.orig 2007-11-08 20:42:15 +0100 +++ plugin/gd/gvtextlayout_gd.c 2007-11-10 18:37:31 +0100 a108 57 Index: cmd/dot/Makefile.am --- cmd/dot/Makefile.am 2007/08/28 12:28:57 1.1 +++ cmd/dot/Makefile.am 2007/08/28 13:08:51 @@@@ -96,6 +96,7 @@@@ @@ICONV_LIBS@@ @@FONTCONFIG_LIBS@@ @@FREETYPE2_LIBS@@ @@JPEG_LIBS@@ @@PNG_LIBS@@ @@EXPAT_LIBS@@ @@Z_LIBS@@ @@LIBGEN_LIBS@@ @@LIBLTDL@@ @@SOCKET_LIBS@@ @@IPSEPCOLA_LIBS@@ @@MATH_LIBS@@ endif else +if WITH_PANGOCAIRO dot_static_LDADD = \ $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \ $(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \ @@@@ -107,6 +108,18 @@@@ $(top_builddir)/lib/graph/libgraph_C.la \ $(top_builddir)/lib/cdt/libcdt_C.la \ @@GD_LIBS@@ @@ICONV_LIBS@@ @@FONTCONFIG_LIBS@@ @@FREETYPE2_LIBS@@ @@JPEG_LIBS@@ @@PNG_LIBS@@ @@EXPAT_LIBS@@ @@Z_LIBS@@ @@LIBGEN_LIBS@@ @@LIBLTDL@@ @@SOCKET_LIBS@@ @@IPSEPCOLA_LIBS@@ @@PANGOCAIRO_LIBS@@ @@MATH_LIBS@@ +else +dot_static_LDADD = \ + $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \ + $(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \ + $(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \ + $(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a \ + $(top_builddir)/lib/gvc/libgvc_C.la \ + $(top_builddir)/lib/pathplan/libpathplan_C.la \ + $(top_builddir)/lib/graph/libgraph_C.la \ + $(top_builddir)/lib/cdt/libcdt_C.la \ + @@GD_LIBS@@ @@ICONV_LIBS@@ @@FONTCONFIG_LIBS@@ @@FREETYPE2_LIBS@@ @@JPEG_LIBS@@ @@PNG_LIBS@@ @@EXPAT_LIBS@@ @@Z_LIBS@@ @@LIBGEN_LIBS@@ @@LIBLTDL@@ @@SOCKET_LIBS@@ @@IPSEPCOLA_LIBS@@ @@PANGOCAIRO_LIBS@@ @@MATH_LIBS@@ +endif endif dot_builtins_SOURCES =3D dot.c $(top_srcdir)/lib/gvc/dot_builtins.c $(top_srcdir)/lib/gvc/no_demand_loading.c @@@@ -138,6 +151,7 @@@@ @@ICONV_LIBS@@ @@FONTCONFIG_LIBS@@ @@FREETYPE2_LIBS@@ @@JPEG_LIBS@@ @@PNG_LIBS@@ @@EXPAT_LIBS@@ @@Z_LIBS@@ @@LIBGEN_LIBS@@ @@LIBLTDL@@ @@SOCKET_LIBS@@ @@IPSEPCOLA_LIBS@@ @@MATH_LIBS@@ endif else +if WITH_PANGOCAIRO dot_builtins_LDADD = \ $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \ $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \ @@@@ -149,6 +163,18 @@@@ $(top_builddir)/lib/graph/libgraph.la \ $(top_builddir)/lib/cdt/libcdt.la \ @@GD_LIBS@@ @@ICONV_LIBS@@ @@FONTCONFIG_LIBS@@ @@FREETYPE2_LIBS@@ @@JPEG_LIBS@@ @@PNG_LIBS@@ @@EXPAT_LIBS@@ @@Z_LIBS@@ @@LIBGEN_LIBS@@ @@LIBLTDL@@ @@SOCKET_LIBS@@ @@IPSEPCOLA_LIBS@@ @@PANGOCAIRO_LIBS@@ @@MATH_LIBS@@ +else +dot_builtins_LDADD = \ + $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \ + $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \ + $(top_builddir)/plugin/core/libgvplugin_core.la \ + $(top_builddir)/plugin/gd/libgvplugin_gd.la \ + $(top_builddir)/lib/gvc/libgvc_builtins.la \ + $(top_builddir)/lib/pathplan/libpathplan.la \ + $(top_builddir)/lib/graph/libgraph.la \ + $(top_builddir)/lib/cdt/libcdt.la \ + @@GD_LIBS@@ @@ICONV_LIBS@@ @@FONTCONFIG_LIBS@@ @@FREETYPE2_LIBS@@ @@JPEG_LIBS@@ @@PNG_LIBS@@ @@EXPAT_LIBS@@ @@Z_LIBS@@ @@LIBGEN_LIBS@@ @@LIBLTDL@@ @@SOCKET_LIBS@@ @@IPSEPCOLA_LIBS@@ @@PANGOCAIRO_LIBS@@ @@MATH_LIBS@@ +endif endif @ 1.11 log @fix building without pango (and its cairo backend), disable building against pango by default and allow one to use 'with_pango' to build against pango again @ text @d26 3 a28 3 --- plugin/gd/gvrender_gd.c.orig 2007-08-02 19:42:57 +0200 +++ plugin/gd/gvrender_gd.c 2007-08-03 19:48:37 +0200 @@@@ -33,6 +33,10 @@@@ d36 3 a38 3 typedef enum { FORMAT_GD, FORMAT_GD2, FORMAT_GIF, FORMAT_JPEG, FORMAT_PNG, FORMAT_WBMP, FORMAT_XBM, } format_type; d40 3 a42 3 --- plugin/gd/gvtextlayout_gd.c.orig 2007-07-20 20:38:03 +0200 +++ plugin/gd/gvtextlayout_gd.c 2007-08-03 19:49:31 +0200 @@@@ -26,6 +26,10 @@@@ d50 1 a50 1 #if defined(HAVE_LIBGD) && defined(HAVE_LIBFREETYPE) && defined(HAVE_GD_FREETYPE) @ 1.10 log @upgrading package: graphviz 2.12 -> 2.14 @ text @d53 57 @ 1.9 log @fix building and cleanup packaging @ text @d25 6 a30 24 Index: contrib/diffimg/Makefile.in --- contrib/diffimg/Makefile.in.orig 2006-12-04 23:03:15 +0100 +++ contrib/diffimg/Makefile.in 2007-07-31 12:04:04 +0200 @@@@ -54,8 +54,8 @@@@ PROGRAMS = $(noinst_PROGRAMS) am_diffimg_OBJECTS = diffimg.$(OBJEXT) diffimg_OBJECTS = $(am_diffimg_OBJECTS) -@@WITH_LIBGD_TRUE@@diffimg_DEPENDENCIES = \ -@@WITH_LIBGD_TRUE@@ $(top_builddir)/lib/gd/libgvgd_C.la +@@WITH_LIBGD_FALSE@@diffimg_DEPENDENCIES = \ +@@WITH_LIBGD_FALSE@@ $(top_builddir)/lib/gd/libgvgd_C.la DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles @@@@ -367,9 +367,9 @@@@ target_alias = @@target_alias@@ AM_CPPFLAGS = @@GD_INCLUDES@@ diffimg_SOURCES = diffimg.c -@@WITH_LIBGD_FALSE@@diffimg_LDADD = @@GD_LIBS@@ -@@WITH_LIBGD_TRUE@@diffimg_LDADD = $(top_builddir)/lib/gd/libgvgd_C.la \ -@@WITH_LIBGD_TRUE@@ @@FC_LIBS@@ @@FT_LIBS@@ @@JPEG_LIBS@@ @@PNG_LIBS@@ @@Z_LIBS@@ @@MATH_LIBS@@ +@@WITH_LIBGD_TRUE@@diffimg_LDADD = @@GD_LIBS@@ +@@WITH_LIBGD_FALSE@@diffimg_LDADD = $(top_builddir)/lib/gd/libgvgd_C.la \ +@@WITH_LIBGD_FALSE@@ @@FC_LIBS@@ @@FT_LIBS@@ @@JPEG_LIBS@@ @@PNG_LIBS@@ @@Z_LIBS@@ @@MATH_LIBS@@ d32 21 a52 2 GRAPH = "digraph G { hello -> world }" CLEANFILES = *.png @ 1.8 log @upgrading package: graphviz 2.2.1 -> 2.4 @ text @d25 27 @ 1.7 log @upgrading package: graphviz 2.0 -> 2.2 @ text @d1 3 a3 3 Index: tools/sfio/sfhdr.h --- tools/sfio/sfhdr.h.orig Fri Apr 27 04:17:42 2001 +++ tools/sfio/sfhdr.h Tue Feb 18 19:26:37 2003 a24 71 Index: lefty/common.h --- lefty/common.h.orig 2004-08-25 00:52:28 +0200 +++ lefty/common.h 2004-08-31 10:57:50 +0200 @@@@ -69,12 +69,15 @@@@ #ifdef HAVE_STRING_H #include #endif -#ifdef HAVE_LIMITS_H -#include +#ifdef HAVE_INTTYPES_H +#include #endif #ifdef HAVE_SYS_TYPES_H #include #endif +#ifdef HAVE_LIMITS_H +#include +#endif #ifdef HAVE_SYS_SELECT_H #include #endif Index: Makefile.in --- Makefile.in.orig 2004-08-31 00:31:22 +0200 +++ Makefile.in 2004-08-31 12:32:12 +0200 @@@@ -288,8 +288,7 @@@@ txt_DATA = $(txt) SUBDIRS = cdt agraph agutil doc pathplan graph gd dotneato \ dotty graphs lefty lneato ns \ - tclstubs tclhandle gdtclft tcldot tclpathplan \ - tkstubs tkspline tools contrib dynagraph + tools contrib dynagraph EXTRA_DIST = $(txt) $(html) graphviz.spec.in graphviz.spec graphviz.cvt \ autogen.sh config/depcomp config/config.rpath ast_common.h.in \ Index: dotneato/dotgen/Makefile.in --- dotneato/dotgen/Makefile.in.orig 2004-12-11 21:43:25 +0100 +++ dotneato/dotgen/Makefile.in 2004-12-14 12:41:39 +0100 @@@@ -299,7 +300,8 @@@@ libdotgen_la_LIBADD = \ $(top_builddir)/pathplan/libpathplan.la \ - $(top_builddir)/graph/libgraph.la + $(top_builddir)/graph/libgraph.la \ + $(top_builddir)/dotneato/common/libcommon.la EXTRA_DIST = Makefile.old all: all-am Index: dotneato/neatogen/Makefile.in --- dotneato/neatogen/Makefile.in.orig 2004-12-11 21:43:28 +0100 +++ dotneato/neatogen/Makefile.in 2004-12-14 12:50:39 +0100 @@@@ -312,7 +312,8 @@@@ libneatogen_la_LIBADD = \ $(top_builddir)/dotneato/pack/libpack.la \ $(top_builddir)/pathplan/libpathplan.la \ - $(top_builddir)/graph/libgraph.la + $(top_builddir)/graph/libgraph.la \ + $(top_builddir)/dotneato/common/libcommon.la EXTRA_DIST = Makefile.old all: all-am Index: dotneato/common/Makefile.in --- dotneato/common/Makefile.in.orig 2005-01-20 16:46:13 +0100 +++ dotneato/common/Makefile.in 2005-01-20 16:46:23 +0100 @@@@ -294,6 +294,7 @@@@ -I$(top_srcdir)/pathplan \ -I$(top_srcdir)/graph \ -I$(top_srcdir)/cdt \ + -I$(top_srcdir)/gd \ @@GD_INCLUDES@@ @@EXPAT_INCLUDES@@ @@LIBSVG_CAIRO_CFLAGS@@ @@Z_INCLUDES@@ pkginclude_HEADERS = const.h globals.h htmllex.h htmltable.h macros.h \ @ 1.6 log @upgrading package: graphviz 1.16 -> 2.0 @ text @d15 1 a15 1 @@@@ -230,7 +234,9 @@@@ d49 2 a50 2 @@@@ -293,8 +293,7 @@@@ html_DATA = $(html) d85 11 @ 1.5 log @upgrading package: graphviz 1.12 -> 1.14 @ text @d1 1 d4 1 a4 1 @@@@ -122,6 +122,10 @@@@ d16 2 a17 2 #endif a24 1 d28 1 a28 1 @@@@ -62,15 +62,18 @@@@ d32 2 d36 6 a41 3 +#endif +#ifdef HAVE_SYS_TYPES_H +#include a45 9 #ifdef HAVE_LIMITS_H #include #endif -#ifdef HAVE_SYS_TYPES_H -#include -#endif #ifdef HAVE_SYS_STAT_H #include #endif d49 1 a49 1 @@@@ -290,8 +290,7 @@@@ d57 28 a84 2 EXTRA_DIST = $(txt) $(html) graphviz.spec.in graphviz.spec \ graphviz.cvt autogen.sh config/depcomp config/config.rpath ast_common.h.in \ @ 1.4 log @reorder libs to unbreak SuSE 9.0 @ text @d25 35 a59 11 Index: lefty/Makefile.in --- lefty/Makefile.in.orig 2004-03-02 01:20:39.000000000 +0100 +++ lefty/Makefile.in 2004-06-07 13:49:04.000000000 +0200 @@@@ -231,8 +231,8 @@@@ $(top_builddir)/lefty/ws/x11/libfilereq/libfilereq.la \ $(top_builddir)/lefty/os/unix/libos.la \ @@X_LIBS@@ @@XAW_LIBS@@ -lXt @@X_PRE_LIBS@@ \ - -lXaw -lXmu -lXext -lX11 @@XPM_LIBS@@ \ - @@SOCKET_LIBS@@ @@LIBS@@ + -lXmu -lXext @@XPM_LIBS@@ \ + @@SOCKET_LIBS@@ @@LIBS@@ -lX11 d61 2 a62 2 EXTRA_DIST = $(lefty_SCRIPTS) $(lefty_SOURCES) lefty.1 colors.txt \ @ 1.3 log @upgrading package: graphviz 1.8.10 -> 1.9 @ text @d24 15 @ 1.2 log @upgrading package: graphviz 1.8.9 -> 1.8.10 @ text @d1 14 a14 8 --- contrib/prune/prune.c.orig Mon Aug 5 12:54:43 2002 +++ contrib/prune/prune.c Mon Aug 5 12:54:46 2002 @@@@ -25,7 +25,7 @@@@ #ifdef HAVE_GETOPT_H #include #else -#include "compat_getopt_h" +#include "compat_getopt.h" d17 7 a23 1 #include @ 1.2.2.1 log @mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class BASE only] @ text @d1 8 a8 14 --- tools/sfio/sfhdr.h.orig Fri Apr 27 04:17:42 2001 +++ tools/sfio/sfhdr.h Tue Feb 18 19:26:37 2003 @@@@ -122,6 +122,10 @@@@ #include #include +#ifndef va_copy +#define va_copy(to,fr) ((to)=(fr)) +#endif + #if vt_threaded /* initialization */ @@@@ -230,7 +234,9 @@@@ d11 1 a11 7 #if _hdr_values +#ifdef HAVE_VALUES_H #include +#endif #if !defined(SF_MAXDOUBLE) && defined(MAXDOUBLE) #define SF_MAXDOUBLE MAXDOUBLE #endif @ 1.1 log @Fix a shameless bug in graphviz contrib. @ text @@