diff options
Diffstat (limited to 'devel/git')
| -rw-r--r-- | devel/git/Makefile | 13 | ||||
| -rw-r--r-- | devel/git/distinfo | 18 | ||||
| -rw-r--r-- | devel/git/pkg-plist | 21 |
3 files changed, 34 insertions, 18 deletions
diff --git a/devel/git/Makefile b/devel/git/Makefile index 9264c58a3d6d..402641766dea 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -6,7 +6,7 @@ # PORTNAME= git -PORTVERSION= 1.6.6.2 +PORTVERSION= 1.7.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_KERNEL_ORG} MASTER_SITE_SUBDIR= software/scm/${PORTNAME} @@ -159,13 +159,16 @@ MAN7= gitcli.7 \ gittutorial-2.7 SUB_FILES= pkg-message +PLIST_SUB= PYTHON_VER=${PYTHON_VER} PKGMESSAGE= ${WRKDIR}/pkg-message USE_BZIP2= yes USE_GMAKE= yes +USE_PYTHON= yes CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib MAKE_ENV+= LIBMD_SHA1=yes \ - V=1 + V=1 \ + PYTHON_PATH=${LOCALBASE}/bin/python MAKE_ARGS+= prefix="${PREFIX}" USE_OPENSSL= yes USE_RC_SUBR= git_daemon @@ -259,12 +262,6 @@ IGNORE= using GITWEB support requires PERL support .endif .ifdef (WITH_P4) -#USE_PYTHON= yes -# Can't set USE_PYTHON here just yet. See ports/89648. -# Instead we will do it this way: -.include "${PORTSDIR}/Mk/bsd.python.mk" -RUN_DEPENDS+= python:${PORTSDIR}/lang/python -MAKE_ENV+= PYTHON_PATH=${LOCALBASE}/bin/python PLIST_SUB+= P4="" .else PLIST_SUB+= P4="@comment " diff --git a/devel/git/distinfo b/devel/git/distinfo index 7f8edd51e177..1c86ebf36cfa 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,9 +1,9 @@ -MD5 (git-1.6.6.2.tar.bz2) = 6f0a112c37ce6f47d762687130f26a1b -SHA256 (git-1.6.6.2.tar.bz2) = 4b81aba89336e0639ad28985e605a563a30bfbf8492e52b220952adf708f8a07 -SIZE (git-1.6.6.2.tar.bz2) = 2336377 -MD5 (git-manpages-1.6.6.2.tar.bz2) = 143a38ca17e3d328f6691a5d69184d88 -SHA256 (git-manpages-1.6.6.2.tar.bz2) = 961bb2412f685b562ed122e9f180d2154ddc214d9d0481835785e84f4baa24eb -SIZE (git-manpages-1.6.6.2.tar.bz2) = 264990 -MD5 (git-1.6.6.2.tar.bz2.sign) = 1b1225e1e7bc2bdc53143d9e6880d4fb -SHA256 (git-1.6.6.2.tar.bz2.sign) = 4c9f2ec89e790feffa8a3a2cabd26183c9b8f5a7015fdfedb86b61252da6f464 -SIZE (git-1.6.6.2.tar.bz2.sign) = 248 +MD5 (git-1.7.0.tar.bz2) = c7553b73e2156d187ece6ba936ae30ab +SHA256 (git-1.7.0.tar.bz2) = a61e863944381c4f8231841f678f41f56b634bebca486a61005b35e5bcbb7c79 +SIZE (git-1.7.0.tar.bz2) = 2430104 +MD5 (git-manpages-1.7.0.tar.bz2) = 1bb3b0ab6c6129d61455b0e2e7104cc8 +SHA256 (git-manpages-1.7.0.tar.bz2) = 62f629db43b2b2f5b871977a300cba43c25f67c7a03decad4d364c021b7573b6 +SIZE (git-manpages-1.7.0.tar.bz2) = 272259 +MD5 (git-1.7.0.tar.bz2.sign) = a4a08346d36344a877e85c589f271541 +SHA256 (git-1.7.0.tar.bz2.sign) = 00a85e5e3ffef02172743c9383a8d76a06ea15ca775cd3bb82272179ee396d4b +SIZE (git-1.7.0.tar.bz2.sign) = 248 diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist index 2db366401b9a..d40968181741 100644 --- a/devel/git/pkg-plist +++ b/devel/git/pkg-plist @@ -6,6 +6,15 @@ bin/git-receive-pack bin/git-upload-archive %%CVS%%bin/git-cvsserver bin/git-shell +%%PYTHON_SITELIBDIR%%/git_remote_helpers/__init__.pyc +%%PYTHON_SITELIBDIR%%/git_remote_helpers/__init__.py +%%PYTHON_SITELIBDIR%%/git_remote_helpers/util.pyc +%%PYTHON_SITELIBDIR%%/git_remote_helpers/util.py +%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/git.pyc +%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/git.py +%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/__init__.py +%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/__init__.pyc +%%PYTHON_SITELIBDIR%%/git_remote_helpers-0.1.0-py%%PYTHON_VER%%.egg-info libexec/git-core/git libexec/git-core/git-add libexec/git-core/git-add--interactive @@ -112,7 +121,10 @@ libexec/git-core/git-receive-pack libexec/git-core/git-reflog libexec/git-core/git-relink libexec/git-core/git-remote -%%CURL%%libexec/git-core/git-remote-curl +%%CURL%%libexec/git-core/git-remote-http +%%CURL%%libexec/git-core/git-remote-https +%%CURL%%libexec/git-core/git-remote-ftp +%%CURL%%libexec/git-core/git-remote-ftps libexec/git-core/git-repack libexec/git-core/git-repo-config libexec/git-core/git-replace @@ -210,6 +222,7 @@ share/git-core/templates/info/exclude %%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/themed.tcl %%GUI%%share/git-gui/lib/tools_dlg.tcl %%GUI%%share/git-gui/lib/tools.tcl %%GUI%%share/git-gui/lib/transport.tcl @@ -227,6 +240,8 @@ share/git-core/templates/info/exclude %%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/fr.msg +%%GUI%%share/gitk/lib/msgs/hu.msg %%GUI%%share/gitk/lib/msgs/it.msg %%GUI%%share/gitk/lib/msgs/ja.msg %%GUI%%share/gitk/lib/msgs/ru.msg @@ -418,6 +433,7 @@ share/git-core/templates/info/exclude %%HTMLDOCS%%%%DOCSDIR%%/git-revert.txt %%HTMLDOCS%%%%DOCSDIR%%/git-stash.txt %%HTMLDOCS%%%%DOCSDIR%%/pretty-formats.txt +%%HTMLDOCS%%%%DOCSDIR%%/date-formats.txt %%HTMLDOCS%%%%DOCSDIR%%/diff-options.txt %%HTMLDOCS%%%%DOCSDIR%%/git-send-pack.txt %%HTMLDOCS%%%%DOCSDIR%%/merge-options.txt @@ -735,6 +751,7 @@ share/git-core/templates/info/exclude %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.6.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.6.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.6.2.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.txt %%GITWEB%%%%EXAMPLESDIR%%/gitweb/INSTALL %%GITWEB%%%%EXAMPLESDIR%%/gitweb/README %%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-favicon.png @@ -764,3 +781,5 @@ share/git-core/templates/info/exclude @dirrm share/git-core/templates/info @dirrmtry share/git-core/templates @dirrm share/git-core +@dirrm %%PYTHON_SITELIBDIR%%/git_remote_helpers/git +@dirrm %%PYTHON_SITELIBDIR%%/git_remote_helpers |