pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel Switch GIT to use a meta-pkg hierarchy like, for...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7287500c344a
branches:  trunk
changeset: 536385:7287500c344a
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Wed Dec 12 04:22:20 2007 +0000

description:
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.

diffstat:

 devel/scmgit-base/DESCR            |    9 +
 devel/scmgit-base/Makefile         |   57 ++++++++++
 devel/scmgit-base/PLIST            |  192 +++++++++++++++++++++++++++++++++++++
 devel/scmgit-base/distinfo         |   12 ++
 devel/scmgit-base/patches/patch-aa |   91 +++++++++++++++++
 devel/scmgit-base/patches/patch-ab |   22 ++++
 devel/scmgit-base/patches/patch-ae |   16 +++
 devel/scmgit-base/patches/patch-af |   29 +++++
 devel/scmgit-base/patches/patch-ag |   12 ++
 devel/scmgit-base/patches/patch-ah |   34 ++++++
 devel/scmgit-base/patches/patch-ai |   17 +++
 devel/scmgit-docs/DESCR            |    2 +
 devel/scmgit-docs/Makefile         |   33 ++++++
 devel/scmgit-docs/Makefile.common  |   27 +++++
 devel/scmgit-docs/PLIST            |  139 ++++++++++++++++++++++++++
 15 files changed, 692 insertions(+), 0 deletions(-)

diffs (truncated from 752 to 300 lines):

