diff options
author | seb <seb> | 2005-04-20 12:37:57 +0000 |
---|---|---|
committer | seb <seb> | 2005-04-20 12:37:57 +0000 |
commit | b5444b3a72dcbded153202e0b4f144b046c6cb82 (patch) | |
tree | 7b29bedad16e67a2d0481dc398769eb26e798de1 /graphics | |
parent | 193d3ae135ee5a7a7319b2b8bbf96813351c04ab (diff) | |
download | pkgsrc-b5444b3a72dcbded153202e0b4f144b046c6cb82.tar.gz |
Update to version 2.2.1.
Use USE_NEW_TOOLS.
Changes since last packaged version (2.2):
April 7, 2005
- correct license headers to CPL in .cpp files
- undo indentation cleanup to dynagraph .h files
- fix bugs: 183, 247, 419, 615, 616, 625, 626, 627, 643,
646, 651, 658, 661, 664, 674
- fix buffer overrun in Gvfilepath construction
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/graphviz/Makefile | 5 | ||||
-rw-r--r-- | graphics/graphviz/distinfo | 10 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-ac | 22 |
3 files changed, 19 insertions, 18 deletions
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 649d5ad63fa..a06c7a771a5 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2005/04/11 21:46:04 tv Exp $ +# $NetBSD: Makefile,v 1.31 2005/04/20 12:37:57 seb Exp $ # -DISTNAME= graphviz-2.2 +DISTNAME= graphviz-2.2.1 CATEGORIES= graphics MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ @@ -18,6 +18,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_X11= yes +USE_NEW_TOOLS= yes XAW_TYPE= standard PKGCONFIG_OVERRIDE= */*.pc */*/*.pc PKGCONFIG_OVERRIDE_STAGE= post-build diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo index be07bb6c9e5..b49b5503928 100644 --- a/graphics/graphviz/distinfo +++ b/graphics/graphviz/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.15 2005/03/19 09:13:57 seb Exp $ +$NetBSD: distinfo,v 1.16 2005/04/20 12:37:57 seb Exp $ -SHA1 (graphviz-2.2/graphviz-2.2.tar.gz) = 2583bdd3ff082bf3a93ad7313b3261bea23a0f90 -RMD160 (graphviz-2.2/graphviz-2.2.tar.gz) = d1f97c236d045a43f8369f2fba3e4167b778eda7 -Size (graphviz-2.2/graphviz-2.2.tar.gz) = 4379295 bytes +SHA1 (graphviz-2.2.1/graphviz-2.2.1.tar.gz) = ee32fef44627289e6631e0606c3e8aeb619924aa +RMD160 (graphviz-2.2.1/graphviz-2.2.1.tar.gz) = 9e82389d40dfa71643ba1a8b0867051fe32175d2 +Size (graphviz-2.2.1/graphviz-2.2.1.tar.gz) = 4371071 bytes SHA1 (patch-ab) = c04269613e3e7ecefe9492b075d3303a1f125515 -SHA1 (patch-ac) = 6c48703788578a30473ceb079b286cbfeb2974f8 +SHA1 (patch-ac) = bd1e35aed1fa7ed9f42f37717bdbb139715efa37 SHA1 (patch-ad) = 93c24f960bf5bfb405ab2d8751efc1e652cd92a0 SHA1 (patch-ae) = 9255ba6000a7ebc3483d915ff8468e3a448200f8 SHA1 (patch-af) = 37d2492fd95256fb7b4031d5013c068c89a27946 diff --git a/graphics/graphviz/patches/patch-ac b/graphics/graphviz/patches/patch-ac index 9e0790ebb2f..8bec19df230 100644 --- a/graphics/graphviz/patches/patch-ac +++ b/graphics/graphviz/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.12 2005/03/19 09:13:57 seb Exp $ +$NetBSD: patch-ac,v 1.13 2005/04/20 12:37:58 seb Exp $ ---- configure.orig 2005-03-18 11:35:11.000000000 +0000 +--- configure.orig 2005-04-20 09:09:43.000000000 +0000 +++ configure @@ -464,7 +464,7 @@ ac_includes_default="\ # include <unistd.h> #endif" --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CYGWIN MINGW32 DARWIN INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar BUILDDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SED SORT KSH TOP_DIR BUILD_DIR ENABLE_DYNAGRAPH_TRUE ENABLE_DYNAGRAPH_FALSE ENABLE_GVRENDER_TRUE ENABLE_GVRENDER_FALSE ENABLE_CODEGENS_TRUE ENABLE_CODEGENS_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WITH_X_TRUE WITH_X_FALSE TCLSH TCL_INCLUDES HAVE_TCL WITH_TCL_TRUE WITH_TCL_FALSE TCL_PKGINDEX TCL_VERSION TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_CFLAGS TCL_DEFS TCL_SHLIB_SUFFIX TCL_SRC_DIR TCL_STUB_LIB_SPEC WISH TK_INCLUDES HAVE_TK WITH_TK_TRUE WITH_TK_FALSE TK_PKGINDEX TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_DEFS TK_XINCLUDES TK_SRC_DIR TK_CFLAGS TK_STUB_LIB_SPEC MATH_LIBS SOCKET_LIBS EXPAT_CONFIG EXPAT_INCLUDES EXPAT_LIBS XPM_INCLUDES XPM_LIBS XAW_INCLUDES XAW_LIBS Z_INCLUDES Z_LIBS GDLIB_CONFIG GD_INCLUDES GD_LIBS WITH_MYLIBGD_TRUE WITH_MYLIBGD_FALSE LIBICONV LTLIBICONV ICONV_INCLUDES ICONV_LIBS FREETYPE_CONFIG FT_INCLUDES FT_LIBS FONTCONFIG_CONFIG FC_INCLUDES FC_LIBS LIBPNG_CONFIG PNG_INCLUDES PNG_LIBS JPEG_INCLUDES JPEG_LIBS PKG_CONFIG LIBSVG_CAIRO_CFLAGS LIBSVG_CAIRO_LIBS ALLOCA LIBOBJS TCLINT_INCLUDES TKINT_INCLUDES LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CYGWIN MINGW32 DARWIN INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar BUILDDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SED SORT KSH TOP_DIR BUILD_DIR ENABLE_DYNAGRAPH_TRUE ENABLE_DYNAGRAPH_FALSE ENABLE_GVRENDER_TRUE ENABLE_GVRENDER_FALSE ENABLE_CODEGENS_TRUE ENABLE_CODEGENS_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WITH_X_TRUE WITH_X_FALSE TCL_INCLUDES HAVE_TCL WITH_TCL_TRUE WITH_TCL_FALSE TCL_PKGINDEX TCL_VERSION TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_CFLAGS TCL_DEFS TCL_SHLIB_SUFFIX TCL_SRC_DIR TCL_STUB_LIB_SPEC TK_INCLUDES HAVE_TK WITH_TK_TRUE WITH_TK_FALSE TK_PKGINDEX TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_DEFS TK_XINCLUDES TK_SRC_DIR TK_CFLAGS TK_STUB_LIB_SPEC MATH_LIBS SOCKET_LIBS EXPAT_CONFIG EXPAT_INCLUDES EXPAT_LIBS XPM_INCLUDES XPM_LIBS XAW_INCLUDES XAW_LIBS Z_INCLUDES Z_LIBS GDLIB_CONFIG GD_INCLUDES GD_LIBS WITH_MYLIBGD_TRUE WITH_MYLIBGD_FALSE LIBICONV LTLIBICONV ICONV_INCLUDES ICONV_LIBS FREETYPE_CONFIG FT_INCLUDES FT_LIBS FONTCONFIG_CONFIG FC_INCLUDES FC_LIBS LIBPNG_CONFIG PNG_INCLUDES PNG_LIBS JPEG_INCLUDES JPEG_LIBS PKG_CONFIG LIBSVG_CAIRO_CFLAGS LIBSVG_CAIRO_LIBS ALLOCA LIBOBJS TCLINT_INCLUDES TKINT_INCLUDES LTLIBOBJS' +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CYGWIN MINGW32 DARWIN INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar BUILDDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SED SORT KSH TOP_DIR BUILD_DIR ENABLE_DYNAGRAPH_TRUE ENABLE_DYNAGRAPH_FALSE ENABLE_GVRENDER_TRUE ENABLE_GVRENDER_FALSE ENABLE_CODEGENS_TRUE ENABLE_CODEGENS_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WITH_X_TRUE WITH_X_FALSE TCLSH TCL_INCLUDES HAVE_TCL WITH_TCL_TRUE WITH_TCL_FALSE TCL_PKGINDEX TCL_VERSION TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_CFLAGS TCL_DEFS TCL_SHLIB_SUFFIX TCL_SRC_DIR TCL_STUB_LIB_SPEC WISH TK_INCLUDES HAVE_TK WITH_TK_TRUE WITH_TK_FALSE TK_PKGINDEX TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_DEFS TK_XINCLUDES TK_SRC_DIR TK_CFLAGS TK_STUB_LIB_SPEC MATH_LIBS SOCKET_LIBS EXPAT_CONFIG EXPAT_INCLUDES EXPAT_LIBS XPM_INCLUDES XPM_LIBS XAW_INCLUDES XAW_LIBS Z_INCLUDES Z_LIBS GDLIB_CONFIG GD_INCLUDES GD_LIBS WITH_MYLIBGD_TRUE WITH_MYLIBGD_FALSE LIBICONV LTLIBICONV ICONV_INCLUDES ICONV_LIBS FREETYPE_CONFIG FT_INCLUDES FT_LIBS FONTCONFIG_CONFIG PKG_CONFIG FONTCONFIG_CFLAGS FONTCONFIG_LIBS FC_INCLUDES FC_LIBS LIBPNG_CONFIG PNG_INCLUDES PNG_LIBS JPEG_INCLUDES JPEG_LIBS LIBSVG_CAIRO_CFLAGS LIBSVG_CAIRO_LIBS ALLOCA LIBOBJS TCLINT_INCLUDES TKINT_INCLUDES LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CYGWIN MINGW32 DARWIN INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar BUILDDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SED SORT KSH TOP_DIR BUILD_DIR ENABLE_DYNAGRAPH_TRUE ENABLE_DYNAGRAPH_FALSE ENABLE_GVRENDER_TRUE ENABLE_GVRENDER_FALSE ENABLE_CODEGENS_TRUE ENABLE_CODEGENS_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WITH_X_TRUE WITH_X_FALSE TCL_INCLUDES HAVE_TCL WITH_TCL_TRUE WITH_TCL_FALSE TCL_PKGINDEX TCL_VERSION TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_CFLAGS TCL_DEFS TCL_SHLIB_SUFFIX TCL_SRC_DIR TCL_STUB_LIB_SPEC TK_INCLUDES HAVE_TK WITH_TK_TRUE WITH_TK_FALSE TK_PKGINDEX TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_DEFS TK_XINCLUDES TK_SRC_DIR TK_CFLAGS TK_STUB_LIB_SPEC MATH_LIBS SOCKET_LIBS EXPAT_CONFIG EXPAT_INCLUDES EXPAT_LIBS XPM_INCLUDES XPM_LIBS XAW_INCLUDES XAW_LIBS Z_INCLUDES Z_LIBS GDLIB_CONFIG GD_INCLUDES GD_LIBS WITH_MYLIBGD_TRUE WITH_MYLIBGD_FALSE LIBICONV LTLIBICONV ICONV_INCLUDES ICONV_LIBS FREETYPE_CONFIG FT_INCLUDES FT_LIBS FONTCONFIG_CONFIG PKG_CONFIG FONTCONFIG_CFLAGS FONTCONFIG_LIBS FC_INCLUDES FC_LIBS LIBPNG_CONFIG PNG_INCLUDES PNG_LIBS JPEG_INCLUDES JPEG_LIBS LIBSVG_CAIRO_CFLAGS LIBSVG_CAIRO_LIBS ALLOCA LIBOBJS TCLINT_INCLUDES TKINT_INCLUDES LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -32,7 +32,7 @@ $NetBSD: patch-ac,v 1.12 2005/03/19 09:13:57 seb Exp $ PATHSEPARATOR=":" ;; esac -@@ -21761,165 +21762,9 @@ fi +@@ -21991,165 +21992,9 @@ fi # start by assuming we have it HAVE_TCL=1 @@ -200,7 +200,7 @@ $NetBSD: patch-ac,v 1.12 2005/03/19 09:13:57 seb Exp $ if test "${ac_cv_header_tcl_h+set}" = set; then echo "$as_me:$LINENO: checking for tcl.h" >&5 echo $ECHO_N "checking for tcl.h... $ECHO_C" >&6 -@@ -22067,34 +21912,6 @@ echo "$as_me: WARNING: Unable to find he +@@ -22297,34 +22142,6 @@ echo "$as_me: WARNING: Unable to find he fi @@ -235,7 +235,7 @@ $NetBSD: patch-ac,v 1.12 2005/03/19 09:13:57 seb Exp $ if test "$HAVE_TCL" = "1"; then # TCL STUBS support is required -@@ -22187,168 +22004,9 @@ fi +@@ -22417,168 +22234,9 @@ fi HAVE_TK=$HAVE_TCL @@ -406,7 +406,7 @@ $NetBSD: patch-ac,v 1.12 2005/03/19 09:13:57 seb Exp $ if test "${ac_cv_header_tk_h+set}" = set; then echo "$as_me:$LINENO: checking for tk.h" >&5 echo $ECHO_N "checking for tk.h... $ECHO_C" >&6 -@@ -22496,35 +22154,6 @@ echo "$as_me: WARNING: Unable to find he +@@ -22726,35 +22384,6 @@ echo "$as_me: WARNING: Unable to find he fi @@ -442,7 +442,7 @@ $NetBSD: patch-ac,v 1.12 2005/03/19 09:13:57 seb Exp $ #if test "$HAVE_TK" = "1"; then # # TK STUBS support is required (but support is indicated by TCL_SUPPORTS_STUBS) -@@ -27985,36 +27614,12 @@ rm -f conftest.err conftest.$ac_objext c +@@ -28323,36 +27952,12 @@ rm -f conftest.err conftest.$ac_objext c # ----------------------------------- # tclInt.h @@ -481,7 +481,7 @@ $NetBSD: patch-ac,v 1.12 2005/03/19 09:13:57 seb Exp $ # ----------------------------------- -@@ -29440,7 +29045,6 @@ s,@X_LIBS@,$X_LIBS,;t t +@@ -29778,7 +29383,6 @@ s,@X_LIBS@,$X_LIBS,;t t s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t s,@WITH_X_TRUE@,$WITH_X_TRUE,;t t s,@WITH_X_FALSE@,$WITH_X_FALSE,;t t @@ -489,7 +489,7 @@ $NetBSD: patch-ac,v 1.12 2005/03/19 09:13:57 seb Exp $ s,@TCL_INCLUDES@,$TCL_INCLUDES,;t t s,@HAVE_TCL@,$HAVE_TCL,;t t s,@WITH_TCL_TRUE@,$WITH_TCL_TRUE,;t t -@@ -29455,7 +29059,6 @@ s,@TCL_DEFS@,$TCL_DEFS,;t t +@@ -29793,7 +29397,6 @@ s,@TCL_DEFS@,$TCL_DEFS,;t t s,@TCL_SHLIB_SUFFIX@,$TCL_SHLIB_SUFFIX,;t t s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t s,@TCL_STUB_LIB_SPEC@,$TCL_STUB_LIB_SPEC,;t t |