aboutsummaryrefslogtreecommitdiffstats
path: root/devel/git
diff options
context:
space:
mode:
authorwxs <wxs@FreeBSD.org>2010-02-15 01:06:00 +0800
committerwxs <wxs@FreeBSD.org>2010-02-15 01:06:00 +0800
commite7570b11710be05af5d2ba640f1af6fd0115525c (patch)
tree75843fb33d16d586ad8022ef61b252d390f2d770 /devel/git
parent1b37456c92a96af7ea6a2bf718004a153b6df500 (diff)
downloadfreebsd-ports-gnome-e7570b11710be05af5d2ba640f1af6fd0115525c.tar.gz
freebsd-ports-gnome-e7570b11710be05af5d2ba640f1af6fd0115525c.tar.zst
freebsd-ports-gnome-e7570b11710be05af5d2ba640f1af6fd0115525c.zip
- Update to 1.6.6.2
- Switch to including bsd.port.options.mk - Don't link with libiconv when the option is not selected [1] - Add --reuseaddr to git_daemon_flags [2] PR: [1]: ports/143683 [2]: ports/143275 Submitted by: [1]: Stef Walter <stef@memberwebs.com> [2]: Philippe Pepiot <phil@philpep.org>
Diffstat (limited to 'devel/git')
-rw-r--r--devel/git/Makefile6
-rw-r--r--devel/git/distinfo18
-rw-r--r--devel/git/files/git_daemon.in2
-rw-r--r--devel/git/pkg-plist1
4 files changed, 14 insertions, 13 deletions
diff --git a/devel/git/Makefile b/devel/git/Makefile
index b9031091d373..9264c58a3d6d 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= git
-PORTVERSION= 1.6.6.1
+PORTVERSION= 1.6.6.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_KERNEL_ORG}
MASTER_SITE_SUBDIR= software/scm/${PORTNAME}
@@ -183,7 +183,7 @@ OPTIONS= GUI "Enable building of GUI tools" off \
ICONV "Support for multiple character encodings" on \
CURL "Support HTTP push and pull" on
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.ifdef (WITH_PERL)
USE_PERL5= yes
@@ -362,4 +362,4 @@ post-install:
@${CAT} ${PKGMESSAGE}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 0ec98af5dfab..7f8edd51e177 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,9 +1,9 @@
-MD5 (git-1.6.6.1.tar.bz2) = 9d254bfdae56c6fa124d8a1312a1b034
-SHA256 (git-1.6.6.1.tar.bz2) = 79c3049913a11b966b92406ec3ef6c7c5eb680cfa2a8b0c1abb167b1bfaf9769
-SIZE (git-1.6.6.1.tar.bz2) = 2331778
-MD5 (git-manpages-1.6.6.1.tar.bz2) = 18cbc20056058ef4d336896f628fc3b8
-SHA256 (git-manpages-1.6.6.1.tar.bz2) = 8282a948e8d06d75cad38e91ef6ca99871f44021c5e2ddd1c50327259a808236
-SIZE (git-manpages-1.6.6.1.tar.bz2) = 264778
-MD5 (git-1.6.6.1.tar.bz2.sign) = c083aaf73085d1d707fa8a70bf7d5b30
-SHA256 (git-1.6.6.1.tar.bz2.sign) = c8cea1e887fc4e98a81e0e8fd95d184fab610ebb79b70c96c2d9fe095b95554f
-SIZE (git-1.6.6.1.tar.bz2.sign) = 248
+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
diff --git a/devel/git/files/git_daemon.in b/devel/git/files/git_daemon.in
index e0481d26b2ee..41b14541cc0d 100644
--- a/devel/git/files/git_daemon.in
+++ b/devel/git/files/git_daemon.in
@@ -21,7 +21,7 @@ load_rc_config $name
: ${git_daemon_enable:=NO}
: ${git_daemon_directory:=%%PREFIX%%/git}
-: ${git_daemon_flags:="--syslog"}
+: ${git_daemon_flags:="--syslog --reuseaddr"}
command="%%PREFIX%%/libexec/git-core/git-daemon"
command_args="${git_daemon_directory} &"
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 4556ce4c8295..2db366401b9a 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -734,6 +734,7 @@ share/git-core/templates/info/exclude
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.5.8.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.6.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.6.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.6.2.txt
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/INSTALL
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/README
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-favicon.png