head 1.20; access; symbols pkgsrc-2013Q2:1.19.0.2 pkgsrc-2013Q2-base:1.19 pkgsrc-2013Q1:1.17.0.4 pkgsrc-2013Q1-base:1.17 pkgsrc-2012Q4:1.17.0.2 pkgsrc-2012Q4-base:1.17 pkgsrc-2012Q3:1.14.0.2 pkgsrc-2012Q3-base:1.14 pkgsrc-2012Q2:1.12.0.10 pkgsrc-2012Q2-base:1.12 pkgsrc-2012Q1:1.12.0.8 pkgsrc-2012Q1-base:1.12 pkgsrc-2011Q4:1.12.0.6 pkgsrc-2011Q4-base:1.12 pkgsrc-2011Q3:1.12.0.4 pkgsrc-2011Q3-base:1.12 pkgsrc-2011Q2:1.12.0.2 pkgsrc-2011Q2-base:1.12 pkgsrc-2011Q1:1.11.0.4 pkgsrc-2011Q1-base:1.11 pkgsrc-2010Q4:1.11.0.2 pkgsrc-2010Q4-base:1.11 pkgsrc-2010Q3:1.9.0.6 pkgsrc-2010Q3-base:1.9 pkgsrc-2010Q2:1.9.0.4 pkgsrc-2010Q2-base:1.9 pkgsrc-2010Q1:1.9.0.2 pkgsrc-2010Q1-base:1.9 pkgsrc-2009Q4:1.8.0.4 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.2 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.7.0.8 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.6 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.4 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.2 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.6.0.6 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.4 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.2 pkgsrc-2008Q1:1.5.0.2 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.2.0.2 pkgsrc-2007Q4-base:1.2 pkgsrc-docs:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.20 date 2013.09.09.14.07.59; author wiz; state dead; branches; next 1.19; commitid R7Ndtjk1XwlaML4x; 1.19 date 2013.06.16.06.31.12; author adam; state Exp; branches; next 1.18; commitid ndUF7ES8TriOYNTw; 1.18 date 2013.05.31.12.40.57; author wiz; state Exp; branches; next 1.17; commitid hIeXGcx6VfKHwMRw; 1.17 date 2012.10.31.11.19.44; author asau; state Exp; branches; next 1.16; 1.16 date 2012.10.06.18.28.13; author adam; state Exp; branches; next 1.15; 1.15 date 2012.10.03.21.55.55; author wiz; state Exp; branches; next 1.14; 1.14 date 2012.09.29.13.00.06; author apb; state Exp; branches; next 1.13; 1.13 date 2012.09.28.17.34.18; author apb; state Exp; branches; next 1.12; 1.12 date 2011.04.06.14.08.27; author adam; state Exp; branches; next 1.11; 1.11 date 2010.10.28.11.11.00; author adam; state Exp; branches; next 1.10; 1.10 date 2010.10.28.10.23.08; author adam; state Exp; branches; next 1.9; 1.9 date 2010.02.22.09.20.30; author obache; state Exp; branches; next 1.8; 1.8 date 2009.08.31.10.08.59; author seb; state Exp; branches; next 1.7; 1.7 date 2008.09.17.01.18.42; author bjs; state Exp; branches; next 1.6; 1.6 date 2008.04.21.01.09.51; author bjs; state Exp; branches; next 1.5; 1.5 date 2008.03.03.00.35.13; author bjs; state Exp; branches; next 1.4; 1.4 date 2008.02.28.15.11.29; author bjs; state Exp; branches; next 1.3; 1.3 date 2008.02.06.07.53.32; author bjs; state Exp; branches; next 1.2; 1.2 date 2007.12.22.01.07.01; author joerg; state Exp; branches; next 1.1; 1.1 date 2007.12.12.04.22.45; author bjs; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2007.12.12.04.22.45; author bjs; state Exp; branches; next ; desc @@ 1.20 log @Finish git rename from scmgit to git. @ text @# $NetBSD: Makefile,v 1.19 2013/06/16 06:31:12 adam Exp $ PKGNAME= scmgit-docs-${GIT_VERSION} COMMENT= GIT Tree History Storage Tool (documentation) CONFLICTS+= git<4.9.5nb1 # misc/git DISTINFO_FILE= ../../devel/scmgit-base/distinfo BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto USE_LANGUAGES= c BUILD_TARGET= man INSTALL_TARGET= install-man UNLIMIT_RESOURCES+= datasize USE_TOOLS+= perl CONFIGURE_ARGS+= --with-perl=${PERL5:Q} .include "../../devel/scmgit/Makefile.common" .include "../../mk/bsd.pkg.mk" @ 1.19 log @Changes 1.8.3.1: * When $HOME is misconfigured to point at an unreadable directory, we used to complain and die. The check has been loosened. * Handling of negative exclude pattern for directories "!dir" was broken in the update to v1.8.3. Also contains a handful of trivial code clean-ups, documentation updates, updates to the test suite, etc. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.18 2013/05/31 12:40:57 wiz Exp $ @ 1.18 log @Bump all packages for perl-5.18, that a) refer 'perl' in their Makefile, or b) have a directory name of p5-*, or c) have any dependency on any p5-* package Like last time, where this caused no complaints. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.17 2012/10/31 11:19:44 asau Exp $ a3 1 PKGREVISION= 1 @ 1.17 log @Drop superfluous PKG_DESTDIR_SUPPORT, "user-destdir" is default these days. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.16 2012/10/06 18:28:13 adam Exp $ d4 1 @ 1.16 log @Fixes since v1.7.12.1 --------------------- * When "git am" is fed an input that has multiple "Content-type: ..." header, it did not grok charset= attribute correctly. * Even during a conflicted merge, "git blame $path" always meant to blame uncommitted changes to the "working tree" version; make it more useful by showing cleanly merged parts as coming from the other branch that is being merged. * "git blame MAKEFILE" run in a history that has "Makefile" but not "MAKEFILE" should say "No such file MAKEFILE in HEAD", but got confused on a case insensitive filesystem and failed to do so. * "git fetch --all", when passed "--no-tags", did not honor the "--no-tags" option while fetching from individual remotes (the same issue existed with "--tags", but combination "--all --tags" makes much less sense than "--all --no-tags"). * "git log/diff/format-patch --stat" showed the "N line(s) added" comment in user's locale and caused careless submitters to send patches with such a line in them to projects whose project language is not their language, mildly irritating others. Localization to the line has been disabled for now. * "git log --all-match --grep=A --grep=B" ought to show commits that mention both A and B, but when these three options are used with --author or --committer, it showed commits that mention either A or B (or both) instead. * The subcommand to remove the definition of a remote in "git remote" was named "rm" even though all other subcommands were spelled out. Introduce "git remote remove" to remove confusion, and keep "rm" as a backward compatible synonym. Also contains a handful of documentation updates. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.15 2012/10/03 21:55:55 wiz Exp $ a5 2 PKG_DESTDIR_SUPPORT= user-destdir @ 1.15 log @Bump all packages that use perl, or depend on a p5-* package, or are called p5-*. I hope that's all of them. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.14 2012/09/29 13:00:06 apb Exp $ a3 1 PKGREVISION= 2 @ 1.14 log @Perl is a build-time dependency, not a run-time dependency, so fix the USE_TOOLS definition. Thanks to OBATA Akio for pointing this out. Bump PKGREVISION to 1. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.13 2012/09/28 17:34:18 apb Exp $ d4 1 a4 1 PKGREVISION= 1 @ 1.13 log @Perl is needed at build time. So add these lines to the Makefile USE_TOOLS+= perl:run CONFIGURE_ARGS+= --with-perl=${PERL5:Q} @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.12 2011/04/06 14:08:27 adam Exp $ d4 1 d22 1 a22 1 USE_TOOLS+= perl:run @ 1.12 log @Changes 1.7.4.3: * "git apply" used to confuse lines updated by previous hunks as lines that existed before when applying a hunk, contributing misapplication of patches with offsets. * "git branch --track" (and "git checkout --track --branch") used to allow setting up a random non-branch that does not make sense to follow as the "upstream". The command correctly diagnoses it as an error. * "git checkout $other_branch" silently removed untracked symbolic links in the working tree that are in the way in order to check out paths under it from the named branch. * "git cvsimport" did not bail out immediately when the cvs server cannot be reached, spewing unnecessary error messages that complain about the server response that it never got. * "git diff --quiet" did not work very well with the "--diff-filter" option. * "git grep -n" lacked a long-hand synonym --line-number. * "git stash apply" reported the result of its operation by running "git status" from the top-level of the working tree; it should (and now does) run it from the user's working directory. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.11 2010/10/28 11:11:00 adam Exp $ d21 3 @ 1.11 log @Since HTML files are not installed, don't bother building them. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.10 2010/10/28 10:23:08 adam Exp $ d3 2 a4 2 PKGNAME= scmgit-docs-${GIT_VERSION} COMMENT= GIT Tree History Storage Tool (documentation) a20 8 # our asciidoc doesn't handle {litdd} in titles SUBST_CLASSES+= litdd SUBST_STAGE.litdd= pre-configure SUBST_MESSAGE.litdd= Fixing {litdd} in text files. SUBST_FILES.litdd= Documentation/git-*--*.txt SUBST_SED.litdd= -e 's,{litdd},--,g' SUBST_SED.litdd+= -e 's,^=====,,g' @ 1.10 log @Changes 1.7.3.2: This is primarily to push out many documentation fixes accumulated since the 1.7.3.1 release. Changes 1.7.3.1: * "git stash show stash@@{$n}" was accidentally broken in 1.7.3 ("git stash show" without any argument still worked, though). * "git stash branch $branch stash@@{$n}" was accidentally broken in 1.7.3 and started dropping the named stash even when branch creation failed. Changes 1.7.3: * git-gui, now at version 0.13.0, got various updates and a new maintainer, Pat Thoyts. * Gitweb allows its configuration to change per each request; it used to read the configuration once upon startup. * When git finds a corrupt object, it now reports the file that contains it. * "git checkout -B " is a shorter way to say "git branch -f " followed by "git checkout ". * When "git checkout" or "git merge" refuse to proceed in order to protect local modification to your working tree, they used to stop after showing just one path that might be lost. They now show all, in a format that is easier to read. * "git clean" learned "-e" ("--exclude") option. * Hunk headers produced for C# files by "git diff" and friends show more relevant context than before. * diff.ignoresubmodules configuration variable can be used to squelch the differences in submodules reported when running commands (e.g. "diff", "status", etc.) at the superproject level. * http.useragent configuration can be used to lie who you are to your restrictive firewall. * "git rebase --strategy " learned "-X" option to pass extra options that are understood by the chosen merge strategy. * "git rebase -i" learned "exec" that you can insert into the insn sheet to run a command between its steps. * "git rebase" between branches that have many binary changes that do not conflict should be faster. * "git rebase -i" peeks into rebase.autosquash configuration and acts as if you gave --autosquash from the command line. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.9 2010/02/22 09:20:30 obache Exp $ a14 2 BUILD_TARGET= doc d16 2 a17 1 INSTALL_TARGET= install-doc @ 1.9 log @conflicts with misc/git are resolved with git-4.9.5nb1. @ text @d1 1 a1 2 # $NetBSD: Makefile,v 1.8 2009/08/31 10:08:59 seb Exp $ # d22 8 @ 1.8 log @Fix build as seen on NetBSD 3.1_STABLE/{i386,sparc64}: unlimit data-size @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.7 2008/09/17 01:18:42 bjs Exp $ d9 2 @ 1.7 log @Update to scmgit-1.6.0.2. In pkgsrc, in Makefile.common .include, change ${.CURDIR}/../... to ../../devel/scmgit/...; makes a lot more sense. Fixes since v1.6.0.1 -------------------- * Installation on platforms that needs .exe suffix to git-* programs were broken in 1.6.0.1. * Installation on filesystems without symbolic links support did nto work well. * In-tree documentations and test scripts now use "git foo" form to set a better example, instead of the "git-foo" form (which is an acceptable form if you have "PATH=$(git --exec-path):$PATH" in your script) * Many commands did not use the correct working tree location when used with GIT_WORK_TREE environment settings. * Some systems needs to use compatibility fnmach and regex libraries independent from each other; the compat/ area has been reorganized to allow this. * "git apply --unidiff-zero" incorrectly applied a -U0 patch that inserts a new line before the second line. * "git blame -c" did not exactly work like "git annotate" when range boundaries are involved. * "git checkout file" when file is still unmerged checked out contents from a random high order stage, which was confusing. * "git clone $there $here/" with extra trailing slashes after explicit local directory name $here did not work as expected. * "git diff" on tracked contents with CRLF line endings did not drive "less" intelligently when showing added or removed lines. * "git diff --dirstat -M" did not add changes in subdirectories up correctly for renamed paths. * "git diff --cumulative" did not imply "--dirstat". * "git for-each-ref refs/heads/" did not work as expected. * "git gui" allowed users to feed patch without any context to be applied. * "git gui" botched parsing "diff" output when a line that begins with two dashes and a space gets removed or a line that begins with two pluses and a space gets added. * "git gui" translation updates and i18n fixes. * "git index-pack" is more careful against disk corruption while completing a thin pack. * "git log -i --grep=pattern" did not ignore case; neither "git log -E --grep=pattern" triggered extended regexp. * "git log --pretty="%ad" --date=short" did not use short format when showing the timestamp. * "git log --author=author" match incorrectly matched with the timestamp part of "author " line in commit objects. * "git log -F --author=author" did not work at all. * Build procedure for "git shell" that used stub versions of some functions and globals was not understood by linkers on some platforms. * "git stash" was fooled by a stat-dirty but otherwise unmodified paths and refused to work until the user refreshed the index. * "git svn" was broken on Perl before 5.8 with recent fixes to reduce use of temporary files. * "git verify-pack -v" did not work correctly when given more than one packfile. Also contains many documentation updates. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.6 2008/04/21 01:09:51 bjs Exp $ d19 2 @ 1.6 log @ Update devel/scmgit [1.5.4.5 -> 1.5.5] The scmgit-base package now installs most of its binaries, e.g. git-*, to ${PREFIX}/libexec/git-core/ instead of ${PREFIX}/bin. There are only two programs under ${LOCALBASE}/bin: the "master" git(7) wrapper program and the gitk tcl/tk repository browser. Given that there are many different GIT interfaces (GUI applications, devel/tig, shell completion scripts, etc.), it seemed needless to me to have 120+ binaries--a vast majority of which most users would seldom invoke directly--polluting ${LOCALBASE}/bin. GIT v1.5.5 Release Notes ======================== Updates since v1.5.4 -------------------- (subsystems) * Comes with git-gui 0.10.1 (portability) * We shouldn't ask for BSD group ownership semantics by setting g+s bit on directories on older BSD systems that refuses chmod() by non root users. BSD semantics is the default there anyway. * Bunch of portability improvement patches coming from an effort to port to Solaris has been applied. (performance) * On platforms with suboptimal qsort(3) implementation, there is an option to use more reasonable substitute we ship with our software. * New configuration variable "pack.packsizelimit" can be used in place of command line option --max-pack-size. * "git fetch" over the native git protocol used to make a connection to find out the set of current remote refs and another to actually download the pack data. We now use only one connection for these tasks. * "git commit" does not run lstat(2) more than necessary anymore. (usability, bells and whistles) * Bash completion script (in contrib) are aware of more commands and options. * You can be warned when core.autocrlf conversion is applied in such a way that results in an irreversible conversion. * A catch-all "color.ui" configuration variable can be used to enable coloring of all color-capable commands, instead of individual ones such as "color.status" and "color.branch". * The commands refused to take absolute pathnames where they require pathnames relative to the work tree or the current subdirectory. They now can take absolute pathnames in such a case as long as the pathnames do not refer outside of the work tree. E.g. "git add $(pwd)/foo" now works. * Error messages used to be sent to stderr, only to get hidden, when $PAGER was in use. They now are sent to stdout along with the command output to be shown in the $PAGER. * A pattern "foo/" in .gitignore file now matches a directory "foo". Pattern "foo" also matches as before. * bash completion's prompt helper function can talk about operation in-progress (e.g. merge, rebase, etc.). * Configuration variables "url..insteadof = " can be used to tell "git-fetch" and "git-push" to use different URL than what is given from the command line. * "git add -i" behaves better even before you make an initial commit. * "git am" refused to run from a subdirectory without a good reason. * After "git apply --whitespace=fix" fixes whitespace errors in a patch, a line before the fix can appear as a context or preimage line in a later patch, causing the patch not to apply. The command now knows to see through whitespace fixes done to context lines to successfully apply such a patch series. * "git branch" (and "git checkout -b") to branch from a local branch can optionally set "branch..merge" to mark the new branch to build on the other local branch, when "branch.autosetupmerge" is set to "always", or when passing the command line option "--track" (this option was ignored when branching from local branches). By default, this does not happen when branching from a local branch. * "git checkout" to switch to a branch that has "branch..merge" set (i.e. marked to build on another branch) reports how much the branch and the other branch diverged. * When "git checkout" has to update a lot of paths, it used to be silent for 4 seconds before it showed any progress report. It is now a bit more impatient and starts showing progress report early. * "git commit" learned a new hook "prepare-commit-msg" that can inspect what is going to be committed and prepare the commit log message template to be edited. * "git cvsimport" can now take more than one -M options. * "git describe" learned to limit the tags to be used for naming with --match option. * "git describe --contains" now barfs when the named commit cannot be described. * "git describe --exact-match" describes only commits that are tagged. * "git describe --long" describes a tagged commit as $tag-0-$sha1, instead of just showing the exact tagname. * "git describe" warns when using a tag whose name and path contradict with each other. * "git diff" learned "--relative" option to limit and output paths relative to the current directory when working in a subdirectory. * "git diff" learned "--dirstat" option to show birds-eye-summary of changes more concisely than "--diffstat". * "git format-patch" learned --cover-letter option to generate a cover letter template. * "git gc" learned --quiet option. * "git gc" now automatically prunes unreachable objects that are two weeks old or older. * "git gc --auto" can be disabled more easily by just setting gc.auto to zero. It also tolerates more packfiles by default. * "git grep" now knows "--name-only" is a synonym for the "-l" option. * "git help " now reports "'git ' is alias to ", instead of saying "No manual entry for git-". * "git help" can use different backends to show manual pages and this can be configured using "man.viewer" configuration. * "gitk" does not restore window position from $HOME/.gitk anymore (it still restores the size). * "git log --grep=" learned "--fixed-strings" option to look for without treating it as a regular expression. * "git gui" learned an auto-spell checking. * "git push HEAD" and "git push +HEAD" works as expected; they push the current branch (and only the current branch). In addition, HEAD can be written as the value of "remote..push" configuration variable. * When the configuration variable "pack.threads" is set to 0, "git repack" auto detects the number of CPUs and uses that many threads. * "git send-email" learned to prompt for passwords interactively. * "git send-email" learned an easier way to suppress CC recipients. * "git stash" learned "pop" command, that applies the latest stash and removes it from the stash, and "drop" command to discard the named stash entry. * "git submodule" learned a new subcommand "summary" to show the symmetric difference between the HEAD version and the work tree version of the submodule commits. * Various "git cvsimport", "git cvsexportcommit", "git cvsserver", "git svn" and "git p4" improvements. (internal) * Duplicated code between git-help and git-instaweb that launches user's preferred browser has been refactored. * It is now easier to write test scripts that records known breakages. * "git checkout" is rewritten in C. * "git remote" is rewritten in C. * Two conflict hunks that are separated by a very short span of common lines are now coalesced into one larger hunk, to make the result easier to read. * Run-command API's use of file descriptors is documented clearer and is more consistent now. * diff output can be sent to FILE * that is different from stdout. This will help reimplementing more things in C. Fixes since v1.5.4 ------------------ All of the fixes in v1.5.4 maintenance series are included in this release, unless otherwise noted. * "git-http-push" did not allow deletion of remote ref with the usual "push :" syntax. * "git-rebase --abort" did not go back to the right location if "git-reset" was run during the "git-rebase" session. * "git imap-send" without setting imap.host did not error out but segfaulted. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2008/03/03 00:35:13 bjs Exp $ d9 1 a9 1 DISTINFO_FILE= ${.CURDIR}/../scmgit-base/distinfo d19 1 a19 1 .include "${.CURDIR}/../scmgit/Makefile.common" @ 1.5 log @ Add USE_LANGUAGES=c (spotted by dh@@, thanks). Bump rev. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2008/02/28 15:11:29 bjs Exp $ a4 1 PKGREVISION= 1 @ 1.4 log @ Update to 1.5.4.3. While here, change pkgsrc Makefiles to use the included configure script. This not only makes our Makefiles more readable, but also performs various checks that were previously hard-coded, e.g. whether or not iconv's *char arguments are constified or not. We also no longer need the huge mess which checks for the asciidoc/xmlto versions in git-docs/Makefile. Also, misc. makefile fixes/stylistic changes and removal of Python dependencies. I don't see how they are needed. Python modules should be installed as seperate ${PKGPKGPREFIX}-scmgit packages. This was a somewhat radical change, so please report any problems. Changes since 1.5.4: * RPM spec used to pull in everything with 'git'. This has been changed so that 'git' package contains just the core parts, and we now supply 'git-all' metapackage to slurp in everything. This should match end user's expectation better. * When some refs failed to update, git-push reported "failure" which was unclear if some other refs were updated or all of them failed atomically (the answer is the former). Reworded the message to clarify this. * "git clone" from a repository whose HEAD was misconfigured did not set up the remote properly. Now it tries to do better. * Updated git-push documentation to clarify what "matching" means, in order to reduce user confusion. * Updated git-add documentation to clarify "add -u" operates in the current subdirectory you are in, just like other commands. * git-gui updates to work on OSX and Windows better. * The configuration parser was not prepared to see string valued variables misspelled as boolean and segfaulted. * Temporary files left behind due to interrupted object transfers were not cleaned up with "git prune". * "git config --unset" was confused when the unset variables were spelled with continuation lines in the config file. * The merge message detection in "git cvsimport" did not catch a message that began with "Merge...". * "git status" suggests "git rm --cached" for unstaging the earlier "git add" before the initial commit. * "git status" output was incorrect during a partial commit. * "git bisect" refused to start when the HEAD was detached. * "git bisect" allowed a wildcard character in the commit message expanded while writing its log file. * Manual pages were not formatted correctly with docbook xsl 1.72; added a workaround. * "git-commit -C $tag" used to work but rewrite in C done in 1.5.4 broke it. This was fixed in 1.5.4.1. * An entry in the .gitattributes file that names a pattern in a subdirectory of the directory it is in did not match correctly (e.g. pattern "b/*.c" in "a/.gitattributes" should match "a/b/foo.c" but it didn't). This was fixed in 1.5.4.1. * Customized color specification was parsed incorrectly when numeric color values are used. This was fixed in 1.5.4.1. * http transport misbehaved when linked with curl-gnutls. * "git-commit -C $tag" used to work but rewrite in C done in 1.5.4 broke it. * An entry in the .gitattributes file that names a pattern in a subdirectory of the directory it is in did not match correctly (e.g. pattern "b/*.c" in "a/.gitattributes" should match "a/b/foo.c" but it didn't). * Customized color specification was parsed incorrectly when numeric color values are used. This was fixed in 1.5.4.1. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2008/02/06 07:53:32 bjs Exp $ d5 1 d17 1 a17 1 USE_LANGUAGES= # none @ 1.3 log @ Update to git-1.5.4. Remove stray Makefile.common in scmgit-docs. There are quite a few changes and (welcomed) fixes: please see the release notes in ${WRKSRC}/Documentation/RelNotes-1.5.4. A small subset of the changes are included here. Added ----- * i18n support for gitk. Removal ------- * "git svnimport" was removed in favor of "git svn". It is still there in the source tree (contrib/examples) but unsupported. * As git-commit and git-status have been rewritten, "git runstatus" helper script lost all its users and has been removed. Fixes since v1.5.3 (unique to the 1.5.4 branch) ------------------ These fixes are only in v1.5.4 and not backported to v1.5.3 maintenance series. * The way "git diff --check" behaves is much more consistent with the way "git apply --whitespace=warn" works. * "git svn" talking with the SVN over HTTP will correctly quote branch and project names. * "git config" did not work correctly on platforms that define REG_NOMATCH to an even number. * Recent versions of AsciiDoc 8 has a change to break our documentation; a workaround has been implemented. * "git diff --color-words" colored context lines in a wrong color. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2007/12/22 01:07:01 joerg Exp $ a18 14 .include "../../mk/bsd.fast.prefs.mk" .for d in asciidoc docbook-xsl GITDOCDEP.${d}= ${${${PKG_INFO} -E ${d} || echo:L:sh}:L:C/[^[0-9]]*/ /g:[1..3]:ts.} .endfor .if !empty(GITDOCDEP.asciidoc:M[8]*) MAKE_ENV+= AsciiDoc8=YesPlease .endif .if !empty(GITDOCDEP.docbook-xsl:M1.7[2-9]*) MAKE_ENV+= DOCBOOK_XSL_172=YesPlease .endif @ 1.2 log @Ignore return value of pkg_info -E, at least during the first run the dependencies are likely to be missing. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1.1.1 2007/12/12 04:22:45 bjs Exp $ d7 2 @ 1.1 log @Initial revision @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.20 2007/11/19 06:31:55 bjs Exp $ d20 1 a20 1 GITDOCDEP.${d}= ${${${PKG_INFO} -E ${d}:L:sh}:L:C/[^[0-9]]*/ /g:[1..3]:ts.} @ 1.1.1.1 log @ Switch GIT to use a meta-pkg hierarchy like, for example, devel/subversion. Also, update to 1.5.3.7. Fixes since v1.5.3.6 -------------------- * git-send-email added 8-bit contents to the payload without marking it as 8-bit in a CTE header. * "git-bundle create a.bndl HEAD" dereferenced the symref and did not record the ref as 'HEAD'; this prevented a bundle from being used as a normal source of git-clone. * The code to reject nonsense command line of the form "git-commit -a paths..." and "git-commit --interactive paths..." were broken. * Adding a signature that is not ASCII-only to an original commit that is ASCII-only would make the result non-ASCII. "git-format-patch -s" did not mark such a message correctly with MIME encoding header. * git-add sometimes did not mark the resulting index entry stat-clean. This affected only cases when adding the contents with the same length as the previously staged contents, and the previous staging made the index entry "racily clean". * git-commit did not honor GIT_INDEX_FILE the user had in the environment. * When checking out a revision, git-checkout did not report where the updated HEAD is if you happened to have a file called HEAD in the work tree. * "git-rev-list --objects" mishandled a tree that points at a submodule. * "git cvsimport" was not ready for packed refs that "git gc" can produce and gave incorrect results. * Many scripted Porcelains were confused when you happened to have a file called "HEAD" in your work tree. * Miscellaneous updates to the user manual and documentation. @ text @@