From 2b152fa693eaf91156543239bd95548edd2d3052 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Fri, 19 Mar 2010 03:48:21 +0000 Subject: [PATCH] Update graphviz to 2.26.3. --- media-gfx/graphviz/graphviz-2.26.3.bep | 21 +++++ .../graphviz.OptionalPackageDescription | 4 +- .../graphviz/patches/graphviz-2.26.3.patch | 90 +++++++++++++++++++ 3 files changed, 113 insertions(+), 2 deletions(-) create mode 100644 media-gfx/graphviz/graphviz-2.26.3.bep create mode 100644 media-gfx/graphviz/patches/graphviz-2.26.3.patch diff --git a/media-gfx/graphviz/graphviz-2.26.3.bep b/media-gfx/graphviz/graphviz-2.26.3.bep new file mode 100644 index 000000000..32025e45f --- /dev/null +++ b/media-gfx/graphviz/graphviz-2.26.3.bep @@ -0,0 +1,21 @@ +DESCRIPTION="graphviz - Open Source Graph Visualization Software." +HOMEPAGE="http://www.graphviz.org/" +SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.26.3.tar.gz" +CHECKSUM_MD5="6f45946fa622770c45609778c0a982ee" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd graphviz-2.26.3 + libtoolize --force --copy --install + autoconf + ./configure --prefix=/boot/common --disable-shared --enable-static --disable-perl CFLAGS="-O0" LDFLAGS="-L/boot/common/lib -liconv" + make +} + +INSTALL { + cd graphviz-2.26.3 + make install + cd ${DESTDIR}/boot/common/bin + ln -s dot_static dot +} diff --git a/media-gfx/graphviz/graphviz.OptionalPackageDescription b/media-gfx/graphviz/graphviz.OptionalPackageDescription index c78d22a23..53ee11449 100644 --- a/media-gfx/graphviz/graphviz.OptionalPackageDescription +++ b/media-gfx/graphviz/graphviz.OptionalPackageDescription @@ -1,5 +1,5 @@ Package: graphviz -Version: 2.24 -Copyright: 1994-2008 AT&T Corp. +Version: 2.26.3 +Copyright: 1994-2010 AT&T Corp. License: CPL v1.0 URL: http://www.graphviz.org/ diff --git a/media-gfx/graphviz/patches/graphviz-2.26.3.patch b/media-gfx/graphviz/patches/graphviz-2.26.3.patch new file mode 100644 index 000000000..e0a582001 --- /dev/null +++ b/media-gfx/graphviz/patches/graphviz-2.26.3.patch @@ -0,0 +1,90 @@ +diff -up graphviz-2.26.3/config.h.in.orig graphviz-2.26.3/config.h.in +--- graphviz-2.26.3/config.h.in.orig 2010-01-26 09:01:14.030408704 -0700 ++++ graphviz-2.26.3/config.h.in 2010-03-18 18:06:58.060555264 -0600 +@@ -427,6 +427,9 @@ + /* Define to 1 if you have struct dioattr */ + #undef HAVE_STRUCT_DIOATTR + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYSEXITS_H ++ + /* Define to 1 if you have the header file, and it defines `DIR'. + */ + #undef HAVE_SYS_DIR_H +@@ -578,6 +581,9 @@ + /* Define to the one symbol short name of this package. */ + #undef PACKAGE_TARNAME + ++/* Define to the home page for this package. */ ++#undef PACKAGE_URL ++ + /* Define to the version of this package. */ + #undef PACKAGE_VERSION + +diff -up graphviz-2.26.3/configure.ac.orig graphviz-2.26.3/configure.ac +--- graphviz-2.26.3/configure.ac.orig 2010-01-26 09:00:29.029622272 -0700 ++++ graphviz-2.26.3/configure.ac 2010-03-18 18:03:33.265289728 -0600 +@@ -111,6 +111,7 @@ UWIN=no + CYGWIN=no + MINGW32=no + DARWIN9=no ++HAIKU=no + case "${host_os}" in + *uwin* ) + UWIN=yes +@@ -160,6 +161,16 @@ case "${host_os}" in + BROWSER="open" + AC_DEFINE_UNQUOTED(DARWIN_DYLIB,"$DARWIN_DYLIB",[Define for Darwin-style shared library names.]) + ;; ++ *haiku* ) ++ HAIKU=yes ++ HAIKU_SYSTEM_FONTPATH=`finddir B_SYSTEM_FONTS_DIRECTORY` ++ HAIKU_COMMON_FONTPATH=`finddir B_COMMON_FONTS_DIRECTORY` ++ HAIKU_USER_FONTPATH=`finddir B_USER_FONTS_DIRECTORY` ++ DEFAULT_FONTPATH="$HAIKU_SYSTEM_FONTPATH:$HAIKU_SYSTEM_FONTPATH/ttfonts:$HAIKU_SYSTEM_FONTPATH/psfonts:$HAIKU_COMMON_FONTPATH:$HAIKU_COMMON_FONTPATH/ttfonts:$HAIKU_COMMON_FONTPATH/psfonts:$HAIKU_USER_FONTPATH:$HAIKU_USER_FONTPATH/ttfonts:$HAIKU_USER_FONTPATH/psfonts" ++ PATHSEPARATOR=":" ++ NO_POSTSCRIPT_ALIAS=1 ++ BROWSER="open" ++ ;; + * ) # This sucks! Whatever happened to standards for file system layout? + DEFAULT_FONTPATH="/usr/share/fonts/default/Type1:/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf"; + PATHSEPARATOR=":" +@@ -370,7 +381,7 @@ AC_CHECK_HEADERS(stdarg.h stddef.h stdde + errno.h time.h unistd.h fenv.h string.h strings.h inttypes.h setjmp.h \ + sys/time.h sys/times.h sys/types.h sys/select.h fpu_control.h \ + sys/fpu.h sys/socket.h sys/stat.h sys/mman.h \ +- sys/ioctl.h sys/inotify.h langinfo.h libintl.h crt_externs.h) ++ sys/ioctl.h sys/inotify.h langinfo.h libintl.h crt_externs.h sysexits.h) + AC_HEADER_TIME + AC_HEADER_DIRENT + AC_HEADER_STDBOOL +diff -up graphviz-2.26.3/contrib/diffimg/diffimg.c.orig graphviz-2.26.3/contrib/diffimg/diffimg.c +--- graphviz-2.26.3/contrib/diffimg/diffimg.c.orig 2009-06-02 19:10:49.038797312 -0600 ++++ graphviz-2.26.3/contrib/diffimg/diffimg.c 2010-03-18 18:03:33.270270464 -0600 +@@ -47,7 +47,14 @@ + #define bool int + #define false 0 + #else ++#if defined HAVE_SYSEXITS_H + #include ++#else ++#define EX_USAGE 64 ++#define EX_DATAERR 65 ++#define EX_NOINPUT 66 ++#define EX_UNAVAILABLE 69 ++#endif + #endif + #include + #if defined HAVE_STDBOOL_H && ! defined __cplusplus +diff -up graphviz-2.26.3/lib/gd/gd_png.c.orig graphviz-2.26.3/lib/gd/gd_png.c +--- graphviz-2.26.3/lib/gd/gd_png.c.orig 2010-03-18 18:15:35.528482304 -0600 ++++ graphviz-2.26.3/lib/gd/gd_png.c 2010-03-18 18:16:36.045350912 -0600 +@@ -150,7 +150,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFro + return NULL; + } + +- if (!png_check_sig (sig, 8)) { /* bad signature */ ++ if (png_sig_cmp(sig, 0, 8)) { /* bad signature */ + return NULL; /* bad signature */ + } +