Update to 1.25:

Version 1.25:

    Enhancements to ticket processing. There are now two tables:
    TICKET and TICKETCHNG. There is one row in TICKETCHNG for each
    ticket artifact. Fields from ticket artifacts go into either
    or both of TICKET and TICKETCHNG, whichever contain matching
    column names. Default ticket edit and viewing scripts are
    updated to use TICKETCHNG. The TH1 scripting language is enhanced
    to support this, including the new "query" command for doing
    SQL queries against the repository database. All changes should
    be backwards compatible.
    Add the ability to moderate ticket and wiki changes. Unmoderated
    changes do not sync and may be deleted by the moderator if
    found to contain spam or other objectionable content.
    Add javascript so that clicking on a node of the timeline graph
    selects that node. Then clicking on a second node shows a diff
    between the two nodes. Clicking on the selected node unselects
    it.
    Warn of unresolved merge conflicts in "fossil status" and
    disallow commits of unresolved conflicts unless the --allow-conflict
    option is used.
    Add javascript so that clicking on column headers in a ticket
    report sorts by the indicated column.
    Add the "fossil cat" command which is basically an alias for
    "fossil finfo -p".
    Hyperlinks with the class "button" are rendered as submenu
    buttons on embedded documentation.
    The check-in comment editor on windows now defaults to NotePad.exe.
    Correctly deal with BOMs in check-in comments. Also attempt to
    convert check-in comments to UTF8 from other encodings.
    Allow the deletion of multiple stash entries using multiple
    arguments to the "fossil stash rm" command.
    Enhance the "fossil server DIRECTORY" command to serve static
    content files contained in DIRECTORY. For security, only files
    with a recognized suffix (such as *.html, *.jpg, *.txt, etc)
    will be delivered as static content, and *.fossil files are
    not on the list of recognized suffixes. There are additional
    restrictions on the names of the files.
    Allow the "fossil ui" command to specify a directory as long
    as the the --notfound option is used.
    Add a configuration option that causes timeline messages to be
    rendered as text/x-fossil-plain (which is the same as text/plain
    except that hyperlinks inside of [...] are decorated.)
    Only decorate [...] in check-in comments and tickets if the
    contented text really is a valid hyperlink target.
    Improvements to the side-by-side diff algorithm, for a more
    human-friendly display in some complex cases.
    Added [utime] and [stime] commands to TH1. These commands can
    be used for things such as displaying the page rendering time
    in the footer.
    Add the ability to pass command-line options of "fossil rebuild"
    to "fossil all rebuild".
    Add the --deanalyze option to "fossil rebuild" (and "fossil
    all rebuild")
    Do not run the graphical merging tool nor leave merge-droppings
    after a dry-run merge. Display an improved merge-summary message
    at the end of the merge.
    Add options to "fossil commit" to override the various sanity
    checks. Options added: --allow-empty, --allow-fork, --allow-older,
    and --allow-conflict.
    Optionally require a CAPTCHA (controlled by a setting on the
    Admin/Access webpage) when a user who is not logged in tries
    to edit wiki, or a ticket, or an attachment.
    Improvements to the "ssh://" sync protocol, to help it move
    past noisey motd comments.
    Add the uf=FILE-SHA1-HASH query parameter to the timeline,
    causing the timeline to show only check-ins that contain the
    specific file identified by FILE-SHA1-HASH. ("uf" stands for
    "uses file".)
    Enhance the file change annotator so that it follows the file
    across name changes.
    Fix the server-side of the sync protocol so that it will not
    generate a delta loop when a file changes from its original
    state, through two or more intermediate states, and back to
    the original state, all within a single sync.
    Show much less output during a sync operation, unless the
    --verbose option is used.
    Set the action= attribute of <form> elements using javascript,
    as an addition defense against spam-bots.
    Disallow invalid UTF8 characters (such as characters in the
    surrogate pair range) in filenames.
    Judge the UserAgent strings issued by the NetSurf webbrowser
    to be coming from a human, not from a bot.
    Add the zlib sources to the Fossil source tree (under compat/zlib)
    and use those sources when compiling on (windows) systems that
    do not have a zlib library installed by default.
    Prompt the user with the option to convert non-UTF8 files into
    UTF8 when committing.
    Allow the characters *[]? in filenames.
    Allow the --context option on diff commands to have a value of
    0.
    Added the "dbstat" command.
    Enhanced "fossil merge" so that if the VERSION argument is
    omitted, Fossil tries to merge any forks of the current branch.
    Improved detection of forks in a commit race.
    Added the --analyze option to "fossil rebuild".

Version 1.24:

    Added support for WYSIWYG editing of wiki pages. WYSIWYG is
    turned off by default and can be turned on by setting a
    configuration option.
    Allow style= attribute to occur in HTML markup on wiki pages.
    Added the --tk option to the "fossi diff" and "fossil stash
    diff" commands, causing color-coded diff output to be displayed
    in a Tcl/Tk GUI window. This option only works if Tcl/Tk is
    installed on the host.
    On windows, make the "gdiff" command default to use WinDiff.exe.
    Update the "fossil stash" command so that it always prompts
    for a comment if the -m option is omitted.
    Enhance the timeline webpages so that a=, b=, c=, d=, p=, and
    dp= query parameters (and others) can all accept any valid
    checkin name (such as branch names or labels) instead of just
    SHA1 hashes.
    Added the "fossil stash show" command.
    Added the "fileage" webpage with links to this page from the
    check-in information page and from the file browser.
    Added --age and -t options to the "fossil ls" command.
    Added the --setmtime option to "fossil update". When used, the
    mtime of all mananged files is set to the time when the most
    recent version of the file was checked in.
    Changed the "vdiff" webpage to show the complete text of files
    that were added or removed (the equivelent of using the -N or
    --newfile options with the "fossil diff" command-line.)
    Added the --temp option to "fossil clean" and "fossil extra",
    causing those commands to only look at temporary files generated
    by Fossil, such as merge-conflict reports or aborted check-in
    messages.
    Enhance the raw page download so that it can guess the mimetype
    of attachments based on the filename.
    Change the behavior of the from= and to= query parameters on
    the timeline page so that by default the path between the two
    specified check-ins avoids merges.
    Add the --baseurl option to "fossil server" and "fossil http"
    commands, so that those commands can be used with reverse
    proxies.
    If unable to determine the command-line user, do not guess.
    Instead issue an error message. This helps prevent check-ins
    from accidentally occurring under the wrong username.
    Include branch information in the output of file change listings
    (the "finfo" webpage).
    Make the simplified view of file history, rather than the full
    view, the default.
    In the "fossil configuration" command, allow the "css" option
    for synchronizing, importing, or exporting just the CSS file.
    This makes it easier to share CSS files across repositories by
    exporting from one and importing to another.
    Add the (unsupported) "fossil test-orphans" command.
    Add the --template option to the "fossil init" command, to
    facilitate creating new repositories based on a template
    repository.
    Add the diff-binary setting, which if enabled causes binary
    files to be passed to the "gdiff" command for it to deal with,
    rather than simply printing a "cannot diff binary files" error.
    Add the --unified option to the "fossil diff" command to force
    a unified diff even if the --tk option (which normally implies
    a side-by-side diff) is used.
    Present a choice of nearby branches and versions to diff against
    on the check-in information page.
    Add the --force option to the "fossil merge" command that will
    force the merge to occur even if it would be a no-op. This is
    sometimes useful for documentation purposes.
    Add another built-in skin: "Enhanced Default". Other minor
    tweaks to the existing skins.
    Add the "urllist" webpage, showing a list of URLs by which a
    server instance of Fossil has been accessed. Requires
    "Administrator" privileges. A link is on the "Setup" main page.
    Enable dynamic loading of the Tcl runtime for installations
    that want to use Tcl as part of their configuration. This
    reduces the size of the Fossil binary and allows any version
    of Tcl 8.4 or later to be used.
    Merge the latest SQLite changes from upstream.
    Lots of minor bug fixes.

3 files changed, 17 insertions, 52 deletions

diff --git a/devel/fossil/DESCR b/devel/fossil/DESCR
index 02ba8a7b937..20ebcfbafa3 100644
--- a/devel/fossil/DESCR
+++ b/devel/fossil/DESCR
@@ -1,44 +1,11 @@
-There are plenty of open-source version control systems available
-on the internet these days. What makes Fossil worthy of attention?
+Fossil is a distributed software control system that includes a
+whole palette of useful companion software: for example, bug
+tracking and a wiki.
 
-   1. Bug Tracking And Wiki - In addition to doing distributed
-   version control like Git and Mercurial, Fossil also supports
-   distributed bug tracking and distributed wiki all in a single
-   integrated package.
+It allows autosyncing with an upstream before a commit.  fossil is
+a single standalone executable, using bandwidth efficient transfers
+over HTTP. It includes its own HTTP server for providing the
+repository, if needed.
 
-   2. Web Interface - Fossil has a built-in and easy-to-use web
-   interface that simplifies project tracking and promotes situational
-   awareness. Simply type "fossil ui" from within any check-out
-   and Fossil automatically opens your web browser in a page that
-   gives detailed history and status information on that project.
-
-   3. Autosync - Fossil supports "autosync" mode which helps to
-   keep projects moving forward by reducing the amount of needless
-   forking and merging often associated distributed projects.
-
-   4. Self-Contained - Fossil is a single stand-alone executable
-   that contains everything needed to do configuration management.
-   Installation is trivial: simply download a precompiled binary
-   for Linux, Mac, or Windows and put it on your $PATH. Easy-to-compile
-   source code is available for users on other platforms. Fossil
-   sources are also mostly self-contained, requiring only the "zlib"
-   library and the standard C library to build.
-
-   5. Simple Networking - Fossil uses plain old HTTP (with proxy
-   support) for all network communications, meaning that it works
-   fine from behind restrictive firewalls. The protocol is bandwidth
-   efficient to the point that Fossil can be used comfortably over
-   a dial-up internet connection.
-
-   6. CGI Enabled - No server is required to use fossil. But a
-   server does make collaboration easier. Fossil supports three
-   different yet simple server configurations. The most popular is
-   a 2-line CGI script. This is the approach used by the self-hosting
-   fossil repositories.
-
-   7. Robust & Reliable - Fossil stores content in an SQLite database
-   so that transactions are atomic even if interrupted by a power
-   loss or system crash. Furthermore, automatic self-checks verify
-   that all aspects of the repository are consistent prior to each
-   commit. In over two years of operation, no work has ever been
-   lost after having been committed to a Fossil repository.
+The repository is kept in a sqlite database, only updated with
+atomic commits, which can be checked by fossil itself for consistency.
diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile
index d97f8acc4f9..2a72fb10c66 100644
--- a/devel/fossil/Makefile
+++ b/devel/fossil/Makefile
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.24 2013/04/07 20:40:38 asau Exp $
+# $NetBSD: Makefile,v 1.25 2013/04/10 11:31:58 wiz Exp $
 
-DISTNAME=	fossil-src-20120808112557
-PKGNAME=	fossil-1.23
-PKGREVISION=	1
+DISTNAME=	fossil-src-20130216000435
+PKGNAME=	fossil-1.25
 CATEGORIES=	devel scm
 MASTER_SITES=	http://www.fossil-scm.org/download/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.fossil-scm.org/
-COMMENT=	Simple, high-reliability, distributed software configuration management
+COMMENT=	High-reliability, distributed software configuration management
 LICENSE=	2-clause-bsd
 
-MAKE_JOBS_SAFE=	no
 HAS_CONFIGURE=	yes
 
 INSTALLATION_DIRS+=	bin
diff --git a/devel/fossil/distinfo b/devel/fossil/distinfo
index 1ba576dc10b..1f1aba3631b 100644
--- a/devel/fossil/distinfo
+++ b/devel/fossil/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.17 2012/08/12 23:36:44 jdf Exp $
+$NetBSD: distinfo,v 1.18 2013/04/10 11:31:58 wiz Exp $
 
-SHA1 (fossil-src-20120808112557.tar.gz) = b7c3f0092ac9a00e71675464c0f3c7f0297df25f
-RMD160 (fossil-src-20120808112557.tar.gz) = c3a720f795a13f32c29b44f1ca2cf405ee65e829
-Size (fossil-src-20120808112557.tar.gz) = 2811716 bytes
+SHA1 (fossil-src-20130216000435.tar.gz) = 16bf2d05ec62cd704b2cbc2bb9388de2a1b5ac97
+RMD160 (fossil-src-20130216000435.tar.gz) = 794a9ec7f42593d5e228ce55a68ecedac5d5a4a9
+Size (fossil-src-20130216000435.tar.gz) = 3541732 bytes