summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authordan <dan@pkgsrc.org>2005-11-08 03:24:32 +0000
committerdan <dan@pkgsrc.org>2005-11-08 03:24:32 +0000
commita1283e6c65fa4c72e483c3b4de0d820f689ce6f8 (patch)
treeba747e37ce166b443ffd8fb0a197c4cb2ff645a1 /devel
parentc85768c7fe07ad0a88fb0f1446633767a1ca6aff (diff)
downloadpkgsrc-a1283e6c65fa4c72e483c3b4de0d820f689ce6f8.tar.gz
update to 0.12, changelog below.
XXX: the package is heavily gnome-infested, pulling in half the known universe via lablgtk2. Only the gnome-canvas bindings are really needed; there's a local copy of lablgtk2 in the m-viz source tree now, perhaps use that? 0.12: - change the way displayed branches are selected: now one can view any set of branches - allow the ancestry graph view to be limited by date - the `query' window now uses monotone selectors - change the reconnection algorithm - cert values can be copied to the clipboard (via a context menu) - DnD support: accept drops from a file manager - rewrite the sqlite bindings (use parsed statements now) 0.11: - a new `query' window to search for revision matching some criterion - some DnD support: drag a node and drop it in a terminal to copy its revision id - tweak the reconnection algorithm - build with a shared sqlite library by default - add a preference option for the location of the `dot' program 0.10: - try to reconnect disconnected parts of the graph (by adding grey edges) - libgnomecanvas hack to speed up drawing - somehow display the output of monotone diff, even if it is not valid UTF-8 - middle clicking on the graph with a (prefix) of an id selected will center the view on this id - support builds with a shared sqlite library (--with-shared-sqlite option to configure)
Diffstat (limited to 'devel')
-rw-r--r--devel/monotone-viz/Makefile5
-rw-r--r--devel/monotone-viz/distinfo11
-rw-r--r--devel/monotone-viz/patches/patch-aa46
-rw-r--r--devel/monotone-viz/patches/patch-ab28
4 files changed, 28 insertions, 62 deletions
diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile
index d5171dfa0c7..a5ee89e1c72 100644
--- a/devel/monotone-viz/Makefile
+++ b/devel/monotone-viz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2005/06/16 06:57:47 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2005/11/08 03:24:32 dan Exp $
#
-DISTNAME= monotone-viz-0.9
+DISTNAME= monotone-viz-0.12
CATEGORIES= devel
MASTER_SITES= http://oandrieu.nerim.net/monotone-viz/
@@ -10,6 +10,7 @@ HOMEPAGE= http://oandrieu.nerim.net/monotone-viz/
COMMENT= Visualize monotone ancestry graphs
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --without-local-lablgtk --with-shared-sqlite
USE_TOOLS+= gmake
BUILD_TARGET= monotone-viz
BUILD_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR}
diff --git a/devel/monotone-viz/distinfo b/devel/monotone-viz/distinfo
index 417078aebbe..461aaa55dcd 100644
--- a/devel/monotone-viz/distinfo
+++ b/devel/monotone-viz/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/05/31 16:00:58 drochner Exp $
+$NetBSD: distinfo,v 1.2 2005/11/08 03:24:32 dan Exp $
-SHA1 (monotone-viz-0.9.tar.gz) = 1b765225beb78b89e81a020351b4c5ebd183b28b
-RMD160 (monotone-viz-0.9.tar.gz) = a3eb564adf729531a5fbbe28cf561ddfe1900f8a
-Size (monotone-viz-0.9.tar.gz) = 89640 bytes
-SHA1 (patch-aa) = b0c1ad8e25596a8e5daae8fc5839c85c44bd70e5
-SHA1 (patch-ab) = c291dabc3837e07fcb8ebb98d16b8b7f0c6c941a
+SHA1 (monotone-viz-0.12.tar.gz) = 143223fa703a749d52adb29e39e4f0eb8c6798b9
+RMD160 (monotone-viz-0.12.tar.gz) = bd54312d47c8e7d8d9277bb23f9b34f93be774b1
+Size (monotone-viz-0.12.tar.gz) = 501151 bytes
+SHA1 (patch-aa) = c030924dc07d43bb5c7a9844408f4925ca6a9dda
diff --git a/devel/monotone-viz/patches/patch-aa b/devel/monotone-viz/patches/patch-aa
index 2500fc581bb..13df277ae95 100644
--- a/devel/monotone-viz/patches/patch-aa
+++ b/devel/monotone-viz/patches/patch-aa
@@ -1,43 +1,37 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/05/31 16:00:58 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2005/11/08 03:24:32 dan Exp $
---- configure.orig 2005-05-30 16:35:17.000000000 +0200
-+++ configure
-@@ -1870,38 +1870,6 @@ else
- fi
+--- configure.orig 2005-11-08 14:01:54.000000000 +1100
++++ configure 2005-11-08 14:02:48.000000000 +1100
+@@ -2061,32 +2061,6 @@
+ fi
--# Check the sqlite3 sources
--
--# Check whether --with-monotone-dir or --without-monotone-dir was given.
--if test "${with_monotone_dir+set}" = set; then
-- withval="$with_monotone_dir"
-- MONOTONE_DIR=$withval
--else
-- MONOTONE_DIR=monotone
--fi;
--echo "$as_me:$LINENO: checking sqlite sources" >&5
--echo $ECHO_N "checking sqlite sources... $ECHO_C" >&6
--if test -d "$MONOTONE_DIR" -a -r "$MONOTONE_DIR/sqlite/lib3rdparty_a-main.o" ; then
-- echo "$as_me:$LINENO: result: found in $MONOTONE_DIR/sqlite" >&5
+-if test "$SHARED_SQLITE" != "yes" ; then
+- echo "$as_me:$LINENO: checking monotone's sqlite" >&5
+-echo $ECHO_N "checking monotone's sqlite... $ECHO_C" >&6
+- if test -d "$MONOTONE_DIR" -a -r "$MONOTONE_DIR/sqlite/lib3rdparty_a-main.o" ; then
+- echo "$as_me:$LINENO: result: found in $MONOTONE_DIR/sqlite" >&5
-echo "${ECHO_T}found in $MONOTONE_DIR/sqlite" >&6
--else
-- { { echo "$as_me:$LINENO: error:
+- else
+- { { echo "$as_me:$LINENO: error:
-
-Could not find compiled sqlite sources. Monotone-viz needs a compiled
-monotone tree for the sqlite library. Create a link named \`monotone'
--or specify the location to configure using the \`--with-monotone-dir'
+-or specify the location to configure using the \`--with-monotone-dir='
-option." >&5
-echo "$as_me: error:
-
-Could not find compiled sqlite sources. Monotone-viz needs a compiled
-monotone tree for the sqlite library. Create a link named \`monotone'
--or specify the location to configure using the \`--with-monotone-dir'
+-or specify the location to configure using the \`--with-monotone-dir='
-option." >&2;}
- { (exit 1); exit 1; }; }
+- fi
+- if test "${MONOTONE_DIR:0:1}" != "/" ; then
+- MONOTONE_DIR=$(pwd)/$MONOTONE_DIR
+- fi
-fi
--if test "${MONOTONE_DIR:0:1}" != "/" ; then
-- MONOTONE_DIR=$PWD/$MONOTONE_DIR
--fi
+-
- ac_config_files="$ac_config_files config.make"
+ # Check for libcrypto using pkg-config, defaulting to /usr/lib
diff --git a/devel/monotone-viz/patches/patch-ab b/devel/monotone-viz/patches/patch-ab
deleted file mode 100644
index 30576bec26c..00000000000
--- a/devel/monotone-viz/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/05/31 16:00:58 drochner Exp $
-
---- Makefile.orig 2005-04-20 21:34:48.000000000 +0200
-+++ Makefile
-@@ -7,7 +7,7 @@ EXTLIB := extlib-1.3
- VPATH = mlsqlite $(OCAMLNET) $(EXTLIB) glib crypto
-
- MLINCDIRS = -I $(OCAMLNET) -I mlsqlite -I $(EXTLIB) -I $(LABLGTK_DIR) -I glib -I crypto
--CINCDIRS = -I $(MONOTONE_DIR)/sqlite -I $(LABLGTK_DIR) -ccopt "$(GTK_CFLAGS) $(CRYPTO_CFLAGS)"
-+CINCDIRS = -I $(LABLGTK_DIR) -ccopt "$(GTK_CFLAGS) $(CRYPTO_CFLAGS)"
- GTK_CFLAGS := $(shell pkg-config gtk+-2.0 --cflags)
-
-
-@@ -54,12 +54,12 @@ monotone-viz : $(OBJX) lib3rdparty.a
- monotone-viz : MLLIBS = str.cmxa lablgtk.cmxa gtkInit.cmx lablgnomecanvas.cmxa
- else
- monotone-viz : $(OBJ) lib3rdparty.a
-- $(OCAMLC) -custom -o $@ -I . -I $(LABLGTK_DIR) $(MLLIBS) $^ $(CRYPTO_LIB)
-+ $(OCAMLC) -custom -o $@ -I . -I $(LABLGTK_DIR) $(MLLIBS) $^ ${BUILDLINK_DIR}/lib/ocaml/libcamlrun.a $(CRYPTO_LIB) ${BUILDLINK_DIR}/lib/libsqlite3.a
- monotone-viz : MLLIBS = str.cma lablgtk.cma gtkInit.cmo lablgnomecanvas.cma
- endif
-
- lib3rdparty.a : mlsqlite/ocaml-sqlite3.o glib/ocaml-gspawn.o glib/ocaml-giochannel.o crypto/ocaml-openssl.o
-- ar crs lib3rdparty.a $(MONOTONE_DIR)/sqlite/lib3rdparty_a-*.o $^
-+ ar crs lib3rdparty.a $^
-
- glib/ocaml-gspawn.o : gspawn_tags.c gspawn_tags.h
- glib/ocaml-giochannel.o : giochannel_tags.c giochannel_tags.h