cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 2.0.4; also install the "multimail" hooks as requested by djm@

Browse Source 
ok benoit@ (maintainer)
This commit is contained in:
pascal 2014-08-11 16:49:31 +00:00
parent d2c64fd08c
commit 9310567888
4 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
devel/git/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.113 2014/05/21 08:39:57 dcoppa Exp $
# $OpenBSD: Makefile,v 1.114 2014/08/11 16:49:31 pascal Exp $
COMMENT-main = GIT - Tree History Storage Tool
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
V = 1.9.3
V = 2.0.4
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
@ -24,7 +24,13 @@ EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}
MASTER_SITES = https://www.kernel.org/pub/software/scm/git/
MODULES = devel/gettext x11/tk
MODULES = devel/gettext x11/tk lang/python
MODPY_BUILDDEP = No
MODPY_RUNDEP = No
MODPY_ADJ_FILES = contrib/hooks/multimail/git_multimail.py \
contrib/hooks/multimail/migrate-mailhook-config \
contrib/hooks/multimail/post-receive
BUILD_DEPENDS = devel/p5-Error
@ -102,6 +108,11 @@ post-install:
pax -rw . ${PREFIX}/man
${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/post-receive-email \
${PREFIX}/share/git-core/templates/hooks/post-receive-email.sample
${INSTALL_DATA_DIR} ${PREFIX}/share/git-core/templates/hooks/multimail
.for f in git_multimail.py migrate-mailhook-config post-receive
${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/multimail/$f \
${PREFIX}/share/git-core/templates/hooks/multimail
.endfor
chown -R ${BINOWN}:${BINGRP} ${PREFIX}/libexec/git
cd ${WRKBUILD}/gitweb && \
${MAKE_ENV} ${MAKE_PROGRAM} gitwebdir=${TRUEPREFIX}/share/gitweb install

8
devel/git/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (git-1.9.3.tar.gz) = cbymd++juHoGDLod6eNRLnqw8JGX75XWSOUoDZptE1c=
SHA256 (git-manpages-1.9.3.tar.gz) = Q7+wnAcsz+DtSwrTDQTI80tq9NL1LNjf20h4fMnIUJ0=
SIZE (git-1.9.3.tar.gz) = 4846233
SIZE (git-manpages-1.9.3.tar.gz) = 571550
SHA256 (git-2.0.4.tar.gz) = 3Z3wK33Mdfl3fE+ALGuFYhgDhd3eTjuEeeB5+ZzR0ck=
SHA256 (git-manpages-2.0.4.tar.gz) = pM9SedQbRIkFs6mVjjXolFTXbi8UBN8TWe2XaU+c/f4=
SIZE (git-2.0.4.tar.gz) = 4905866
SIZE (git-manpages-2.0.4.tar.gz) = 575421

10
devel/git/patches/patch-Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.46 2014/05/21 08:39:57 dcoppa Exp $
--- Makefile.orig Fri May 9 20:55:10 2014
+++ Makefile Wed May 21 09:09:29 2014
@@ -2080,13 +2080,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
$OpenBSD: patch-Makefile,v 1.47 2014/08/11 16:49:31 pascal Exp $
--- Makefile.orig Thu Jul 31 00:10:29 2014
+++ Makefile Sun Aug 10 18:57:39 2014
@@ -2068,13 +2068,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
$(LIB_FILE): $(LIB_OBJS)
@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.46 2014/05/21 08:39:57 dcoppa Exp $
export DEFAULT_EDITOR DEFAULT_PAGER
@@ -2264,7 +2264,7 @@ export TEST_NO_MALLOC_CHECK
@@ -2255,7 +2255,7 @@ export TEST_NO_MALLOC_CHECK
### Testing rules

6
devel/git/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.57 2014/03/10 20:56:53 pascal Exp $
@comment $OpenBSD: PLIST-main,v 1.58 2014/08/11 16:49:31 pascal Exp $
@pkgpath devel/git
@bin bin/git
bin/git-cvsserver
@ -366,6 +366,10 @@ share/git-core/templates/description
share/git-core/templates/hooks/
share/git-core/templates/hooks/applypatch-msg.sample
share/git-core/templates/hooks/commit-msg.sample
share/git-core/templates/hooks/multimail/
share/git-core/templates/hooks/multimail/git_multimail.py
share/git-core/templates/hooks/multimail/migrate-mailhook-config
share/git-core/templates/hooks/multimail/post-receive
share/git-core/templates/hooks/post-receive-email.sample
share/git-core/templates/hooks/post-update.sample
share/git-core/templates/hooks/pre-applypatch.sample