Routine update that also cleans up some unneeded patches and uses
Python 3.
While here, I took the liberty to do some `cd && make' -> `make -C'.
patch-Makefile can be dropped if we just change into the t/ subdirectory
directly which is all the port's main Makefile does anyawy.
Upstream's perl/Makefile.PL is no more.
t/t0000-basic.sh succeeds so stop expectin failure.
t/t9200-git-cvsexportcommit.sh runs fine as is, too.
Upstream has "70ec6bd63 Stop using sum(1)" from 14.08.2017 making our
patch obsolete.
Tested successfully on amd64 in daily use during the last two weeks.
Feedback? OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.189
diff -u -p -r1.189 Makefile
--- Makefile 4 Jun 2018 10:47:29 -0000 1.189
+++ Makefile 11 Jun 2018 21:25:28 -0000
@@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag
COMMENT-svn = GIT - subversion interoperability tools
COMMENT-x11 = GIT - graphical tools
-V = 2.16.4
+V = 2.17.1
DISTNAME = git-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-svn = git-svn-${V}
@@ -16,7 +16,7 @@ HOMEPAGE = https://git-scm.com/
MAINTAINER = Benoit Lecocq <ben...@openbsd.org>
# GPLv2 only
-PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_CDROM = Yes
DOC_DISTFILE = git-manpages-${V}${EXTRACT_SUFX}
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} ${DOC_DISTFILE}
@@ -24,8 +24,10 @@ EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUF
MASTER_SITES = https://www.kernel.org/pub/software/scm/git/
-MODULES = x11/tk lang/python
+MODULES = lang/python \
+ x11/tk
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
MODPY_BUILDDEP = No
MODPY_RUNDEP = No
MODPY_ADJ_FILES = contrib/hooks/multimail/git_multimail.py \
@@ -88,7 +90,7 @@ TEST_DEPENDS = archivers/gtar \
post-extract:
@mkdir -p ${WRKSRC}/doc
- @cd ${WRKSRC}/doc && ${TAR} -xzf ${FULLDISTDIR}/${DOC_DISTFILE}
+ ${TAR} -C ${WRKSRC}/doc -xzf ${FULLDISTDIR}/${DOC_DISTFILE}
@cd ${WRKSRC} && perl -pi -e
"s|/usr/share/git|${TRUEPREFIX}/share/git|g" \
doc/man1/git-clone.1 doc/man1/git-init.1 doc/man1/gitweb.1
@@ -109,13 +111,13 @@ post-install:
${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/setgitperms.perl \
${PREFIX}/share/git-core/templates/hooks/setgitperms.perl
chown -R ${BINOWN}:${BINGRP} ${PREFIX}/libexec/git
- cd ${WRKBUILD}/gitweb && \
- ${MAKE_ENV} ${MAKE_PROGRAM}
gitwebdir=${TRUEPREFIX}/share/gitweb install
+ ${MAKE_ENV} ${MAKE_PROGRAM} -C ${WRKBUILD}/gitweb \
+ gitwebdir=${TRUEPREFIX}/share/gitweb install
perl -pi -e "s|${WRKINST}||g" ${PREFIX}/share/gitweb/gitweb.cgi
${INSTALL_DATA} ${WRKBUILD}/gitweb/README ${PREFIX}/share/gitweb
do-test:
- cd ${WRKSRC} && ${MAKE_ENV} GIT_TEST_OPTS="--immediate" ${MAKE_PROGRAM}
\
+ ${MAKE_ENV} GIT_TEST_OPTS="--immediate" ${MAKE_PROGRAM} -C ${WRKSRC}/t \
HOME=${WRKDIST}/t test
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.143
diff -u -p -r1.143 distinfo
--- distinfo 4 Jun 2018 10:47:29 -0000 1.143
+++ distinfo 10 Jun 2018 12:14:30 -0000
@@ -1,4 +1,4 @@
-SHA256 (git-2.16.4.tar.gz) = 6HCevNo9eTzZM8pVAEgUlZu45vpRi1s39gLZiB5InS4=
-SHA256 (git-manpages-2.16.4.tar.gz) =
bO4IVtt53t2uRTHG3ibJwJD7PT0OMS/WlX4eH4PJxmI=
-SIZE (git-2.16.4.tar.gz) = 7290813
-SIZE (git-manpages-2.16.4.tar.gz) = 678200
+SHA256 (git-2.17.1.tar.gz) = 7GRS8MjVwfO8zqvXBwuKil7qEdTioElVwTm1Bl/X0Jo=
+SHA256 (git-manpages-2.17.1.tar.gz) =
lzIFPBphjSV2wXUdAknkNwL2MqVx+EURMxiCvrNgZ30=
+SIZE (git-2.17.1.tar.gz) = 7366760
+SIZE (git-manpages-2.17.1.tar.gz) = 682441
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 4 Jun 2018 10:47:29 -0000 1.77
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.77 2018/06/04 10:47:29 sthen Exp $
-Index: Makefile
---- Makefile.orig
-+++ Makefile
-@@ -2463,7 +2463,7 @@ export TEST_NO_MALLOC_CHECK
-
- ### Testing rules
-
--test: all
-+test:
- $(MAKE) -C t/ all
-
- perf: all
Index: patches/patch-gitweb_gitweb_perl
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-gitweb_gitweb_perl,v
retrieving revision 1.31
diff -u -p -r1.31 patch-gitweb_gitweb_perl
--- patches/patch-gitweb_gitweb_perl 20 Jan 2018 09:24:57 -0000 1.31
+++ patches/patch-gitweb_gitweb_perl 30 May 2018 12:51:06 -0000
@@ -5,7 +5,7 @@ This prevents the following error: '-T a
Index: gitweb/gitweb.perl
--- gitweb/gitweb.perl.orig
+++ gitweb/gitweb.perl
-@@ -7010,7 +7010,7 @@ sub git_blob_plain {
+@@ -7001,7 +7001,7 @@ sub git_blob_plain {
$expires = "+1d";
}
@@ -14,7 +14,7 @@ Index: gitweb/gitweb.perl
or die_error(500, "Open git-cat-file blob '$hash' failed");
# content-type (can include charset)
-@@ -7072,7 +7072,7 @@ sub git_blob {
+@@ -7063,7 +7063,7 @@ sub git_blob {
}
my $have_blame = gitweb_check_feature('blame');
Index: patches/patch-perl_Makefile_PL
===================================================================
RCS file: patches/patch-perl_Makefile_PL
diff -N patches/patch-perl_Makefile_PL
--- patches/patch-perl_Makefile_PL 4 Mar 2018 10:31:58 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-perl_Makefile_PL,v 1.6 2018/03/04 10:31:58 benoit Exp $
---- perl/Makefile.PL.orig Sun Oct 21 23:32:15 2012
-+++ perl/Makefile.PL Fri Nov 23 23:48:58 2012
-@@ -12,6 +12,7 @@ Getopt::Long::Configure qw/ pass_through /;
-
- my $localedir = '';
- GetOptions("localedir=s" => \$localedir);
-+use Config;
-
- sub MY::postamble {
- return <<'MAKE_FRAG';
-@@ -58,5 +59,6 @@ WriteMakefile(
- PM => \%pm,
- PM_FILTER => qq[\$(PERL) -pe
"s<\\Q++LOCALEDIR++\\E><$localedir>"],
- MAKEFILE => 'perl.mak',
-- INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3'
-+ INSTALLARCHLIB => $Config{installsitearch},
-+ INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3p'
- );
Index: patches/patch-t_t0000-basic_sh
===================================================================
RCS file: patches/patch-t_t0000-basic_sh
diff -N patches/patch-t_t0000-basic_sh
--- patches/patch-t_t0000-basic_sh 20 Jan 2018 09:24:57 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-t_t0000-basic_sh,v 1.9 2018/01/20 09:24:57 benoit Exp $
-Index: t/t0000-basic.sh
---- t/t0000-basic.sh.orig
-+++ t/t0000-basic.sh
-@@ -1068,7 +1068,7 @@ test_expect_success 'update-index D/F conflict' '
- test $numpath0 = 1
- '
-
--test_expect_success 'very long name in the index handled sanely' '
-+test_expect_failure 'very long name in the index handled sanely' '
-
- a=a && # 1
- a=$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a && # 16
Index: patches/patch-t_t9200-git-cvsexportcommit_sh
===================================================================
RCS file: patches/patch-t_t9200-git-cvsexportcommit_sh
diff -N patches/patch-t_t9200-git-cvsexportcommit_sh
--- patches/patch-t_t9200-git-cvsexportcommit_sh 10 May 2017 08:05:04
-0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-t_t9200-git-cvsexportcommit_sh,v 1.8 2017/05/10 08:05:04
benoit Exp $
-Index: t/t9200-git-cvsexportcommit.sh
---- t/t9200-git-cvsexportcommit.sh.orig
-+++ t/t9200-git-cvsexportcommit.sh
-@@ -40,7 +40,7 @@ exit 1
-
- check_entries () {
- # $1 == directory, $2 == expected
-- sed -ne '/^\//p' "$1/CVS/Entries" | sort | cut -d/ -f2,3,5 >actual
-+ grep -a '^/' "$1/CVS/Entries" | sort | cut -d/ -f2,3,5 >actual
- if test -z "$2"
- then
- >expected
Index: patches/patch-t_test-lib_sh
===================================================================
RCS file: /cvs/ports/devel/git/patches/patch-t_test-lib_sh,v
retrieving revision 1.27
diff -u -p -r1.27 patch-t_test-lib_sh
--- patches/patch-t_test-lib_sh 4 Jun 2018 10:47:29 -0000 1.27
+++ patches/patch-t_test-lib_sh 11 Jun 2018 19:30:56 -0000
@@ -3,8 +3,6 @@ $OpenBSD: patch-t_test-lib_sh,v 1.27 201
Force usage of GNU tar in the test suite: 't5004-archive-corner-cases.sh'
wants it badly.
-Fix sum() function
-
Index: t/test-lib.sh
--- t/test-lib.sh.orig
+++ t/test-lib.sh
@@ -20,19 +18,3 @@ Index: t/test-lib.sh
# if --tee was passed, write the output not only to the terminal, but
# additionally to the file test-results/$BASENAME.out, too.
case "$GIT_TEST_TEE_STARTED, $* " in
-@@ -1036,6 +1041,15 @@ case $uname_s in
- test_set_prereq CYGWIN
- test_set_prereq SED_STRIPS_CR
- test_set_prereq GREP_STRIPS_CR
-+ ;;
-+*OpenBSD*)
-+ # sum(1) is cksum(1) on OpenBSD
-+ sum () {
-+ cksum "$@"
-+ }
-+ test_set_prereq POSIXPERM
-+ test_set_prereq BSLASHPSPEC
-+ test_set_prereq EXECKEEPSPID
- ;;
- *)
- test_set_prereq POSIXPERM
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
retrieving revision 1.81
diff -u -p -r1.81 PLIST-main
--- pkg/PLIST-main 6 Mar 2018 22:20:53 -0000 1.81
+++ pkg/PLIST-main 11 Jun 2018 18:53:13 -0000
@@ -2,6 +2,7 @@
@pkgpath devel/git
@newgroup _gitdaemon:778
@newuser _gitdaemon:778:_gitdaemon:daemon:GIT Daemon:/nonexistent:/sbin/nologin
+@rcscript ${RCDIR}/gitdaemon
@bin bin/git
bin/git-cvsserver
@bin bin/git-receive-pack
@@ -9,12 +10,6 @@ bin/git-cvsserver
@bin bin/git-upload-archive
@bin bin/git-upload-pack
lib/libgit.a
-libdata/perl5/site_perl/Git/
-libdata/perl5/site_perl/Git.pm
-libdata/perl5/site_perl/Git/I18N.pm
-libdata/perl5/site_perl/Git/IndexInfo.pm
-libdata/perl5/site_perl/Git/Packet.pm
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
libexec/git/
@bin libexec/git/git
@bin libexec/git/git-add
@@ -351,8 +346,6 @@ libexec/git/mergetools/xxdiff
@man man/man1/git.1
@man man/man1/gitremote-helpers.1
@man man/man1/gitweb.1
-@man man/man3p/Git.3p
-@man man/man3p/Git::I18N.3p
@man man/man5/gitattributes.5
@man man/man5/githooks.5
@man man/man5/gitignore.5
@@ -426,4 +419,18 @@ share/locale/ru/LC_MESSAGES/git.mo
share/locale/sv/LC_MESSAGES/git.mo
share/locale/vi/LC_MESSAGES/git.mo
share/locale/zh_CN/LC_MESSAGES/git.mo
-@rcscript ${RCDIR}/gitdaemon
+share/perl5/
+share/perl5/FromCPAN/
+share/perl5/FromCPAN/Error.pm
+share/perl5/FromCPAN/Mail/
+share/perl5/FromCPAN/Mail/Address.pm
+share/perl5/Git/
+share/perl5/Git.pm
+share/perl5/Git/I18N.pm
+share/perl5/Git/IndexInfo.pm
+share/perl5/Git/LoadCPAN/
+share/perl5/Git/LoadCPAN.pm
+share/perl5/Git/LoadCPAN/Error.pm
+share/perl5/Git/LoadCPAN/Mail/
+share/perl5/Git/LoadCPAN/Mail/Address.pm
+share/perl5/Git/Packet.pm
Index: pkg/PLIST-svn
===================================================================
RCS file: /cvs/ports/devel/git/pkg/PLIST-svn,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-svn
--- pkg/PLIST-svn 30 Nov 2012 21:16:30 -0000 1.4
+++ pkg/PLIST-svn 11 Jun 2018 18:54:44 -0000
@@ -1,21 +1,15 @@
@comment $OpenBSD: PLIST-svn,v 1.4 2012/11/30 21:16:30 pascal Exp $
-libdata/perl5/site_perl/Git/SVN/
-libdata/perl5/site_perl/Git/SVN.pm
-libdata/perl5/site_perl/Git/SVN/Editor.pm
-libdata/perl5/site_perl/Git/SVN/Fetcher.pm
-libdata/perl5/site_perl/Git/SVN/GlobSpec.pm
-libdata/perl5/site_perl/Git/SVN/Log.pm
-libdata/perl5/site_perl/Git/SVN/Memoize/
-libdata/perl5/site_perl/Git/SVN/Memoize/YAML.pm
-libdata/perl5/site_perl/Git/SVN/Migration.pm
-libdata/perl5/site_perl/Git/SVN/Prompt.pm
-libdata/perl5/site_perl/Git/SVN/Ra.pm
-libdata/perl5/site_perl/Git/SVN/Utils.pm
libexec/git/git-svn
@man man/man1/git-svn.1
-@man man/man3p/Git::SVN::Editor.3p
-@man man/man3p/Git::SVN::Fetcher.3p
-@man man/man3p/Git::SVN::Memoize::YAML.3p
-@man man/man3p/Git::SVN::Prompt.3p
-@man man/man3p/Git::SVN::Ra.3p
-@man man/man3p/Git::SVN::Utils.3p
+share/perl5/Git/SVN/
+share/perl5/Git/SVN.pm
+share/perl5/Git/SVN/Editor.pm
+share/perl5/Git/SVN/Fetcher.pm
+share/perl5/Git/SVN/GlobSpec.pm
+share/perl5/Git/SVN/Log.pm
+share/perl5/Git/SVN/Memoize/
+share/perl5/Git/SVN/Memoize/YAML.pm
+share/perl5/Git/SVN/Migration.pm
+share/perl5/Git/SVN/Prompt.pm
+share/perl5/Git/SVN/Ra.pm
+share/perl5/Git/SVN/Utils.pm
