pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/graphviz Fix more problems in borked recent u...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1115aa3312af
branches: trunk
changeset: 555437:1115aa3312af
user: tron <tron%pkgsrc.org@localhost>
date: Mon Mar 02 11:24:58 2009 +0000
description:
Fix more problems in borked recent update:
1.) Add binary and manual page symlinks which "CHECK_FILES" didn't catch
on my system as there were already present from previous installs.
Problem noted by Hasso Tepper in private e-mail.
2.) Stop the install phase from creating "/usr/lib/lua/5.1" and writing
files to it.
Bump package revision again because of these fixes.
diffstat:
graphics/graphviz/Makefile | 10 ++++++----
graphics/graphviz/PLIST | 12 +++++++++++-
graphics/graphviz/distinfo | 6 +++---
graphics/graphviz/patches/patch-aa | 24 +++++++++++++++++++++---
graphics/graphviz/patches/patch-ab | 30 ++++++++++++++++++++++++------
5 files changed, 65 insertions(+), 17 deletions(-)
diffs (161 lines):
diff -r 318488174361 -r 1115aa3312af graphics/graphviz/Makefile
--- a/graphics/graphviz/Makefile Mon Mar 02 10:25:06 2009 +0000
+++ b/graphics/graphviz/Makefile Mon Mar 02 11:24:58 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2009/03/01 21:58:53 tron Exp $
+# $NetBSD: Makefile,v 1.69 2009/03/02 11:24:58 tron Exp $
DISTNAME= graphviz-2.20.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.graphviz.org/pub/graphviz/stable/SOURCES/
@@ -61,9 +61,11 @@
pre-build:
touch ${WRKSRC}/Makefile
-# Remove file created by re-linking "libgv_lua.la".
+# Remove temporary files and directories created by re-linking "libgv_lua.la".
post-install:
- ${RM} -f ${PREFIX}/lib/graphviz/lua/gv.so
+ ${RM} -rf ${PREFIX}/lib/graphviz/lua/gv.so \
+ ${PREFIX}/lib/graphviz/tcl/tcl ${PREFIX}/lib/lua/5.1/gv.so
+ ${RMDIR} ${PREFIX}/lib/lua/5.1 ${PREFIX}/lib/lua || ${TRUE}
.include "options.mk"
diff -r 318488174361 -r 1115aa3312af graphics/graphviz/PLIST
--- a/graphics/graphviz/PLIST Mon Mar 02 10:25:06 2009 +0000
+++ b/graphics/graphviz/PLIST Mon Mar 02 11:24:58 2009 +0000
@@ -1,7 +1,12 @@
-@comment $NetBSD: PLIST,v 1.27 2009/03/01 21:58:53 tron Exp $
+@comment $NetBSD: PLIST,v 1.28 2009/03/02 11:24:58 tron Exp $
bin/acyclic
bin/bcomps
bin/ccomps
+bin/circo
+bin/dot2gxl
+bin/fdp
+bin/neato
+bin/twopi
bin/dijkstra
bin/dot
bin/dotty
@@ -79,6 +84,11 @@
man/man1/sccmap.1
man/man1/tred.1
man/man1/unflatten.1
+man/man1/circo.1
+man/man1/dot2gxl.1
+man/man1/fdp.1
+man/man1/neato.1
+man/man1/twopi.1
man/man3/agraph.3
man/man3/cdt.3
man/man3/cgraph.3
diff -r 318488174361 -r 1115aa3312af graphics/graphviz/distinfo
--- a/graphics/graphviz/distinfo Mon Mar 02 10:25:06 2009 +0000
+++ b/graphics/graphviz/distinfo Mon Mar 02 11:24:58 2009 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.32 2009/03/01 21:58:53 tron Exp $
+$NetBSD: distinfo,v 1.33 2009/03/02 11:24:58 tron Exp $
SHA1 (graphviz-2.20.3.tar.gz) = 63ae6bdb6b410387477d339225cc4f61c2bc7322
RMD160 (graphviz-2.20.3.tar.gz) = 64c80f3af55668e487f911132407c332c3c38e87
Size (graphviz-2.20.3.tar.gz) = 13381532 bytes
-SHA1 (patch-aa) = fa1bf1e617a0a5fe061cfea71cfbe64a33168d86
-SHA1 (patch-ab) = 44dfdec30508583afaa1d44d4bda54341290356b
+SHA1 (patch-aa) = f724a5512192aca3e6fdc645729a185790b71d9a
+SHA1 (patch-ab) = f9e4f61d13b1fe88dc56a17225f6bff6dc6e5dcd
SHA1 (patch-ag) = 4b89f087ba96d29b92a1b8c46e3ac041039df459
SHA1 (patch-aj) = 0adc177fb7c3e654cf46560a8c91e2712bc7d16a
SHA1 (patch-ak) = 91133de18229d2165be392c790a504547a3adf64
diff -r 318488174361 -r 1115aa3312af graphics/graphviz/patches/patch-aa
--- a/graphics/graphviz/patches/patch-aa Mon Mar 02 10:25:06 2009 +0000
+++ b/graphics/graphviz/patches/patch-aa Mon Mar 02 11:24:58 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.9 2009/03/01 21:58:54 tron Exp $
+$NetBSD: patch-aa,v 1.10 2009/03/02 11:24:58 tron Exp $
---- configure.ac.orig 2008-10-07 18:40:07.000000000 +0000
-+++ configure.ac 2009-02-26 19:14:19.000000000 +0000
+--- configure.ac.orig 2008-10-07 19:40:07.000000000 +0100
++++ configure.ac 2009-03-02 11:04:39.000000000 +0000
@@ -23,17 +23,30 @@
AC_SUBST(GRAPHVIZ_VERSION_MINOR)
AC_SUBST(GRAPHVIZ_VERSION_MICRO)
@@ -52,3 +52,21 @@
case "${CC}" in
*icc* )
# -Wall causes relocation errors with icc
+@@ -753,7 +767,7 @@
+ LUA_VERSION=`$PKGCONFIG --modversion lua$l`
+ LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
+ LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
+- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKGCONFIG --variable=V lua`"
++ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/`$PKGCONFIG --variable=V lua`"
+
+ pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
+ if test "x$?" = "x0"; then
+@@ -775,7 +789,7 @@
+ LUA_INCLUDES=`$LUACONFIG --include`
+ LUA_LIBS=`$LUACONFIG --libs`
+ LUA_VERSION="5.0.x"
+- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/5.0"
++ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/5.0"
+ fi
+ fi
+
diff -r 318488174361 -r 1115aa3312af graphics/graphviz/patches/patch-ab
--- a/graphics/graphviz/patches/patch-ab Mon Mar 02 10:25:06 2009 +0000
+++ b/graphics/graphviz/patches/patch-ab Mon Mar 02 11:24:58 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.15 2009/02/28 13:19:46 drochner Exp $
+$NetBS$
---- configure.orig 2008-10-08 01:54:55.000000000 +0200
-+++ configure
-@@ -2402,18 +2402,26 @@ GRAPHVIZ_VERSION_MICRO=3
+--- configure.orig 2008-10-08 00:54:55.000000000 +0100
++++ configure 2009-03-02 11:03:05.000000000 +0000
+@@ -2402,18 +2402,26 @@
@@ -41,7 +41,7 @@
-@@ -6457,6 +6465,9 @@ if test "${GCC}" != "yes" ; then
+@@ -6457,6 +6465,9 @@
;;
*-sgi-irix* )
;;
@@ -51,7 +51,25 @@
esac
else
case "${CC}" in
-@@ -34814,10 +34825,6 @@ fi
+@@ -26311,7 +26322,7 @@
+ LUA_VERSION=`$PKGCONFIG --modversion lua$l`
+ LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
+ LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
+- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKGCONFIG --variable=V lua`"
++ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/`$PKGCONFIG --variable=V lua`"
+
+ pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
+ if test "x$?" = "x0"; then
+@@ -26375,7 +26386,7 @@
+ LUA_INCLUDES=`$LUACONFIG --include`
+ LUA_LIBS=`$LUACONFIG --libs`
+ LUA_VERSION="5.0.x"
+- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/5.0"
++ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/5.0"
+ fi
+ fi
+
+@@ -34814,10 +34825,6 @@
Home |
Main Index |
Thread Index |
Old Index