diff -r 59e54476ceeb -r 7287500c344a devel/scmgit-base/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/scmgit-base/DESCR   Wed Dec 12 04:22:20 2007 +0000
@@ -0,0 +1,9 @@
+GIT is a "directory content manager" designed to handle absolutely massive
+projects with speed and efficiency, and the release of the 2.6.12 (and later)
+versions of the Linux kernel as well as more and more other projects switching
+to it would indicate that it does this task well.
+
+GIT falls in the category of distributed version control software, similar
+to e.g. GNU Arch or Monotone (or, in the commercial world, BitKeeper). Every
+GIT working directory is a full-fledged repository with full revision tracking
+capabilities, not dependent on network access to a central server.
diff -r 59e54476ceeb -r 7287500c344a devel/scmgit-base/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/scmgit-base/Makefile        Wed Dec 12 04:22:20 2007 +0000
@@ -0,0 +1,57 @@
+# $NetBSD: Makefile,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $
+#
+
+.include "${.CURDIR}/../scmgit/Makefile.common"
+
+PKGNAME=               scmgit-base-${GIT_VERSION}
+COMMENT=               GIT Tree History Storage Tool (base package)
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+CONFLICTS+=            git-[0-9]*              # misc/git
+
+USE_LANGUAGES=         c99
+USE_TOOLS+=            perl:run sh:run wish:run
+
+MAKE_ENV+=             CURLDIR=${BUILDLINK_PREFIX.curl:Q}
+MAKE_ENV+=             PYTHON_PATH=${PYTHONBIN:Q}
+
+BUILD_TARGET=          all
+INSTALL_TARGET=                install
+
+PERL5_PACKLIST=                auto/Git/.packlist
+PERL5_CONFIGURE_DIRS=  ${WRKSRC}/perl
+
+.include "../../mk/bsd.fast.prefs.mk"
+.include "../../lang/python/application.mk"
+
+NEEDS_SUBPROCESS_PY!= \
+       if ok=`${PYTHONBIN} -c 'import subprocess; print "OK"' 2>/dev/null` \
+       && ${TEST} "$$ok" = "OK"; then echo "no"; else echo "yes"; fi
+.if ${NEEDS_SUBPROCESS_PY} == "yes"
+PLIST_SUBST+=  IF_NEEDS_SUBPROCESS_PY=""
+.else
+PLIST_SUBST+=  IF_NEEDS_SUBPROCESS_PY="@comment "
+.endif
+
+#.include "../../mk/emacs.mk" # XXX TODO (see patch-ad)
+
+## XXX Do all the BSDs fit this category?
+#
+.if ${OPSYS} == "NetBSD"
+CHECK_BUILTIN.iconv:=yes
+.  include "../../converters/libiconv/builtin.mk"
+CHECK_BUILTIN.iconv:=no
+.  if ${ICONV_TYPE} == "native"
+CFLAGS+=       -DOLD_ICONV
+.  endif
+.endif
+
+.include "../../lang/perl5/module.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff -r 59e54476ceeb -r 7287500c344a devel/scmgit-base/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/scmgit-base/PLIST   Wed Dec 12 04:22:20 2007 +0000
@@ -0,0 +1,192 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $
+bin/git
+bin/git-add
+bin/git-add--interactive
+bin/git-am
+bin/git-annotate
+bin/git-apply
+bin/git-archimport
+bin/git-archive
+bin/git-bisect
+bin/git-blame
+bin/git-branch
+bin/git-bundle
+bin/git-cat-file
+bin/git-check-attr
+bin/git-check-ref-format
+bin/git-checkout
+bin/git-checkout-index
+bin/git-cherry
+bin/git-cherry-pick
+bin/git-citool
+bin/git-clean
+bin/git-clone
+bin/git-commit
+bin/git-commit-tree
+bin/git-config
+bin/git-convert-objects
+bin/git-count-objects
+bin/git-cvsexportcommit
+bin/git-cvsimport
+bin/git-cvsserver
+bin/git-daemon
+bin/git-describe
+bin/git-diff
+bin/git-diff-files
+bin/git-diff-index
+bin/git-diff-tree
+bin/git-fast-import
+bin/git-fetch
+bin/git-fetch--tool
+bin/git-fetch-pack
+bin/git-filter-branch
+bin/git-fmt-merge-msg
+bin/git-for-each-ref
+bin/git-format-patch
+bin/git-fsck
+bin/git-fsck-objects
+bin/git-gc
+bin/git-get-tar-commit-id
+bin/git-grep
+bin/git-gui
+bin/git-hash-object
+bin/git-http-fetch
+bin/git-http-push
+bin/git-imap-send
+bin/git-index-pack
+bin/git-init
+bin/git-init-db
+bin/git-instaweb
+bin/git-local-fetch
+bin/git-log
+bin/git-lost-found
+bin/git-ls-files
+bin/git-ls-remote
+bin/git-ls-tree
+bin/git-mailinfo
+bin/git-mailsplit
+bin/git-merge
+bin/git-merge-base
+bin/git-merge-file
+bin/git-merge-index
+bin/git-merge-octopus
+bin/git-merge-one-file
+bin/git-merge-ours
+bin/git-merge-recursive
+bin/git-merge-resolve
+bin/git-merge-stupid
+bin/git-merge-subtree
+bin/git-merge-tree
+bin/git-mergetool
+bin/git-mktag
+bin/git-mktree
+bin/git-mv
+bin/git-name-rev
+bin/git-pack-objects
+bin/git-pack-redundant
+bin/git-pack-refs
+bin/git-parse-remote
+bin/git-patch-id
+bin/git-peek-remote
+bin/git-prune
+bin/git-prune-packed
+bin/git-pull
+bin/git-push
+bin/git-quiltimport
+bin/git-read-tree
+bin/git-rebase
+bin/git-rebase--interactive
+bin/git-receive-pack
+bin/git-reflog
+bin/git-relink
+bin/git-remote
+bin/git-repack
+bin/git-repo-config
+bin/git-request-pull
+bin/git-rerere
+bin/git-reset
+bin/git-rev-list
+bin/git-rev-parse
+bin/git-revert
+bin/git-rm
+bin/git-runstatus
+bin/git-send-email
+bin/git-send-pack
+bin/git-sh-setup
+bin/git-shell
+bin/git-shortlog
+bin/git-show
+bin/git-show-branch
+bin/git-show-index
+bin/git-show-ref
+bin/git-ssh-fetch
+bin/git-ssh-pull
+bin/git-ssh-push
+bin/git-ssh-upload
+bin/git-stash
+bin/git-status
+bin/git-stripspace
+bin/git-submodule
+bin/git-svn
+bin/git-svnimport
+bin/git-symbolic-ref
+bin/git-tag
+bin/git-tar-tree
+bin/git-unpack-file
+bin/git-unpack-objects
+bin/git-update-index
+bin/git-update-ref
+bin/git-update-server-info
+bin/git-upload-archive
+bin/git-upload-pack
+bin/git-var
+bin/git-verify-pack
+bin/git-verify-tag
+bin/git-whatchanged
+bin/git-write-tree
+bin/gitk
+share/git-core/templates/description
+share/git-core/templates/hooks/applypatch-msg
+share/git-core/templates/hooks/commit-msg
+share/git-core/templates/hooks/post-commit
+share/git-core/templates/hooks/post-receive
+share/git-core/templates/hooks/post-update
+share/git-core/templates/hooks/pre-applypatch
+share/git-core/templates/hooks/pre-commit
+share/git-core/templates/hooks/pre-rebase
+share/git-core/templates/hooks/update
+share/git-core/templates/info/exclude
+share/git-gui/lib/blame.tcl
+share/git-gui/lib/branch.tcl
+share/git-gui/lib/branch_checkout.tcl
+share/git-gui/lib/branch_create.tcl
+share/git-gui/lib/branch_delete.tcl
+share/git-gui/lib/branch_rename.tcl
+share/git-gui/lib/browser.tcl
+share/git-gui/lib/checkout_op.tcl
+share/git-gui/lib/choose_font.tcl
+share/git-gui/lib/choose_rev.tcl
+share/git-gui/lib/class.tcl
+share/git-gui/lib/commit.tcl
+share/git-gui/lib/console.tcl
+share/git-gui/lib/database.tcl
+share/git-gui/lib/diff.tcl
+share/git-gui/lib/encoding.tcl
+share/git-gui/lib/error.tcl
+share/git-gui/lib/index.tcl
+share/git-gui/lib/merge.tcl
+share/git-gui/lib/option.tcl
+share/git-gui/lib/remote.tcl
+share/git-gui/lib/remote_branch_delete.tcl
+share/git-gui/lib/shortcut.tcl
+share/git-gui/lib/status_bar.tcl
+share/git-gui/lib/tclIndex
+share/git-gui/lib/transport.tcl
+@dirrm share/git-gui/lib
+@dirrm share/git-gui
+@dirrm share/git-core/templates/info
+@dirrm share/git-core/templates/hooks
+@exec ${MKDIR} %D/share/git-core/templates/branches
+@dirrm share/git-core/templates/branches
+@dirrm share/git-core/templates
+@dirrm share/git-core
diff -r 59e54476ceeb -r 7287500c344a devel/scmgit-base/distinfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/scmgit-base/distinfo        Wed Dec 12 04:22:20 2007 +0000
@@ -0,0 +1,12 @@
+$NetBSD: distinfo,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $
+
+SHA1 (git-1.5.3.7.tar.gz) = 8a6b7f130f39765e8de8f32bb23d4799747ee190
+RMD160 (git-1.5.3.7.tar.gz) = 52ac1fb55341140abd18a226e8dd34654c79be61
+Size (git-1.5.3.7.tar.gz) = 1612748 bytes
+SHA1 (patch-aa) = 77ab1eaf9206534d2103e5481bcdc278ffb351d9
+SHA1 (patch-ab) = 6d9b08b20b3bbee931c8aa5842b03953e7cd2a7d
+SHA1 (patch-ae) = 44f30c796c922b028773668e80d71c0a48606f5c
+SHA1 (patch-af) = d2b6fff88913d89f37bf5453babc65027a6a5a54
+SHA1 (patch-ag) = feb17b439e0e4e89c25985f2e14e300d698c8dcf
+SHA1 (patch-ah) = 4cf802facbc3dd9f78e923427c4b5f455f954722
+SHA1 (patch-ai) = 569ca315a6ed73f8d06fa265945af3e2d920556a
diff -r 59e54476ceeb -r 7287500c344a devel/scmgit-base/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/scmgit-base/patches/patch-aa        Wed Dec 12 04:22:20 2007 +0000
@@ -0,0 +1,91 @@
+$NetBSD: patch-aa,v 1.1.1.1 2007/12/12 04:22:20 bjs Exp $
+
+NetBSD 3.0 needs -liconv, too.
+
+AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
+
+--- Makefile.orig      2007-12-01 16:21:12.000000000 -0500
++++ Makefile
+@@ -139,8 +139,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de
+ 



Home | Main Index | Thread Index | Old Index