summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorasau <asau>2011-05-28 10:33:00 +0000
committerasau <asau>2011-05-28 10:33:00 +0000
commit9c14c96e953413c9df81d74b1dfd7326524a66e2 (patch)
treeaecde2243f715c4badbde249ba70418ba0a6695f /devel
parent776fc603555b977fd89329f870fa55ddb08023e0 (diff)
downloadpkgsrc-9c14c96e953413c9df81d74b1dfd7326524a66e2.tar.gz
Update Fossil to release 2011-05-23 15:11:12
New in release 2011-05-23 15:11:12: This release merges in the windows internationalization patches. Fossil should now work better on windows machines that use a non-ASCII and non-UTF8 code page for the DOS box. New in release 2011-05-12 14:56:52: This release adds an enhanced configuration sync capability which entails an irreversible schema change. You _must_ run "fossil rebuild" on all of your repositories after updating to this version of fossil. Other changes in this release include: * Refactor the "add", "rm", and "addremove" commands to simplify the code and fix various problems. * Added a "diff" hyperlink after each file in the "Show Files" timeline view. * The "fossil open" and "fossil co" commands always prompt before overwriting preexisting files unless the --force option is used. * Enhanced the merge-conflict markup to show both recent versions and the common-ancestor version. * Change the definition of what it means to be a "leaf" check-in, to be consistent and to work better for most people. * Commands that recursively decend through the file hierarchy ("fossil extra", "fossil clean", etc.) will now ignore nested checkouts. * Automatically delete the _FOSSIL_ file upon a failed "open". * Improvements to the "annotate" feature. * Other minor bug fixes.
Diffstat (limited to 'devel')
-rw-r--r--devel/fossil/Makefile4
-rw-r--r--devel/fossil/distinfo10
-rw-r--r--devel/fossil/patches/patch-aa10
3 files changed, 12 insertions, 12 deletions
diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile
index 2f3a9365bd8..566db26e7c1 100644
--- a/devel/fossil/Makefile
+++ b/devel/fossil/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2011/05/11 14:15:28 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2011/05/28 10:33:00 asau Exp $
#
-DISTNAME= fossil-src-20110413120518
+DISTNAME= fossil-src-20110523151112
PKGNAME= ${DISTNAME:S/-src//:C/-(2........)/-\1./}
CATEGORIES= devel scm
MASTER_SITES= http://www.fossil-scm.org/download/
diff --git a/devel/fossil/distinfo b/devel/fossil/distinfo
index 4ecd90e82a7..5854e07eeca 100644
--- a/devel/fossil/distinfo
+++ b/devel/fossil/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2011/05/11 14:48:28 drochner Exp $
+$NetBSD: distinfo,v 1.12 2011/05/28 10:33:00 asau Exp $
-SHA1 (fossil-src-20110413120518.tar.gz) = 1e52a0721b3ecf549ed020bb710a4a4b0ef06518
-RMD160 (fossil-src-20110413120518.tar.gz) = acd107e42e5eda4c7632db517e6fa8096cbf6351
-Size (fossil-src-20110413120518.tar.gz) = 2279032 bytes
-SHA1 (patch-aa) = f21d1bc1a271b810b65a93bd4b2b96a1c57d19d5
+SHA1 (fossil-src-20110523151112.tar.gz) = 23f9f988c2a71166fc4c6120999af5347331ebf3
+RMD160 (fossil-src-20110523151112.tar.gz) = a972c5401aa0336342cb7bcd366660d9ecba7b14
+Size (fossil-src-20110523151112.tar.gz) = 2309227 bytes
+SHA1 (patch-aa) = 63cac7c98684ca68ccde11a1c5d8ea9fd47736a3
diff --git a/devel/fossil/patches/patch-aa b/devel/fossil/patches/patch-aa
index 9cdc1f85b26..84cba65dd99 100644
--- a/devel/fossil/patches/patch-aa
+++ b/devel/fossil/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.1 2011/05/11 14:48:28 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2011/05/28 10:33:00 asau Exp $
---- src/sqlite3.c.orig 2011-04-13 12:12:12.000000000 +0000
-+++ src/sqlite3.c
-@@ -24413,7 +24413,7 @@ static struct unix_syscall {
+--- src/sqlite3.c.orig 2011-05-25 17:41:58.000000000 +0400
++++ src/sqlite3.c 2011-05-27 01:46:25.000000000 +0400
+@@ -24733,7 +24733,7 @@
sqlite3_syscall_ptr pDefault; /* Default value */
} aSyscall[] = {
- { "open", (sqlite3_syscall_ptr)open, 0 },
+ { "open", (sqlite3_syscall_ptr)posixOpen, 0 },
-#define osOpen ((int(*)(const char*,int,int))aSyscall[0].pCurrent)
+#define osOpen ((int(*)(const char*,int,...))aSyscall[0].pCurrent)