mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

- Update git to 2.4.6

Browse Source 
- Regenerate patches with make makepatch to silence portlint
- Change CONFLICTS to CONFLICTS_INSTALL
This commit is contained in:
Renato Botelho 2015-07-17 13:02:48 +00:00
parent 6c1c844068
commit f92f9fedc2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=392375
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/git-lite/Makefile
View File

@ -10,7 +10,7 @@ DESCR= ${.CURDIR}/pkg-descr
OPTIONS_EXCLUDE=GUI SVN GITWEB CONTRIB P4 CVS PERL
CONFLICTS= git-[0-9]* git-subversion-[0-9]*
CONFLICTS_INSTALL= git-[0-9]* git-subversion-[0-9]*
DISTINFO_FILE= ${MASTERDIR}/distinfo

2
devel/git-subversion/Makefile
View File

@ -10,7 +10,7 @@ DESCR= ${.CURDIR}/pkg-descr
OPTIONS_SLAVE= SVN
CONFLICTS= git-[0-9]* git-lite-[0-9]*
CONFLICTS_INSTALL= git-[0-9]* git-lite-[0-9]*
DISTINFO_FILE= ${MASTERDIR}/distinfo

5
devel/git/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= git
PORTVERSION= 2.4.5
PORTREVISION= 1
PORTVERSION= 2.4.6
CATEGORIES= devel
MASTER_SITES= KERNEL_ORG/software/scm/git
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@ -17,7 +16,7 @@ COMMENT?= Distributed source code management tool
LICENSE= GPLv2
CONFLICTS?= git-subversion-[0-9]* git-lite-[0-9]*
CONFLICTS_INSTALL?= git-subversion-[0-9]* git-lite-[0-9]*
USERS= git_daemon
GROUPS= git_daemon

12
devel/git/distinfo
View File

@ -1,6 +1,6 @@
SHA256 (git-2.4.5.tar.xz) = c31a5f5f72e025f8fe26845032a06683c7e5c1a73236c2353b5606ddd22e0494
SIZE (git-2.4.5.tar.xz) = 3689940
SHA256 (git-manpages-2.4.5.tar.xz) = abe54047035302a22aed13118c4fcb58e423d0c1ba61dcbc3843b822246fed3e
SIZE (git-manpages-2.4.5.tar.xz) = 373488
SHA256 (git-htmldocs-2.4.5.tar.xz) = 69f0297d4ba56597ae5837366d5fd87c450f1476a743a5933d2974fdad6e8285
SIZE (git-htmldocs-2.4.5.tar.xz) = 994632
SHA256 (git-2.4.6.tar.xz) = bdd944571c03474517b6c9941d6f1fd735eccbb164e59fd133d38644b69453b6
SIZE (git-2.4.6.tar.xz) = 3690432
SHA256 (git-manpages-2.4.6.tar.xz) = f32d267bdaab75812dbd116d2b329d6dc7287a974e929e380e8cbf96e3822b8e
SIZE (git-manpages-2.4.6.tar.xz) = 373408
SHA256 (git-htmldocs-2.4.6.tar.xz) = 5213e8b882293ec3cda247dabbc75c6ee5243b9d330a8fafec004952fae91a88
SIZE (git-htmldocs-2.4.6.tar.xz) = 994712

8
devel/git/files/patch-Documentation__Makefile
View File

@ -1,6 +1,6 @@
--- ./Documentation/Makefile.orig 2013-08-27 12:08:25.000000000 -0400
+++ ./Documentation/Makefile 2013-08-27 12:09:18.000000000 -0400
@@ -83,11 +83,11 @@
--- Documentation/Makefile.orig 2015-07-15 20:29:34 UTC
+++ Documentation/Makefile
@@ -86,11 +86,11 @@ DOC_MAN1 = $(patsubst %.txt,%.1,$(MAN1_T
DOC_MAN5 = $(patsubst %.txt,%.5,$(MAN5_TXT))
DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT))
@ -15,7 +15,7 @@
mandir ?= $(prefix)/share/man
man1dir = $(mandir)/man1
man5dir = $(mandir)/man5
@@ -202,7 +202,7 @@
@@ -212,7 +212,7 @@ ifndef V
endif
endif

12
devel/git/files/patch-Makefile
View File

@ -1,6 +1,6 @@
--- Makefile.orig 2013-06-12 14:17:51.000000000 -0400
+++ Makefile 2013-06-12 14:24:27.000000000 -0400
@@ -349,8 +349,8 @@
--- Makefile.orig 2015-07-15 20:29:34 UTC
+++ Makefile
@@ -366,8 +366,8 @@ GIT-VERSION-FILE: FORCE
# CFLAGS and LDFLAGS are for the users to override from the command line.
@ -11,7 +11,7 @@
ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
STRIP ?= strip
@@ -372,15 +372,15 @@
@@ -389,15 +389,15 @@ STRIP ?= strip
prefix = $(HOME)
bindir_relative = bin
bindir = $(prefix)/$(bindir_relative)
@ -31,7 +31,7 @@
ETC_GITCONFIG = $(sysconfdir)/gitconfig
ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
lib = lib
@@ -393,21 +393,21 @@
@@ -410,21 +410,21 @@ htmldir_relative = $(patsubst $(prefix)/
export prefix bindir sharedir sysconfdir gitwebdir localedir
@ -68,7 +68,7 @@
export TCL_PATH TCLTK_PATH
@@ -1154,9 +1154,9 @@
@@ -1090,9 +1090,9 @@ EXTLIBS += -lz
ifndef NO_OPENSSL
OPENSSL_LIBSSL = -lssl

1
devel/git/pkg-plist
View File

@ -1230,6 +1230,7 @@ share/git-core/templates/info/exclude
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.3.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.4.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.5.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.6.txt
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css