On 08/11/14 18:24, Pascal Stumpf wrote:
> On Wed, 09 Jul 2014 09:57:12 +0200, Pascal Stumpf wrote:
>> On Tue, 8 Jul 2014 14:38:59 +1000 (EST), Damien Miller wrote: > On
>> Thu, 29 May 2014, Pascal Stumpf wrote: > > > Here's an update to the
>> freshly released git 2.0.0. Regresses fine on > > amd64. > > Could I
>> make a request: could you please package the "multimail" package > in
>> contrib/hooks/multimail? Preferably as a subpackage, but just > under
>> share/git would be better than nothing. > > -d > >
>>
>> Sure. Regarding the failing regress tests that were reported: I've run
>> it a few times now on powerpc and amd64 and never saw any failures.
>>
>
> Update to 2.0.4. Still ok?
ok !
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/git/Makefile,v
> retrieving revision 1.113
> diff -u -p -r1.113 Makefile
> --- Makefile 21 May 2014 08:39:57 -0000 1.113
> +++ Makefile 11 Aug 2014 16:23:54 -0000
> @@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag
> 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_SUF
>
> 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
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/git/distinfo,v
> retrieving revision 1.83
> diff -u -p -r1.83 distinfo
> --- distinfo 21 May 2014 08:39:57 -0000 1.83
> +++ distinfo 11 Aug 2014 16:23:54 -0000
> @@ -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
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
> retrieving revision 1.46
> diff -u -p -r1.46 patch-Makefile
> --- patches/patch-Makefile 21 May 2014 08:39:57 -0000 1.46
> +++ patches/patch-Makefile 11 Aug 2014 16:23:54 -0000
> @@ -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.45 2014/03/10 20:56:53 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/
>
> 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
>
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
> retrieving revision 1.57
> diff -u -p -r1.57 PLIST-main
> --- pkg/PLIST-main 10 Mar 2014 20:56:53 -0000 1.57
> +++ pkg/PLIST-main 11 Aug 2014 16:23:54 -0000
> @@ -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
>
