aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/git/Makefile22
-rw-r--r--devel/git/distinfo36
-rw-r--r--devel/git/files/git_daemon.in2
-rw-r--r--devel/git/files/patch-gitk-git__gitk10
-rw-r--r--devel/git/pkg-plist23
5 files changed, 48 insertions, 45 deletions
diff --git a/devel/git/Makefile b/devel/git/Makefile
index 149c809007ed..1c81df4998c0 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= git
-PORTVERSION= 1.7.1
+PORTVERSION= 1.7.1.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_KERNEL_ORG}
MASTER_SITE_SUBDIR= software/scm/${PORTNAME}
@@ -167,15 +167,12 @@ MAN7= gitcli.7 \
gitworkflows.7
SUB_FILES= pkg-message
-PLIST_SUB= PYTHON_VER=${PYTHON_VER}
PKGMESSAGE= ${WRKDIR}/pkg-message
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_PYTHON= yes
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
-CONFIGURE_ARGS+= --with-python=${LOCALBASE}/bin/python
MAKE_ENV+= LIBMD_SHA1=yes \
V=1
MAKE_ARGS+= prefix="${PREFIX}"
@@ -198,6 +195,19 @@ OPTIONS= GUI "Enable building of GUI tools" off \
.include <bsd.port.options.mk>
+.ifndef (WITH_DEBUG)
+ALL_TARGET= all strip
+.endif
+
+.ifdef (WITH_P4) || defined (WITH_CONTRIB)
+USE_PYTHON= yes
+PLIST_SUB= PYTHON_VER=${PYTHON_VER} PYTHON=""
+CONFIGURE_ARGS+= --with-python=${LOCALBASE}/bin/python
+.else
+CONFIGURE_ARGS+= --without-python
+PLIST_SUB+= PYTHON="@comment "
+.endif
+
.ifdef (WITH_PERL)
USE_PERL5= yes
MAKE_ENV+= PERL_PATH=${PERL}
@@ -244,13 +254,13 @@ MAN1+= git-citool.1 \
git-gui.1 \
gitk.1
PLIST_SUB+= GUI=""
-MAKE_ENV+= TCL_PATH=${TCLSH} TCLTK_PATH=${WISH}
+MAKE_ARGS+= TCL_PATH=${TCLSH} TCLTK_PATH=${WISH}
.else
RMMAN1+= git-citool.1 \
git-gui.1 \
gitk.1
PLIST_SUB+= GUI="@comment "
-MAKE_ENV+= NO_TCLTK=yes
+MAKE_ARGS+= NO_TCLTK=yes
.endif
.ifdef (WITH_SVN)
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 8d7c3bad2369..193695a16a8b 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,18 +1,18 @@
-MD5 (git-1.7.1.tar.bz2) = 3da231dbe82ad103373cb530ae7475d5
-SHA256 (git-1.7.1.tar.bz2) = bcf008ec9639480a3ebfdc4708743b6c0978a8bd3103a2dda587ea9473b9dde2
-SIZE (git-1.7.1.tar.bz2) = 2475655
-MD5 (git-manpages-1.7.1.tar.bz2) = 50c3e1119a2197de208cbb69c7da0a50
-SHA256 (git-manpages-1.7.1.tar.bz2) = f4898ba376cfb407ccf266e6fcee95c4cfc36387823629923f9e742cfdffda0c
-SIZE (git-manpages-1.7.1.tar.bz2) = 276911
-MD5 (git-htmldocs-1.7.1.tar.bz2) = bc4bdafdc1b257c40564d47bc5c97365
-SHA256 (git-htmldocs-1.7.1.tar.bz2) = fc4efd0ea040ea7684a0101f6614f9ee6398e77fdbed9338f61426b962a2270a
-SIZE (git-htmldocs-1.7.1.tar.bz2) = 873917
-MD5 (git-1.7.1.tar.bz2.sign) = 069898955034bfbc8f1765a9ebc95bc2
-SHA256 (git-1.7.1.tar.bz2.sign) = eecd9c62befbc0ef44f95a35990e60b82a982767ac432d2c49683ea15cb0a9d5
-SIZE (git-1.7.1.tar.bz2.sign) = 248
-MD5 (git-manpages-1.7.1.tar.bz2.sign) = bb484921ecb8bbe59d697f09b897a433
-SHA256 (git-manpages-1.7.1.tar.bz2.sign) = 1dd3e9b66ee21261002feb4fd9e331d4b45ea54e18de2a27d6fc9bcdc4f66a75
-SIZE (git-manpages-1.7.1.tar.bz2.sign) = 248
-MD5 (git-htmldocs-1.7.1.tar.bz2.sign) = 443480c9b831cac38812191a59c46c17
-SHA256 (git-htmldocs-1.7.1.tar.bz2.sign) = 15c52324ee6c3e6f1866dbdd8dc2f47f9ffeff3c716eaff2b542938247971b4a
-SIZE (git-htmldocs-1.7.1.tar.bz2.sign) = 248
+MD5 (git-1.7.1.1.tar.bz2) = 1b116a3e2ecce46a89e4272abf0de955
+SHA256 (git-1.7.1.1.tar.bz2) = f70c0fbb4445d3b638febbf33393adfc43d547926349c1df0a69f290a6b9c14a
+SIZE (git-1.7.1.1.tar.bz2) = 2491729
+MD5 (git-manpages-1.7.1.1.tar.bz2) = d56a2b79e76efa7b207335f562fbefbe
+SHA256 (git-manpages-1.7.1.1.tar.bz2) = ebb0732f5058dd365683b40ca6aa937a4bc31d971a6c73cde0176ae14e923af0
+SIZE (git-manpages-1.7.1.1.tar.bz2) = 279139
+MD5 (git-htmldocs-1.7.1.1.tar.bz2) = 642edbab5bcf66694c07e0929c0ca223
+SHA256 (git-htmldocs-1.7.1.1.tar.bz2) = 075b99aa5af90f220961cc6adaeac4ee1270ce4212d4d5fe790129ab09e184a3
+SIZE (git-htmldocs-1.7.1.1.tar.bz2) = 881196
+MD5 (git-1.7.1.1.tar.bz2.sign) = 6266e0503155b2bbf1698f6173b1edb8
+SHA256 (git-1.7.1.1.tar.bz2.sign) = 12d23bde39070e07bf6aaa5e3b3dd3a6c43d544a22abc497c54cdd8123d5ffea
+SIZE (git-1.7.1.1.tar.bz2.sign) = 248
+MD5 (git-manpages-1.7.1.1.tar.bz2.sign) = d978e98ad641a9ff09d938a3237b06b5
+SHA256 (git-manpages-1.7.1.1.tar.bz2.sign) = 5a5a909ff43f8cccc83b301d22dae48ee8d5f01f2f78b2d59f00275877a9646b
+SIZE (git-manpages-1.7.1.1.tar.bz2.sign) = 248
+MD5 (git-htmldocs-1.7.1.1.tar.bz2.sign) = ffd72035d4c2065a295c4dd9c65a61f2
+SHA256 (git-htmldocs-1.7.1.1.tar.bz2.sign) = b89dd4fe2219632534b9caa973db00217c50cb6386cf405e7cd3215c80ba4868
+SIZE (git-htmldocs-1.7.1.1.tar.bz2.sign) = 248
diff --git a/devel/git/files/git_daemon.in b/devel/git/files/git_daemon.in
index 4cb3702e3507..40ef95a6dc48 100644
--- a/devel/git/files/git_daemon.in
+++ b/devel/git/files/git_daemon.in
@@ -26,4 +26,6 @@ load_rc_config $name
command="%%PREFIX%%/libexec/git-core/git-daemon"
command_args="${git_daemon_directory}"
+PATH="${PATH}:%%PREFIX%%/libexec/git-core"
+
run_rc_command "$1"
diff --git a/devel/git/files/patch-gitk-git__gitk b/devel/git/files/patch-gitk-git__gitk
deleted file mode 100644
index 754d8b22fd14..000000000000
--- a/devel/git/files/patch-gitk-git__gitk
+++ /dev/null
@@ -1,10 +0,0 @@
---- gitk-git/gitk.orig 2010-05-05 13:57:21.735128362 -0400
-+++ gitk-git/gitk 2010-05-05 13:57:43.312517678 -0400
-@@ -1,6 +1,6 @@
- #!/bin/sh
- # Tcl ignores the next line -*- tcl -*- \
--exec wish "$0" -- "$@"
-+exec wish8.5 "$0" -- "$@"
-
- # Copyright © 2005-2009 Paul Mackerras. All rights reserved.
- # This program is free software; it may be used, copied, modified
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index e57132a526ab..a0beded58198 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -6,15 +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
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/util.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/util.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/git.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/git.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/git_remote_helpers/git/__init__.pyc
+%%PYTHON%%%%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
@@ -759,6 +759,7 @@ share/git-core/templates/info/exclude
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.5.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.6.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.1.1.txt
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/INSTALL
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/README
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-favicon.png
@@ -882,5 +883,5 @@ share/git-core/templates/info/exclude
%%CONTRIB%%@dirrm share/git-core/contrib/workdir
%%CONTRIB%%@dirrm share/git-core/contrib
@dirrm share/git-core
-@dirrm %%PYTHON_SITELIBDIR%%/git_remote_helpers/git
-@dirrm %%PYTHON_SITELIBDIR%%/git_remote_helpers
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/git_remote_helpers/git
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/git_remote_helpers
generated by cgit (git 2.34.1) at 2025-01-18 12:40:36 +0800