summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/git-base/Makefile14
-rw-r--r--devel/git-base/PLIST3
-rw-r--r--devel/git-base/distinfo14
-rw-r--r--devel/git-base/options.mk24
-rw-r--r--devel/git-base/patches/patch-Makefile85
-rw-r--r--devel/git-base/patches/patch-aa51
-rw-r--r--devel/git-base/patches/patch-ae16
-rw-r--r--devel/git-base/patches/patch-wrapper.c18
-rw-r--r--devel/git-docs/Makefile9
-rw-r--r--devel/git-docs/PLIST3
-rw-r--r--devel/git-gitk/Makefile4
-rw-r--r--devel/git/Makefile.version4
12 files changed, 110 insertions, 135 deletions
diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile
index a6dd858232e..57fb7d656d1 100644
--- a/devel/git-base/Makefile
+++ b/devel/git-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2018/02/20 09:26:56 adam Exp $
+# $NetBSD: Makefile,v 1.52 2018/04/11 19:39:34 adam Exp $
.include "../../devel/git/Makefile.common"
@@ -9,8 +9,6 @@ CONFLICTS+= scmgit-base-[0-9]*
SUPERSEDES+= scmgit-base-[0-9]*
DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error
-# for git-send-email
-#DEPENDS+= {perl>=5.13.8,p5-MIME-Base64>=3.13}:../../converters/p5-MIME-Base64
DEPENDS+= p5-Email-Valid>=0.190:../../mail/p5-Email-Valid
DEPENDS+= p5-MailTools>=2.11:../../mail/p5-MailTools
DEPENDS+= p5-Net-SMTP-SSL>=1.01:../../mail/p5-Net-SMTP-SSL
@@ -19,8 +17,6 @@ DEPENDS+= p5-Authen-SASL>=1.0:../../security/p5-Authen-SASL
USE_LANGUAGES= c99
USE_TOOLS+= perl:run sh:run msgfmt
-PERL5_CONFIGURE= no
-PERL5_PACKLIST= auto/Git/.packlist
REPLACE_PERL+= *.perl */*.perl */*/*.perl
REPLACE_PERL+= contrib/hooks/update-paranoid
@@ -32,6 +28,7 @@ CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
CONFIGURE_ARGS+= --with-libpcre2=${BUILDLINK_PREFIX.pcre2}
CONFIGURE_ARGS+= --with-perl=${PERL5:Q}
CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
+CONFIGURE_ARGS+= --without-python # only needed for git-p4
CONFIGURE_ARGS+= --without-tcltk
BUILD_TARGET= all
@@ -52,8 +49,6 @@ GIT_TEMPLATES+= hooks/post-update.sample hooks/pre-applypatch.sample
GIT_TEMPLATES+= hooks/pre-commit.sample hooks/pre-rebase.sample
GIT_TEMPLATES+= hooks/prepare-commit-msg.sample hooks/update.sample
-# XXX unused as of now
-#GIT_CORE_EXECDIR= libexec/${GIT_COREDIR}
GIT_CORE_DATADIR= share/${GIT_COREDIR}
GIT_CORE_TEMPLATEDIR= ${GIT_CORE_DATADIR}/${GIT_TEMPLATEDIR}
@@ -71,6 +66,10 @@ CONFIGURE_ENV+= gitexecdir=${GITCOREDIR}
MAKE_FLAGS+= INSTALL=${INSTALL:Q}
+.include "../../lang/perl5//buildlink3.mk"
+PERLLIBDIR!= ${PERL5} -MConfig -wle 'print substr $$Config{installvendorlib}, 1 + length $$Config{vendorprefixexp}'
+MAKE_ENV+= PERLLIBDIR=${PERLLIBDIR}
+
GIT_TEMPLATE_INSTDIR= ${EGDIR}/${GIT_TEMPLATEDIR}
MAKE_ENV+= GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}
MESSAGE_SUBST+= GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}
@@ -117,7 +116,6 @@ post-install:
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/pcre2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/perl5/module.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/git-base/PLIST b/devel/git-base/PLIST
index 9ea86814875..d742aa253c3 100644
--- a/devel/git-base/PLIST
+++ b/devel/git-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2018/01/22 14:17:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2018/04/11 19:39:34 adam Exp $
bin/git
bin/git-cvsserver
bin/git-receive-pack
@@ -97,7 +97,6 @@ libexec/git-core/git-mktree
libexec/git-core/git-mv
libexec/git-core/git-name-rev
libexec/git-core/git-notes
-libexec/git-core/git-p4
libexec/git-core/git-pack-objects
libexec/git-core/git-pack-redundant
libexec/git-core/git-pack-refs
diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo
index 1643ac5fb78..cf0e49cbecc 100644
--- a/devel/git-base/distinfo
+++ b/devel/git-base/distinfo
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.78 2018/03/24 08:09:40 adam Exp $
+$NetBSD: distinfo,v 1.79 2018/04/11 19:39:34 adam Exp $
-SHA1 (git-2.16.3.tar.xz) = e54fbd04232e8b949764b414c46aea73cca16af0
-RMD160 (git-2.16.3.tar.xz) = 65229a65b041dc7cf0ee028b79f60f0eb424c1db
-SHA512 (git-2.16.3.tar.xz) = 73520cf3500b2d13b77eb1e5ec0d60263aad07732d25631732f0d986abd023f97b8a6db4abff64d342cb053018289b5f7a3e32f10b86bd9092a37ee0585adc8a
-Size (git-2.16.3.tar.xz) = 4966248 bytes
-SHA1 (patch-aa) = a58f3c2f45c1fbafd751d10b9ef34e6c9afc2c6f
+SHA1 (git-2.17.0.tar.xz) = f0d4139af75bfdbe306387358b2e40eb541ccc06
+RMD160 (git-2.17.0.tar.xz) = d419c1d8cb9aaf976853ae088e8b1a72cb5ddd38
+SHA512 (git-2.17.0.tar.xz) = dab1c1d5d384b36720abc049a66ba60631e17958b214cfbec467be7adc02e82190e5282554da71797892c16bfe52d65b6244a281f504385083125bcb98ec7ee9
+Size (git-2.17.0.tar.xz) = 5011556 bytes
+SHA1 (patch-Makefile) = 13b3e19ae7eec5612137a1e299f3efd3d3555874
SHA1 (patch-ac) = e5d2112d158fe493a89b244a10d2e4b998a23d98
-SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23
SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886
-SHA1 (patch-wrapper.c) = 1fb629ec301d0431cb5bebd716b1c3a7ae45577f
diff --git a/devel/git-base/options.mk b/devel/git-base/options.mk
index f3efa91410d..3bbb8dbc694 100644
--- a/devel/git-base/options.mk
+++ b/devel/git-base/options.mk
@@ -1,29 +1,11 @@
-# $NetBSD: options.mk,v 1.4 2016/04/11 04:22:33 dbj Exp $
-#
+# $NetBSD: options.mk,v 1.5 2018/04/11 19:39:34 adam Exp $
+
PKG_OPTIONS_VAR= PKG_OPTIONS.git
-PKG_SUPPORTED_OPTIONS= python apple-common-crypto
-# python is not suggested because upstream's INSTALL does not list python
-# as a dependency and because all it does is install a python module,
-# which does not seem worth the dependency for everyone else.
+PKG_SUPPORTED_OPTIONS= apple-common-crypto
PKG_SUGGESTED_OPTIONS=
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= python
-
-.if !empty(PKG_OPTIONS:Mpython)
-PY_PATCHPLIST= yes
-CONFIGURE_ARGS+= --with-python=${PYTHONBIN}
-PLIST.python= yes
-# not executable
-CHECK_INTERPRETER_SKIP+= ${PYSITELIB}/git_remote_helpers/*.py
-CHECK_INTERPRETER_SKIP+= ${PYSITELIB}/git_remote_helpers/git/*.py
-.include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
-.else
-CONFIGURE_ARGS+= --without-python
-.endif
-
.if !empty(PKG_OPTIONS:Mapple-common-crypto)
. if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
PKG_FAIL_REASON+= "apple-common-crypto not available on this system"
diff --git a/devel/git-base/patches/patch-Makefile b/devel/git-base/patches/patch-Makefile
new file mode 100644
index 00000000000..e4d085d4e13
--- /dev/null
+++ b/devel/git-base/patches/patch-Makefile
@@ -0,0 +1,85 @@
+$NetBSD: patch-Makefile,v 1.1 2018/04/11 19:39:35 adam Exp $
+
+Do not override compiler/linker flags.
+Provide proper path for Perl module.
+Do not install git-p4 (requires Python).
+Fix tar operations.
+
+--- Makefile.orig 2018-04-02 17:44:04.000000000 +0000
++++ Makefile
+@@ -452,8 +452,6 @@ DEVELOPER_CFLAGS = -Werror \
+ -Wunused \
+ -Wvla
+ LDFLAGS =
+-ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
+-ALL_LDFLAGS = $(LDFLAGS)
+ STRIP ?= strip
+
+ # Create as necessary, replace existing, make ranlib unneeded.
+@@ -482,7 +480,7 @@ gitexecdir = libexec/git-core
+ mergetoolsdir = $(gitexecdir)/mergetools
+ sharedir = $(prefix)/share
+ gitwebdir = $(sharedir)/gitweb
+-perllibdir = $(sharedir)/perl5
++perllibdir = $(prefix)${PERLLIBDIR}
+ localedir = $(sharedir)/locale
+ template_dir = share/git-core/templates
+ htmldir = $(prefix)/share/doc/git-doc
+@@ -498,13 +496,9 @@ htmldir_relative = $(patsubst $(prefix)/
+
+ export prefix bindir sharedir sysconfdir gitwebdir perllibdir localedir
+
+-CC = cc
+-AR = ar
+ RM = rm -f
+ DIFF = diff
+-TAR = tar
+ FIND = find
+-INSTALL = install
+ TCL_PATH = tclsh
+ TCLTK_PATH = wish
+ XGETTEXT = xgettext
+@@ -624,7 +618,6 @@ clean-python-script:
+
+ SCRIPTS = $(SCRIPT_SH_INS) \
+ $(SCRIPT_PERL_INS) \
+- $(SCRIPT_PYTHON_INS) \
+ git-instaweb
+
+ ETAGS_TARGET = TAGS
+@@ -1807,8 +1800,8 @@ PAGER_ENV_CQ = "$(subst ",\",$(subst \,\
+ PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
+ BASIC_CFLAGS += -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
+
+-ALL_CFLAGS += $(BASIC_CFLAGS)
+-ALL_LDFLAGS += $(BASIC_LDFLAGS)
++ALL_CFLAGS = $(BASIC_CFLAGS) $(CPPFLAGS) $(CFLAGS)
++ALL_LDFLAGS = $(BASIC_LDFLAGS) $(LDFLAGS)
+
+ export DIFF TAR INSTALL DESTDIR SHELL_PATH
+
+@@ -2588,13 +2581,12 @@ install: all
+ ifndef NO_GETTEXT
+ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)'
+ (cd po/build/locale && $(TAR) cf - .) | \
+- (cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xof -)
++ (cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xf -)
+ endif
+ ifndef NO_PERL
+ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perllibdir_SQ)'
+ (cd perl/build/lib && $(TAR) cf - .) | \
+- (cd '$(DESTDIR_SQ)$(perllibdir_SQ)' && umask 022 && $(TAR) xof -)
+- $(MAKE) -C gitweb install
++ (cd '$(DESTDIR_SQ)$(perllibdir_SQ)' && umask 022 && $(TAR) xf -)
+ endif
+ ifndef NO_TCLTK
+ $(MAKE) -C gitk-git install
+@@ -2652,7 +2644,7 @@ install-man: install-man-perl
+ install-man-perl: man-perl
+ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mandir_SQ)/man3'
+ (cd perl/build/man/man3 && $(TAR) cf - .) | \
+- (cd '$(DESTDIR_SQ)$(mandir_SQ)/man3' && umask 022 && $(TAR) xof -)
++ (cd '$(DESTDIR_SQ)$(mandir_SQ)/man3' && umask 022 && $(TAR) xf -)
+
+ install-html:
+ $(MAKE) -C Documentation install-html
diff --git a/devel/git-base/patches/patch-aa b/devel/git-base/patches/patch-aa
deleted file mode 100644
index 6572e1e26d1..00000000000
--- a/devel/git-base/patches/patch-aa
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2016/09/07 08:56:33 adam Exp $
-
---- Makefile.orig 2016-09-03 01:59:09.000000000 +0000
-+++ Makefile
-@@ -396,8 +396,6 @@ DEVELOPER_CFLAGS = -Werror \
- -Wunused \
- -Wvla
- LDFLAGS =
--ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
--ALL_LDFLAGS = $(LDFLAGS)
- STRIP ?= strip
-
- # Create as necessary, replace existing, make ranlib unneeded.
-@@ -441,13 +439,9 @@ htmldir_relative = $(patsubst $(prefix)/
-
- export prefix bindir sharedir sysconfdir gitwebdir localedir
-
--CC = cc
--AR = ar
- RM = rm -f
- DIFF = diff
--TAR = tar
- FIND = find
--INSTALL = install
- TCL_PATH = tclsh
- TCLTK_PATH = wish
- XGETTEXT = xgettext
-@@ -1647,8 +1641,8 @@ PAGER_ENV_CQ = "$(subst ",\",$(subst \,\
- PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
- BASIC_CFLAGS += -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
-
--ALL_CFLAGS += $(BASIC_CFLAGS)
--ALL_LDFLAGS += $(BASIC_LDFLAGS)
-+ALL_CFLAGS = $(BASIC_CFLAGS) $(CPPFLAGS) $(CFLAGS)
-+ALL_LDFLAGS = $(BASIC_LDFLAGS) $(LDFLAGS)
-
- export DIFF TAR INSTALL DESTDIR SHELL_PATH
-
-@@ -2341,11 +2335,10 @@ install: all
- ifndef NO_GETTEXT
- $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)'
- (cd po/build/locale && $(TAR) cf - .) | \
-- (cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xof -)
-+ (cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xf -)
- endif
- ifndef NO_PERL
- $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
-- $(MAKE) -C gitweb install
- endif
- ifndef NO_TCLTK
- $(MAKE) -C gitk-git install
diff --git a/devel/git-base/patches/patch-ae b/devel/git-base/patches/patch-ae
deleted file mode 100644
index 79777c8d32e..00000000000
--- a/devel/git-base/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2013/09/09 13:54:44 wiz Exp $
-
-In pkgsrc, all Perl modules are installed into vendor_perl, not
-site_perl.
-
---- perl/Makefile.orig 2008-08-17 16:43:06.000000000 -0400
-+++ perl/Makefile
-@@ -13,7 +13,7 @@ ifndef V
- endif
-
- all install instlibdir: $(makfile)
-- $(QUIET)$(MAKE) -f $(makfile) $@
-+ $(QUIET)$(MAKE) -f $(makfile) INSTALLDIRS=vendor $@
-
- clean:
- $(QUIET)test -f $(makfile) && $(MAKE) -f $(makfile) $@ || exit 0
diff --git a/devel/git-base/patches/patch-wrapper.c b/devel/git-base/patches/patch-wrapper.c
deleted file mode 100644
index dee595c9d15..00000000000
--- a/devel/git-base/patches/patch-wrapper.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-wrapper.c,v 1.2 2014/08/01 19:18:39 schmonz Exp $
-
-git's wrapper around mkstemp assumes that the libc function will not
-modify the argument when the call fails. This causes one of git's
-tests to fail. This patch is from Junio C. Hamano, and will likely be
-included in future versions of git.
-
---- wrapper.c.orig 2014-05-30 21:38:10.000000000 +0000
-+++ wrapper.c
-@@ -378,7 +378,7 @@ int xmkstemp_mode(char *template, int mo
- int saved_errno = errno;
- const char *nonrelative_template;
-
-- if (!template[0])
-+ if (strlen(template) != strlen(origtemplate))
- template = origtemplate;
-
- nonrelative_template = absolute_path(template);
diff --git a/devel/git-docs/Makefile b/devel/git-docs/Makefile
index be1a34b68dc..8acdd1178d7 100644
--- a/devel/git-docs/Makefile
+++ b/devel/git-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/07/21 13:12:25 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/04/11 19:39:35 adam Exp $
PKGNAME= git-docs-${GIT_VERSION}
COMMENT= GIT Tree History Storage Tool (documentation)
@@ -11,15 +11,14 @@ DISTINFO_FILE= ../../devel/git-base/distinfo
BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
-USE_LANGUAGES= c
+USE_TOOLS+= perl
+CONFIGURE_ARGS+= --with-perl=${PERL5:Q}
+MAKE_FLAGS+= INSTALL=${INSTALL:Q}
BUILD_TARGET= man
INSTALL_TARGET= install-man
UNLIMIT_RESOURCES+= datasize
-USE_TOOLS+= perl
-CONFIGURE_ARGS+= --with-perl=${PERL5:Q}
-
.include "../../devel/git/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/git-docs/PLIST b/devel/git-docs/PLIST
index 88224955d39..7eb30f76b03 100644
--- a/devel/git-docs/PLIST
+++ b/devel/git-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2017/08/07 17:56:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2018/04/11 19:39:35 adam Exp $
man/man1/git-add.1
man/man1/git-am.1
man/man1/git-annotate.1
@@ -150,6 +150,7 @@ man/man1/git.1
man/man1/gitk.1
man/man1/gitremote-helpers.1
man/man1/gitweb.1
+man/man3/Git.3pm
man/man5/gitattributes.5
man/man5/githooks.5
man/man5/gitignore.5
diff --git a/devel/git-gitk/Makefile b/devel/git-gitk/Makefile
index b79f0e76780..be2f19ebecb 100644
--- a/devel/git-gitk/Makefile
+++ b/devel/git-gitk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/09/11 01:26:00 obache Exp $
+# $NetBSD: Makefile,v 1.3 2018/04/11 19:39:35 adam Exp $
PKGNAME= git-gitk-${GIT_VERSION}
COMMENT= GIT Tree History Storage Tool (gitk)
@@ -9,8 +9,6 @@ SUPERSEDES+= scmgit-gitk-[0-9]*
DEPENDS+= git-base>=1.7.12nb1:../../devel/git-base
-USE_LANGUAGES= c
-
BUILD_DIRS= git-gui gitk-git
INSTALL_DIRS= ${BUILD_DIRS}
MAKE_ENV+= prefix=${PREFIX}
diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version
index cb487339beb..486c954887d 100644
--- a/devel/git/Makefile.version
+++ b/devel/git/Makefile.version
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.69 2018/03/24 08:09:40 adam Exp $
+# $NetBSD: Makefile.version,v 1.70 2018/04/11 19:39:34 adam Exp $
#
# used by devel/git/Makefile.common
# used by devel/git-cvs/Makefile
# used by devel/git-svn/Makefile
-GIT_VERSION= 2.16.3
+GIT_VERSION= 2.17.0
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-03 03:27:56 +0000