[Midnightbsd-cvs] mports: devel/git: update to 1.6.2.1
ctriv at midnightbsd.org
ctriv at midnightbsd.org
Thu Apr 2 11:03:33 EDT 2009
Log Message:
-----------
update to 1.6.2.1
Modified Files:
--------------
mports/devel/git:
Makefile (r1.5 -> r1.6)
distinfo (r1.4 -> r1.5)
pkg-plist (r1.2 -> r1.3)
mports/devel/git/files:
patch-Makefile (r1.3 -> r1.4)
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/devel/git/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -L devel/git/pkg-plist -L devel/git/pkg-plist -u -r1.2 -r1.3
--- devel/git/pkg-plist
+++ devel/git/pkg-plist
@@ -1,155 +1,161 @@
+ at comment $MidnightBSD$
bin/git
-bin/git-p4
-bin/git-p4import
bin/git-upload-pack
bin/git-receive-pack
bin/git-upload-archive
-libexec/git-core/git-add
-libexec/git-core/git-add--interactive
+bin/git-shell
+ at exec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
+ at unexec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
+bin/git-cvsserver
+%%GUI%%bin/gitk
+bin/git-p4import
+bin/git-p4
+etc/rc.d/git_daemon.sh
+%%SITE_PERL%%/Git.pm
+lib/xemacs/site-lisp/git/git.el
+lib/xemacs/site-lisp/git/vc-git.el
+libexec/git-core/git-fast-import
+libexec/git-core/git-fetch-pack
+libexec/git-core/git-hash-object
+libexec/git-core/git-index-pack
+libexec/git-core/git-merge-index
+libexec/git-core/git-merge-tree
+libexec/git-core/git-mktag
+libexec/git-core/git-mktree
+libexec/git-core/git-pack-redundant
+libexec/git-core/git-patch-id
+libexec/git-core/git-send-pack
+libexec/git-core/git-shell
+libexec/git-core/git-show-index
+libexec/git-core/git-unpack-file
+libexec/git-core/git-update-server-info
+libexec/git-core/git-upload-pack
+libexec/git-core/git-var
+libexec/git-core/git-http-push
+libexec/git-core/git-daemon
+libexec/git-core/git-imap-send
libexec/git-core/git-am
+libexec/git-core/git-bisect
+libexec/git-core/git-filter-branch
+libexec/git-core/git-lost-found
+libexec/git-core/git-merge-octopus
+libexec/git-core/git-merge-one-file
+libexec/git-core/git-merge-resolve
+libexec/git-core/git-mergetool
+libexec/git-core/git-parse-remote
+libexec/git-core/git-pull
+libexec/git-core/git-quiltimport
+libexec/git-core/git-rebase--interactive
+libexec/git-core/git-rebase
+libexec/git-core/git-repack
+libexec/git-core/git-request-pull
+libexec/git-core/git-sh-setup
+libexec/git-core/git-stash
+libexec/git-core/git-submodule
+libexec/git-core/git-web--browse
+libexec/git-core/git-add--interactive
+libexec/git-core/git-archimport
+libexec/git-core/git-cvsexportcommit
+libexec/git-core/git-cvsimport
+libexec/git-core/git-cvsserver
+libexec/git-core/git-relink
+libexec/git-core/git-send-email
+libexec/git-core/git-svn
+libexec/git-core/git-instaweb
+%%GUI%%libexec/git-core/git-gui
+%%GUI%%libexec/git-core/git-gui--askpass
+%%GUI%%libexec/git-core/git-citool
+libexec/git-core/git-add
libexec/git-core/git-annotate
libexec/git-core/git-apply
-libexec/git-core/git-archimport
libexec/git-core/git-archive
-libexec/git-core/git-bisect
libexec/git-core/git-blame
libexec/git-core/git-branch
libexec/git-core/git-bundle
libexec/git-core/git-cat-file
libexec/git-core/git-check-attr
libexec/git-core/git-check-ref-format
-libexec/git-core/git-checkout
libexec/git-core/git-checkout-index
-libexec/git-core/git-cherry
-libexec/git-core/git-cherry-pick
-%%GUI%%libexec/git-core/git-citool
+libexec/git-core/git-checkout
+libexec/git-core/git-gc
libexec/git-core/git-clean
libexec/git-core/git-clone
-libexec/git-core/git-commit
libexec/git-core/git-commit-tree
+libexec/git-core/git-commit
libexec/git-core/git-config
libexec/git-core/git-count-objects
-libexec/git-core/git-cvsexportcommit
-libexec/git-core/git-cvsimport
-libexec/git-core/git-cvsserver
-libexec/git-core/git-daemon
libexec/git-core/git-describe
-libexec/git-core/git-diff
libexec/git-core/git-diff-files
libexec/git-core/git-diff-index
libexec/git-core/git-diff-tree
+libexec/git-core/git-diff
libexec/git-core/git-fast-export
-libexec/git-core/git-fast-import
-libexec/git-core/git-fetch
libexec/git-core/git-fetch--tool
-libexec/git-core/git-fetch-pack
-libexec/git-core/git-filter-branch
+libexec/git-core/git-fetch
libexec/git-core/git-fmt-merge-msg
libexec/git-core/git-for-each-ref
-libexec/git-core/git-format-patch
libexec/git-core/git-fsck
-libexec/git-core/git-fsck-objects
-libexec/git-core/git-gc
-libexec/git-core/git-get-tar-commit-id
libexec/git-core/git-grep
-%%GUI%%libexec/git-core/git-gui
-libexec/git-core/git-hash-object
-libexec/git-core/git-http-fetch
-libexec/git-core/git-http-push
-libexec/git-core/git-imap-send
-libexec/git-core/git-index-pack
-libexec/git-core/git-init
+libexec/git-core/git-help
libexec/git-core/git-init-db
-libexec/git-core/git-instaweb
libexec/git-core/git-log
-libexec/git-core/git-lost-found
libexec/git-core/git-ls-files
-libexec/git-core/git-ls-remote
libexec/git-core/git-ls-tree
+libexec/git-core/git-ls-remote
libexec/git-core/git-mailinfo
libexec/git-core/git-mailsplit
libexec/git-core/git-merge
libexec/git-core/git-merge-base
libexec/git-core/git-merge-file
-libexec/git-core/git-merge-index
-libexec/git-core/git-merge-octopus
-libexec/git-core/git-merge-one-file
libexec/git-core/git-merge-ours
libexec/git-core/git-merge-recursive
-libexec/git-core/git-merge-resolve
-libexec/git-core/git-merge-subtree
-libexec/git-core/git-merge-tree
-libexec/git-core/git-mergetool
-libexec/git-core/git-mktag
-libexec/git-core/git-mktree
libexec/git-core/git-mv
libexec/git-core/git-name-rev
libexec/git-core/git-pack-objects
-libexec/git-core/git-pack-redundant
libexec/git-core/git-pack-refs
-libexec/git-core/git-parse-remote
-libexec/git-core/git-patch-id
-libexec/git-core/git-peek-remote
-libexec/git-core/git-prune
libexec/git-core/git-prune-packed
-libexec/git-core/git-pull
+libexec/git-core/git-prune
libexec/git-core/git-push
-libexec/git-core/git-quiltimport
libexec/git-core/git-read-tree
-libexec/git-core/git-rebase
-libexec/git-core/git-rebase--interactive
libexec/git-core/git-receive-pack
libexec/git-core/git-reflog
-libexec/git-core/git-relink
libexec/git-core/git-remote
-libexec/git-core/git-repack
-libexec/git-core/git-repo-config
-libexec/git-core/git-request-pull
libexec/git-core/git-rerere
libexec/git-core/git-reset
libexec/git-core/git-rev-list
libexec/git-core/git-rev-parse
libexec/git-core/git-revert
libexec/git-core/git-rm
-libexec/git-core/git-send-email
-libexec/git-core/git-send-pack
-libexec/git-core/git-sh-setup
-libexec/git-core/git-shell
- at exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
- at unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
libexec/git-core/git-shortlog
-libexec/git-core/git-show
libexec/git-core/git-show-branch
-libexec/git-core/git-show-index
libexec/git-core/git-show-ref
-libexec/git-core/git-stash
-libexec/git-core/git-status
libexec/git-core/git-stripspace
-libexec/git-core/git-submodule
-libexec/git-core/git-svn
libexec/git-core/git-symbolic-ref
libexec/git-core/git-tag
libexec/git-core/git-tar-tree
-libexec/git-core/git-unpack-file
libexec/git-core/git-unpack-objects
libexec/git-core/git-update-index
libexec/git-core/git-update-ref
-libexec/git-core/git-update-server-info
libexec/git-core/git-upload-archive
-libexec/git-core/git-upload-pack
-libexec/git-core/git-var
libexec/git-core/git-verify-pack
libexec/git-core/git-verify-tag
-libexec/git-core/git-web--browse
-libexec/git-core/git-whatchanged
libexec/git-core/git-write-tree
-%%GUI%%bin/gitk
-%%SITE_PERL%%/Git.pm
-lib/xemacs/site-lisp/git/git.el
-lib/xemacs/site-lisp/git/vc-git.el
+libexec/git-core/git-http-fetch
+libexec/git-core/git-cherry
+libexec/git-core/git-cherry-pick
+libexec/git-core/git-format-patch
+libexec/git-core/git-fsck-objects
+libexec/git-core/git-get-tar-commit-id
+libexec/git-core/git-init
+libexec/git-core/git-merge-subtree
+libexec/git-core/git-peek-remote
+libexec/git-core/git-repo-config
+libexec/git-core/git-show
+libexec/git-core/git-stage
+libexec/git-core/git-status
+libexec/git-core/git-whatchanged
share/emacs/site-lisp/git/git.el
-share/emacs/site-lisp/git/vc-git.el
-share/git-core/templates/description
+share/emacs/site-lisp/git/git-blame.el
share/git-core/templates/hooks/applypatch-msg.sample
share/git-core/templates/hooks/commit-msg.sample
share/git-core/templates/hooks/post-commit.sample
@@ -161,6 +167,11 @@
share/git-core/templates/hooks/prepare-commit-msg.sample
share/git-core/templates/hooks/update.sample
share/git-core/templates/info/exclude
+share/git-core/templates/description
+%%GUI%%share/gitk/lib/msgs/de.msg
+%%GUI%%share/gitk/lib/msgs/es.msg
+%%GUI%%share/gitk/lib/msgs/it.msg
+%%GUI%%share/gitk/lib/msgs/sv.msg
%%GUI%%share/git-gui/lib/tclIndex
%%GUI%%share/git-gui/lib/about.tcl
%%GUI%%share/git-gui/lib/blame.tcl
@@ -182,53 +193,46 @@
%%GUI%%share/git-gui/lib/diff.tcl
%%GUI%%share/git-gui/lib/encoding.tcl
%%GUI%%share/git-gui/lib/error.tcl
-%%GUI%%share/git-gui/lib/git-gui.ico
%%GUI%%share/git-gui/lib/index.tcl
%%GUI%%share/git-gui/lib/logo.tcl
%%GUI%%share/git-gui/lib/merge.tcl
+%%GUI%%share/git-gui/lib/mergetool.tcl
%%GUI%%share/git-gui/lib/option.tcl
%%GUI%%share/git-gui/lib/remote.tcl
+%%GUI%%share/git-gui/lib/remote_add.tcl
%%GUI%%share/git-gui/lib/remote_branch_delete.tcl
+%%GUI%%share/git-gui/lib/search.tcl
%%GUI%%share/git-gui/lib/shortcut.tcl
%%GUI%%share/git-gui/lib/spellcheck.tcl
+%%GUI%%share/git-gui/lib/sshkey.tcl
%%GUI%%share/git-gui/lib/status_bar.tcl
+%%GUI%%share/git-gui/lib/tools.tcl
+%%GUI%%share/git-gui/lib/tools_dlg.tcl
%%GUI%%share/git-gui/lib/transport.tcl
%%GUI%%share/git-gui/lib/win32.tcl
+%%GUI%%share/git-gui/lib/git-gui.ico
%%GUI%%share/git-gui/lib/win32_shortcut.js
%%GUI%%share/git-gui/lib/msgs/de.msg
%%GUI%%share/git-gui/lib/msgs/fr.msg
%%GUI%%share/git-gui/lib/msgs/hu.msg
%%GUI%%share/git-gui/lib/msgs/it.msg
%%GUI%%share/git-gui/lib/msgs/ja.msg
+%%GUI%%share/git-gui/lib/msgs/nb.msg
%%GUI%%share/git-gui/lib/msgs/ru.msg
%%GUI%%share/git-gui/lib/msgs/sv.msg
%%GUI%%share/git-gui/lib/msgs/zh_cn.msg
-%%GUI%%share/gitk/lib/msgs/es.msg
-%%GUI%%share/gitk/lib/msgs/de.msg
-%%GUI%%share/gitk/lib/msgs/it.msg
-%%GUI%%share/gitk/lib/msgs/sv.msg
-%%GITWEB%%%%EXAMPLESDIR%%/gitweb/INSTALL
-%%GITWEB%%%%EXAMPLESDIR%%/gitweb/README
-%%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-favicon.png
-%%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-logo.png
-%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
-%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.css
-%%GITWEB%%@dirrm %%EXAMPLESDIR%%/gitweb
-%%GITWEB%%@dirrm %%EXAMPLESDIR%%
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git
- at dirrm lib/xemacs/site-lisp/git
- at dirrmtry lib/xemacs/site-lisp
- at dirrmtry lib/xemacs
- at dirrm share/emacs/site-lisp/git
-%%GUI%%@dirrm share/gitk/lib/msgs
-%%GUI%%@dirrm share/gitk/lib
-%%GUI%%@dirrm share/gitk
-%%GUI%%@dirrm share/git-gui/lib/msgs
-%%GUI%%@dirrm share/git-gui/lib
-%%GUI%%@dirrm share/git-gui
+ at dirrmtry lib/xemacs/site-lisp/git
@dirrm libexec/git-core
+ at dirrmtry share/emacs/site-lisp/git
@dirrm share/git-core/templates/branches
- at dirrmtry share/git-core/templates/hooks
+ at dirrm share/git-core/templates/hooks
@dirrm share/git-core/templates/info
- at dirrmtry share/git-core/templates
+ at dirrm share/git-core/templates
@dirrm share/git-core
+ at dirrm share/gitk/lib/msgs
+ at dirrm share/gitk/lib
+%%GUI%%@dirrm share/gitk
+%%GUI%%@dirrm share/git-gui/lib/msgs
+%%GUI%%@dirrm share/git-gui/lib
+%%GUI%%@dirrm share/git-gui
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/git/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -L devel/git/Makefile -L devel/git/Makefile -u -r1.5 -r1.6
--- devel/git/Makefile
+++ devel/git/Makefile
@@ -6,7 +6,7 @@
# $FreeBSD: ports/devel/git/Makefile,v 1.37 2008/09/23 02:42:22 wxs Exp $
PORTNAME= git
-PORTVERSION= 1.6.1.3
+PORTVERSION= 1.6.2.1
CATEGORIES= devel
MASTER_SITES= http://www.kernel.org/pub/software/scm/git/
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
@@ -19,151 +19,51 @@
COMMENT= Distributed source code management tool
LICENSE= gpl2
-BUILD_DEPENDS= curl:${PORTSDIR}/ftp/curl \
- ${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
-RUN_DEPENDS= curl:${PORTSDIR}/ftp/curl \
- cvsps:${PORTSDIR}/devel/cvsps \
+BUILD_DEPENDS= ${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
+
+RUN_DEPENDS= cvsps:${PORTSDIR}/devel/cvsps \
${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
${SITE_PERL}/Net/SMTP/SSL.pm:${PORTSDIR}/mail/p5-Net-SMTP-SSL
-LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
-
-CONFLICTS= cogito-0.1[012] git-4.*
+
+LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \
+ curl.5:${PORTSDIR}/ftp/curl
+
+CONFLICTS= cogito-0.1[012]
+
+MAN1= git-am.1 git-apply.1 git-archimport.1 git-archive.1 git-bisect.1 \
+ git-blame.1 git-branch.1 git-bundle.1 git-cat-file.1 git-check-attr.1 \
+ git-checkout-index.1 git-checkout.1 git-cherry-pick.1 git-cherry.1 \
+ git-clean.1 git-clone.1 git-commit-tree.1 git-commit.1 git-config.1 \
+ git-cvsexportcommit.1 git-cvsimport.1 git-cvsserver.1 git-daemon.1 \
+ git-describe.1 git-diff-files.1 git-diff-index.1 git-diff-tree.1 git-diff.1 \
+ git-fast-import.1 git-fetch-pack.1 git-fetch.1 git-filter-branch.1 \
+ git-fmt-merge-msg.1 git-for-each-ref.1 git-format-patch.1 git-gc.1 \
+ git-fsck.1 git-get-tar-commit-id.1 git-grep.1 git-hash-object.1 git-help.1 \
+ git-http-fetch.1 git-http-push.1 git-imap-send.1 git-index-pack.1 \
+ git-init-db.1 git-init.1 git-log.1 git-lost-found.1 git-ls-files.1 \
+ git-ls-remote.1 git-ls-tree.1 git-mailinfo.1 git-merge.1 git-mv.1 \
+ git-merge-file.1 git-merge-index.1 git-merge-one-file.1 git-merge-tree.1 \
+ git-mergetool.1 git-mktag.1 git-mktree.1 git-name-rev.1 git-pack-objects.1 \
+ git-pack-redundant.1 git-pack-refs.1 git-parse-remote.1 git-patch-id.1 \
+ git-peek-remote.1 git-prune-packed.1 git-prune.1 git-pull.1 git-push.1 \
+ git-read-tree.1 git-rebase.1 git-receive-pack.1 git-reflog.1 git-relink.1 \
+ git-remote.1 git-repack.1 git-repo-config.1 git-request-pull.1 git-rerere.1 \
+ git-reset.1 git-rev-list.1 git-revert.1 git-rm.1 git-send-pack.1 \
+ git-sh-setup.1 git-shell.1 git-shortlog.1 git-rev-parse.1 git-show-index.1 \
+ git-show-ref.1 git-show.1 git-stash.1 git-status.1 git-stripspace.1 \
+ git-submodule.1 git-svn.1 git-symbolic-ref.1 git-tag.1 git-unpack-file.1 \
+ git-unpack-objects.1 git-update-index.1 git-update-ref.1 \
+ git-update-server-info.1 git-upload-archive.1 git-upload-pack.1 git-var.1 \
+ git-verify-tag.1 git-write-tree.1 git-add.1 \
+ git-annotate.1 git-check-ref-format.1 git-count-objects.1 git-fast-export.1 \
+ git-fsck-objects.1 git-instaweb.1 git-mailsplit.1 git-merge-base.1 \
+ git-verify-pack.1 git-web--browse.1 git-quiltimport.1 git-send-email.1 \
+ git-show-branch.1 git-tar-tree.1 git-whatchanged.1
-MAN1= git-add.1 \
- git-am.1 \
- git-annotate.1 \
- git-apply.1 \
- git-archimport.1 \
- git-archive.1 \
- git-bisect.1 \
- git-blame.1 \
- git-branch.1 \
- git-bundle.1 \
- git-cat-file.1 \
- git-check-attr.1 \
- git-check-ref-format.1 \
- git-checkout-index.1 \
- git-checkout.1 \
- git-cherry-pick.1 \
- git-cherry.1 \
- git-clean.1 \
- git-clone.1 \
- git-commit-tree.1 \
- git-commit.1 \
- git-config.1 \
- git-count-objects.1 \
- git-cvsexportcommit.1 \
- git-cvsimport.1 \
- git-cvsserver.1 \
- git-daemon.1 \
- git-describe.1 \
- git-diff-files.1 \
- git-diff-index.1 \
- git-diff-tree.1 \
- git-diff.1 \
- git-fast-export.1 \
- git-fast-import.1 \
- git-fetch-pack.1 \
- git-fetch.1 \
- git-filter-branch.1 \
- git-fmt-merge-msg.1 \
- git-for-each-ref.1 \
- git-format-patch.1 \
- git-fsck-objects.1 \
- git-fsck.1 \
- git-gc.1 \
- git-get-tar-commit-id.1 \
- git-grep.1 \
- git-hash-object.1 \
- git-help.1 \
- git-http-fetch.1 \
- git-http-push.1 \
- git-imap-send.1 \
- git-index-pack.1 \
- git-init-db.1 \
- git-init.1 \
- git-instaweb.1 \
- git-log.1 \
- git-lost-found.1 \
- git-ls-files.1 \
- git-ls-remote.1 \
- git-ls-tree.1 \
- git-mailinfo.1 \
- git-mailsplit.1 \
- git-merge-base.1 \
- git-merge-file.1 \
- git-merge-index.1 \
- git-merge-one-file.1 \
- git-merge-tree.1 \
- git-merge.1 \
- git-mergetool.1 \
- git-mktag.1 \
- git-mktree.1 \
- git-mv.1 \
- git-name-rev.1 \
- git-pack-objects.1 \
- git-pack-redundant.1 \
- git-pack-refs.1 \
- git-parse-remote.1 \
- git-patch-id.1 \
- git-peek-remote.1 \
- git-prune-packed.1 \
- git-prune.1 \
- git-pull.1 \
- git-push.1 \
- git-quiltimport.1 \
- git-read-tree.1 \
- git-rebase.1 \
- git-receive-pack.1 \
- git-reflog.1 \
- git-relink.1 \
- git-remote.1 \
- git-repack.1 \
- git-repo-config.1 \
- git-request-pull.1 \
- git-rerere.1 \
- git-reset.1 \
- git-rev-list.1 \
- git-rev-parse.1 \
- git-revert.1 \
- git-rm.1 \
- git-send-email.1 \
- git-send-pack.1 \
- git-sh-setup.1 \
- git-shell.1 \
- git-shortlog.1 \
- git-show-branch.1 \
- git-show-index.1 \
- git-show-ref.1 \
- git-show.1 \
- git-stash.1 \
- git-status.1 \
- git-stripspace.1 \
- git-submodule.1 \
- git-svn.1 \
- git-symbolic-ref.1 \
- git-tag.1 \
- git-tar-tree.1 \
- git-unpack-file.1 \
- git-unpack-objects.1 \
- git-update-index.1 \
- git-update-ref.1 \
- git-update-server-info.1 \
- git-upload-archive.1 \
- git-upload-pack.1 \
- git-var.1 \
- git-verify-pack.1 \
- git-verify-tag.1 \
- git-web--browse.1 \
- git-whatchanged.1 \
- git-write-tree.1
-MAN3= Git.3
-MAN5= gitattributes.5 \
- gitignore.5 \
- gitmodules.5
+MAN3= Git.3
+MAN5= gitignore.5 gitattributes.5 gitmodules.5
SUB_FILES= pkg-message
-PKGMESSAGE= ${WRKDIR}/pkg-message
USE_BZIP2= yes
USE_PERL5= yes
@@ -180,8 +80,6 @@
USE_OPENSSL= yes
USE_RC_SUBR= git_daemon
-SHELLS= /etc/shells
-
OPTIONS= GUI "Enable building of GUI tools" on \
SVN "Enable required dependencies for SVN tools" off \
GITWEB "Install gitweb" off
@@ -239,7 +137,7 @@
${MKDIR} ${PREFIX}/lib/xemacs/site-lisp/git
${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \
${PREFIX}/share/emacs/site-lisp/git/
- ${INSTALL_DATA} ${WRKSRC}/contrib/emacs/vc-git.el \
+ ${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git-blame.el \
${PREFIX}/share/emacs/site-lisp/git/
${LN} -sf ${PREFIX}/share/emacs/site-lisp/git/git.el \
${PREFIX}/lib/xemacs/site-lisp/git/git.el
@@ -261,10 +159,4 @@
${INSTALL_SCRIPT} ${WRKSRC}/gitweb/gitweb.cgi ${EXAMPLESDIR}/gitweb/
.endif
- @${ECHO_MSG} "===> Updating ${SHELLS}"
- @${CP} ${SHELLS} ${SHELLS}.bak
- @(${GREP} -v ${PREFIX}/bin/git-shell ${SHELLS}.bak; \
- ${ECHO_CMD} ${PREFIX}/bin/git-shell) > ${SHELLS}
- @${RM} ${SHELLS}.bak
-
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/devel/git/distinfo,v
retrieving revision 1.4
retrieving revision 1.5
diff -L devel/git/distinfo -L devel/git/distinfo -u -r1.4 -r1.5
--- devel/git/distinfo
+++ devel/git/distinfo
@@ -1,9 +1,12 @@
-MD5 (git-1.6.1.3.tar.bz2) = e31ea5ce9b076f5745056f01465e9602
-SHA256 (git-1.6.1.3.tar.bz2) = aef4814634ac9ce8119fabc4bd1c363bb946f73ed34475a4baaad09a3fb23682
-SIZE (git-1.6.1.3.tar.bz2) = 1973574
-MD5 (git-manpages-1.6.1.3.tar.bz2) = 8eb57492278ef4d471a899dbe9c30fcf
-SHA256 (git-manpages-1.6.1.3.tar.bz2) = ac3daa67b5f0a5bdf9c45dbf148c7f3c51e673f3a5460e00c55594a3cd51f1a4
-SIZE (git-manpages-1.6.1.3.tar.bz2) = 231623
-MD5 (git-1.6.1.3.tar.bz2.sign) = afbb0db39a03457bdc36574961303252
-SHA256 (git-1.6.1.3.tar.bz2.sign) = 5c67761af8792ccf05908506c438219578449b647ae633384bfd0a92bf47313b
-SIZE (git-1.6.1.3.tar.bz2.sign) = 248
+MD5 (git-1.6.2.1.tar.bz2) = e96481361887f63227fdaa5ccdbb03b7
+SHA256 (git-1.6.2.1.tar.bz2) = 519a4a137b282771297f9991ec231301106d4e35420e92345f92a8e82933a79c
+RMD160 (git-1.6.2.1.tar.bz2) = 8a4a2972304d799636339f6f65110c9c25986a28
+SIZE (git-1.6.2.1.tar.bz2) = 2017208
+MD5 (git-manpages-1.6.2.1.tar.bz2) = 90464ce3082b6a00bf6b274047e9e0e5
+SHA256 (git-manpages-1.6.2.1.tar.bz2) = 43a1994de25f75cfa1a4d62f0927f25be77b545089cadafd0f602707522d7a14
+RMD160 (git-manpages-1.6.2.1.tar.bz2) = acda3fcd283ec9108b3d29b0c26af489ab343fe3
+SIZE (git-manpages-1.6.2.1.tar.bz2) = 236479
+MD5 (git-1.6.2.1.tar.bz2.sign) = 5bdafad181c12ba019eb89e4744f137f
+SHA256 (git-1.6.2.1.tar.bz2.sign) = c78ab484063053542e0b03962ab9f8e07ac45636d792fcc090392dab672d0351
+RMD160 (git-1.6.2.1.tar.bz2.sign) = 85882aa5b8973d09eaf4904c52abc8db32d5c353
+SIZE (git-1.6.2.1.tar.bz2.sign) = 248
Index: patch-Makefile
===================================================================
RCS file: /home/cvs/mports/devel/git/files/patch-Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L devel/git/files/patch-Makefile -L devel/git/files/patch-Makefile -u -r1.3 -r1.4
--- devel/git/files/patch-Makefile
+++ devel/git/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2008-12-25 00:33:25.000000000 -0500
-+++ Makefile 2009-01-14 09:37:39.152324285 -0500
-@@ -170,8 +170,8 @@
+--- ./Makefile.orig 2009-03-15 17:59:04 -0400
++++ ./Makefile 2009-03-21 03:33:49 -0400
+@@ -173,8 +173,8 @@
# CFLAGS and LDFLAGS are for the users to override from the command line.
@@ -11,25 +11,29 @@
ALL_CFLAGS = $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
STRIP ?= strip
-@@ -188,12 +188,12 @@
-
+@@ -194,8 +194,8 @@
prefix = $(HOME)
- bindir = $(prefix)/bin
--mandir = $(prefix)/share/man
--infodir = $(prefix)/share/info
-+mandir = $(prefix)/man
-+infodir = $(prefix)/info
- gitexecdir = $(prefix)/libexec/git-core
+ bindir_relative = bin
+ bindir = $(prefix)/$(bindir_relative)
+-mandir = share/man
+-infodir = share/info
++mandir = man
++infodir = info
+ gitexecdir = libexec/git-core
sharedir = $(prefix)/share
- template_dir = $(sharedir)/git-core/templates
--htmldir=$(sharedir)/doc/git-doc
-+htmldir=$(sharedir)/doc/git
- ifeq ($(prefix),/usr)
- sysconfdir = /etc
- else
-@@ -223,16 +223,16 @@
+ template_dir = share/git-core/templates
+@@ -212,7 +212,7 @@
+
+ # default configuration for gitweb
+ GITWEB_CONFIG = gitweb_config.perl
+-GITWEB_CONFIG_SYSTEM = /etc/gitweb.conf
++GITWEB_CONFIG_SYSTEM = $(prefix)/etc/gitweb.conf
+ GITWEB_HOME_LINK_STR = projects
+ GITWEB_SITENAME =
+ GITWEB_PROJECTROOT = /pub/git
+@@ -230,16 +230,16 @@
- export prefix bindir sharedir htmldir sysconfdir
+ export prefix bindir sharedir sysconfdir
-CC = gcc
-AR = ar
@@ -54,7 +58,7 @@
export TCL_PATH TCLTK_PATH
-@@ -865,9 +865,9 @@
+@@ -880,9 +880,9 @@
endif
ifndef NO_OPENSSL
OPENSSL_LIBSSL = -lssl
More information about the Midnightbsd-cvs
mailing list