Fri Aug 1 19:18:39 2014 UTC ()
Even though we specify OpenSSL, on sufficiently new Mac OS X, Git
has been linking with Apple's CommonCrypto instead. Add an
"apple-common-crypto" option that explicitly avoids CommonCrypto
when it's off. Turn it off by default, and set PKG_FAIL_REASON if
it's enabled on an unsuitable system.

While here, regenerate fuzzy patches.

Addresses pkg/49051. Bump PKGREVISION.


(schmonz)
diff -r1.15 -r1.16 pkgsrc/devel/git-base/Makefile
diff -r1.14 -r1.15 pkgsrc/devel/git-base/distinfo
diff -r1.2 -r1.3 pkgsrc/devel/git-base/options.mk
diff -r1.2 -r1.3 pkgsrc/devel/git-base/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/devel/git-base/patches/patch-ac
diff -r1.1 -r1.2 pkgsrc/devel/git-base/patches/patch-af
diff -r1.1 -r1.2 pkgsrc/devel/git-base/patches/patch-wrapper.c
cvs diff -r1.15 -r1.16 pkgsrc/devel/git-base/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/git-base/Makefile 2014/06/02 16:32:36 1.15
+++ pkgsrc/devel/git-base/Makefile 2014/08/01 19:18:39 1.16
@@ -1,45 +1,45 @@ @@ -1,45 +1,45 @@
1# $NetBSD: Makefile,v 1.15 2014/06/02 16:32:36 adam Exp $ 1# $NetBSD: Makefile,v 1.16 2014/08/01 19:18:39 schmonz Exp $
2 2
3.include "../../devel/git/Makefile.common" 3.include "../../devel/git/Makefile.common"
4 4
5PKGNAME= git-base-${GIT_VERSION} 5PKGNAME= git-base-${GIT_VERSION}
 6PKGREVISION= 1
6COMMENT= GIT Tree History Storage Tool (base package) 7COMMENT= GIT Tree History Storage Tool (base package)
7 8
8CONFLICTS+= scmgit-base-[0-9]* 9CONFLICTS+= scmgit-base-[0-9]*
9SUPERSEDES+= scmgit-base-[0-9]* 10SUPERSEDES+= scmgit-base-[0-9]*
10 11
11DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error 12DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error
12# for git-send-email 13# for git-send-email
13DEPENDS+= {perl>=5.13.8,p5-MIME-Base64>=3.13}:../../converters/p5-MIME-Base64 14DEPENDS+= {perl>=5.13.8,p5-MIME-Base64>=3.13}:../../converters/p5-MIME-Base64
14DEPENDS+= p5-Email-Valid>=0.190:../../mail/p5-Email-Valid 15DEPENDS+= p5-Email-Valid>=0.190:../../mail/p5-Email-Valid
15DEPENDS+= p5-MailTools>=2.11:../../mail/p5-MailTools 16DEPENDS+= p5-MailTools>=2.11:../../mail/p5-MailTools
16DEPENDS+= p5-Net-SMTP-SSL>=1.01:../../mail/p5-Net-SMTP-SSL 17DEPENDS+= p5-Net-SMTP-SSL>=1.01:../../mail/p5-Net-SMTP-SSL
17DEPENDS+= p5-Authen-SASL>=1.0:../../security/p5-Authen-SASL 18DEPENDS+= p5-Authen-SASL>=1.0:../../security/p5-Authen-SASL
18 19
19USE_LANGUAGES= c99 20USE_LANGUAGES= c99
20USE_TOOLS+= perl:run sh:run msgfmt 21USE_TOOLS+= perl:run sh:run msgfmt
21 22
22PERL5_CONFIGURE= no 23PERL5_CONFIGURE= no
23PERL5_PACKLIST= auto/Git/.packlist 24PERL5_PACKLIST= auto/Git/.packlist
24REPLACE_PERL+= *.perl */*.perl */*/*.perl 25REPLACE_PERL+= *.perl */*.perl */*/*.perl
25REPLACE_PERL+= contrib/hooks/update-paranoid 26REPLACE_PERL+= contrib/hooks/update-paranoid
26 27
27CFLAGS.NetBSD+= -D_NETBSD_SOURCE 28CFLAGS.NetBSD+= -D_NETBSD_SOURCE
28 29
29CONFIGURE_ARGS+= --with-curl=${BUILDLINK_PREFIX.curl} 30CONFIGURE_ARGS+= --with-curl=${BUILDLINK_PREFIX.curl}
30CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat} 31CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat}
31CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv} 32CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
32CONFIGURE_ARGS+= --with-openssl=${SSLBASE} 
33CONFIGURE_ARGS+= --with-perl=${PERL5:Q} 33CONFIGURE_ARGS+= --with-perl=${PERL5:Q}
34CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} 34CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
35CONFIGURE_ARGS+= --without-tcltk 35CONFIGURE_ARGS+= --without-tcltk
36 36
37BUILD_TARGET= all 37BUILD_TARGET= all
38 38
39REPLACE_SH+= contrib/hooks/post-receive-email 39REPLACE_SH+= contrib/hooks/post-receive-email
40REPLACE_SH+= contrib/hooks/pre-auto-gc-battery 40REPLACE_SH+= contrib/hooks/pre-auto-gc-battery
41 41
42EGDIR= ${PREFIX}/share/examples/git 42EGDIR= ${PREFIX}/share/examples/git
43 43
44GIT_COREDIR= git-core 44GIT_COREDIR= git-core
45GIT_TEMPLATEDIR= templates 45GIT_TEMPLATEDIR= templates
@@ -100,17 +100,16 @@ CONFIGURE_ARGS+= git_cv_ld_dashr=no @@ -100,17 +100,16 @@ CONFIGURE_ARGS+= git_cv_ld_dashr=no
100 100
101post-install: 101post-install:
102 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} 102 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
103 ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-completion.bash \ 103 ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-completion.bash \
104 ${DESTDIR}${EGDIR} 104 ${DESTDIR}${EGDIR}
105 ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-prompt.sh \ 105 ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-prompt.sh \
106 ${DESTDIR}${EGDIR} 106 ${DESTDIR}${EGDIR}
107 107
108.include "options.mk" 108.include "options.mk"
109 109
110.include "../../converters/libiconv/buildlink3.mk" 110.include "../../converters/libiconv/buildlink3.mk"
111.include "../../devel/zlib/buildlink3.mk" 111.include "../../devel/zlib/buildlink3.mk"
112.include "../../lang/perl5/module.mk" 112.include "../../lang/perl5/module.mk"
113.include "../../security/openssl/buildlink3.mk" 
114.include "../../textproc/expat/buildlink3.mk" 113.include "../../textproc/expat/buildlink3.mk"
115.include "../../www/curl/buildlink3.mk" 114.include "../../www/curl/buildlink3.mk"
116.include "../../mk/bsd.pkg.mk" 115.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/devel/git-base/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/git-base/distinfo 2014/06/02 16:32:36 1.14
+++ pkgsrc/devel/git-base/distinfo 2014/08/01 19:18:39 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.14 2014/06/02 16:32:36 adam Exp $ 1$NetBSD: distinfo,v 1.15 2014/08/01 19:18:39 schmonz Exp $
2 2
3SHA1 (git-1.9.4.tar.xz) = a91059d0065d82c6c2db6d69b56033a01b10eac8 3SHA1 (git-1.9.4.tar.xz) = a91059d0065d82c6c2db6d69b56033a01b10eac8
4RMD160 (git-1.9.4.tar.xz) = 742b8d73fa205b34b2c2843260d94787099b6030 4RMD160 (git-1.9.4.tar.xz) = 742b8d73fa205b34b2c2843260d94787099b6030
5Size (git-1.9.4.tar.xz) = 3387180 bytes 5Size (git-1.9.4.tar.xz) = 3387180 bytes
6SHA1 (patch-aa) = 31f3759c6cf3bfd28d154b3abaa95d396b72502b 6SHA1 (patch-aa) = 62170081fcf3831ba7316b5914657063c668a80b
7SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091 7SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba
8SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca 8SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
9SHA1 (patch-af) = d4741caeaed3ef6cfabf415f9fdbc95968307131 9SHA1 (patch-af) = d1aae6d9b15f7932912a97457d8a95364b685b07
10SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 10SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
11SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7 11SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
12SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e 12SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
13SHA1 (patch-config.mak.uname) = f18aafb64828f3c3e49321d6ef9756fff42c2056 13SHA1 (patch-config.mak.uname) = f18aafb64828f3c3e49321d6ef9756fff42c2056
14SHA1 (patch-wrapper.c) = d8252c63cca9a134fca3f8f6f28663f563c7b4bc 14SHA1 (patch-wrapper.c) = 1fb629ec301d0431cb5bebd716b1c3a7ae45577f
cvs diff -r1.2 -r1.3 pkgsrc/devel/git-base/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/git-base/options.mk 2014/01/03 17:31:25 1.2
+++ pkgsrc/devel/git-base/options.mk 2014/08/01 19:18:39 1.3
@@ -1,25 +1,36 @@ @@ -1,25 +1,36 @@
1# $NetBSD: options.mk,v 1.2 2014/01/03 17:31:25 richard Exp $ 1# $NetBSD: options.mk,v 1.3 2014/08/01 19:18:39 schmonz Exp $
2# 2#
3PKG_OPTIONS_VAR= PKG_OPTIONS.git 3PKG_OPTIONS_VAR= PKG_OPTIONS.git
4PKG_SUPPORTED_OPTIONS= python 4PKG_SUPPORTED_OPTIONS= python apple-common-crypto
5# python is not suggested because upstream's INSTALL does not list python 5# python is not suggested because upstream's INSTALL does not list python
6# as a dependency and because all it does is install a python module, 6# as a dependency and because all it does is install a python module,
7# which does not seem worth the dependency for everyone else. 7# which does not seem worth the dependency for everyone else.
8PKG_SUGGESTED_OPTIONS= 8PKG_SUGGESTED_OPTIONS=
9 9
10.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
11 11
12PLIST_VARS+= python 12PLIST_VARS+= python
13 13
14.if !empty(PKG_OPTIONS:Mpython) 14.if !empty(PKG_OPTIONS:Mpython)
15PY_PATCHPLIST= yes 15PY_PATCHPLIST= yes
16CONFIGURE_ARGS+= --with-python=${PYTHONBIN} 16CONFIGURE_ARGS+= --with-python=${PYTHONBIN}
17PLIST.python= yes 17PLIST.python= yes
18# not executable 18# not executable
19CHECK_INTERPRETER_SKIP+= ${PYSITELIB}/git_remote_helpers/*.py 19CHECK_INTERPRETER_SKIP+= ${PYSITELIB}/git_remote_helpers/*.py
20CHECK_INTERPRETER_SKIP+= ${PYSITELIB}/git_remote_helpers/git/*.py 20CHECK_INTERPRETER_SKIP+= ${PYSITELIB}/git_remote_helpers/git/*.py
21.include "../../lang/python/application.mk" 21.include "../../lang/python/application.mk"
22.include "../../lang/python/extension.mk" 22.include "../../lang/python/extension.mk"
23.else 23.else
24CONFIGURE_ARGS+= --without-python 24CONFIGURE_ARGS+= --without-python
25.endif 25.endif
 26
 27.if !empty(PKG_OPTIONS:Mapple-common-crypto)
 28. if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
 29PKG_FAIL_REASON= "apple-common-crypto not available on this system"
 30. endif
 31CONFIGURE_ARGS+= --without-openssl
 32.else
 33CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
 34.include "../../security/openssl/buildlink3.mk"
 35MAKE_FLAGS+= NO_APPLE_COMMON_CRYPTO=1
 36.endif
cvs diff -r1.2 -r1.3 pkgsrc/devel/git-base/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/git-base/patches/Attic/patch-aa 2013/12/04 12:51:06 1.2
+++ pkgsrc/devel/git-base/patches/Attic/patch-aa 2014/08/01 19:18:39 1.3
@@ -1,46 +1,46 @@ @@ -1,46 +1,46 @@
1$NetBSD: patch-aa,v 1.2 2013/12/04 12:51:06 adam Exp $ 1$NetBSD: patch-aa,v 1.3 2014/08/01 19:18:39 schmonz Exp $
2 2
3--- Makefile.orig 2013-12-03 19:35:24.000000000 +0000 3--- Makefile.orig 2014-05-30 21:38:10.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -351,8 +351,6 @@ GIT-VERSION-FILE: FORCE 5@@ -354,8 +354,6 @@ GIT-VERSION-FILE: FORCE
6  6
7 CFLAGS = -g -O2 -Wall 7 CFLAGS = -g -O2 -Wall
8 LDFLAGS = 8 LDFLAGS =
9-ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) 9-ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
10-ALL_LDFLAGS = $(LDFLAGS) 10-ALL_LDFLAGS = $(LDFLAGS)
11 STRIP ?= strip 11 STRIP ?= strip
12  12
13 # Among the variables below, these: 13 # Among the variables below, these:
14@@ -393,13 +391,9 @@ htmldir_relative = $(patsubst $(prefix)/ 14@@ -396,13 +394,9 @@ htmldir_relative = $(patsubst $(prefix)/
15  15
16 export prefix bindir sharedir sysconfdir gitwebdir localedir 16 export prefix bindir sharedir sysconfdir gitwebdir localedir
17  17
18-CC = cc 18-CC = cc
19-AR = ar 19-AR = ar
20 RM = rm -f 20 RM = rm -f
21 DIFF = diff 21 DIFF = diff
22-TAR = tar 22-TAR = tar
23 FIND = find 23 FIND = find
24-INSTALL = install 24-INSTALL = install
25 RPMBUILD = rpmbuild 25 RPMBUILD = rpmbuild
26 TCL_PATH = tclsh 26 TCL_PATH = tclsh
27 TCLTK_PATH = wish 27 TCLTK_PATH = wish
28@@ -1630,8 +1624,8 @@ ifdef DEFAULT_HELP_FORMAT 28@@ -1635,8 +1629,8 @@ ifdef DEFAULT_HELP_FORMAT
29 BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"' 29 BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
30 endif 30 endif
31  31
32-ALL_CFLAGS += $(BASIC_CFLAGS) 32-ALL_CFLAGS += $(BASIC_CFLAGS)
33-ALL_LDFLAGS += $(BASIC_LDFLAGS) 33-ALL_LDFLAGS += $(BASIC_LDFLAGS)
34+ALL_CFLAGS = $(BASIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) 34+ALL_CFLAGS = $(BASIC_CFLAGS) $(CPPFLAGS) $(CFLAGS)
35+ALL_LDFLAGS = $(BASIC_LDFLAGS) $(LDFLAGS) 35+ALL_LDFLAGS = $(BASIC_LDFLAGS) $(LDFLAGS)
36  36
37 export DIFF TAR INSTALL DESTDIR SHELL_PATH 37 export DIFF TAR INSTALL DESTDIR SHELL_PATH
38  38
39@@ -2338,7 +2332,6 @@ ifndef NO_GETTEXT 39@@ -2353,7 +2347,6 @@ ifndef NO_GETTEXT
40 endif 40 endif
41 ifndef NO_PERL 41 ifndef NO_PERL
42 $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install 42 $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
43- $(MAKE) -C gitweb install 43- $(MAKE) -C gitweb install
44 endif 44 endif
45 ifndef NO_TCLTK 45 ifndef NO_TCLTK
46 $(MAKE) -C gitk-git install 46 $(MAKE) -C gitk-git install
cvs diff -r1.1 -r1.2 pkgsrc/devel/git-base/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/devel/git-base/patches/Attic/patch-ac 2013/09/09 13:54:44 1.1
+++ pkgsrc/devel/git-base/patches/Attic/patch-ac 2014/08/01 19:18:39 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ac,v 1.1 2013/09/09 13:54:44 wiz Exp $ 1$NetBSD: patch-ac,v 1.2 2014/08/01 19:18:39 schmonz Exp $
2 2
3--- gitk-git/Makefile.orig 2008-08-17 16:43:06.000000000 -0400 3--- gitk-git/Makefile.orig 2014-05-30 21:38:10.000000000 +0000
4+++ gitk-git/Makefile 4+++ gitk-git/Makefile
5@@ -40,9 +40,9 @@ endif 5@@ -50,9 +50,9 @@ endif
6 all:: gitk-wish $(ALL_MSGFILES) 6 all:: gitk-wish $(ALL_MSGFILES)
7  7
8 install:: all 8 install:: all
9- $(INSTALL) -m 755 gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk 9- $(INSTALL) -m 755 gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
10- $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(msgsdir_SQ)' 10- $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(msgsdir_SQ)'
11- $(foreach p,$(ALL_MSGFILES), $(INSTALL) -m 644 $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true 11- $(foreach p,$(ALL_MSGFILES), $(INSTALL) -m 644 $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
12+ $(BSD_INSTALL_SCRIPT) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk 12+ $(BSD_INSTALL_SCRIPT) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
13+ $(BSD_INSTALL_DATA_DIR) '$(DESTDIR_SQ)$(msgsdir_SQ)' 13+ $(BSD_INSTALL_DATA_DIR) '$(DESTDIR_SQ)$(msgsdir_SQ)'
14+ $(foreach p,$(ALL_MSGFILES), $(BSD_INSTALL_DATA) $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true 14+ $(foreach p,$(ALL_MSGFILES), $(BSD_INSTALL_DATA) $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
15  15
16 uninstall:: 16 uninstall::
17 $(foreach p,$(ALL_MSGFILES), $(RM) '$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) &&) true 17 $(foreach p,$(ALL_MSGFILES), $(RM) '$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) &&) true
cvs diff -r1.1 -r1.2 pkgsrc/devel/git-base/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/devel/git-base/patches/Attic/patch-af 2013/09/09 13:54:44 1.1
+++ pkgsrc/devel/git-base/patches/Attic/patch-af 2014/08/01 19:18:39 1.2
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: patch-af,v 1.1 2013/09/09 13:54:44 wiz Exp $ 1$NetBSD: patch-af,v 1.2 2014/08/01 19:18:39 schmonz Exp $
2 2
3* Use BSR_INSTALL_*. 3* Use BSR_INSTALL_*.
4* FIXME: Add "--skip-validation" to xmlto command. 4* FIXME: Add "--skip-validation" to xmlto command.
5 5
6--- Documentation/Makefile.orig 2013-08-23 19:38:43.000000000 +0000 6--- Documentation/Makefile.orig 2014-05-30 21:38:10.000000000 +0000
7+++ Documentation/Makefile 7+++ Documentation/Makefile
8@@ -92,7 +92,7 @@ man7dir = $(mandir)/man7 8@@ -97,7 +97,7 @@ man7dir = $(mandir)/man7
9 ASCIIDOC = asciidoc 9 ASCIIDOC = asciidoc
10 ASCIIDOC_EXTRA = 10 ASCIIDOC_EXTRA =
11 MANPAGE_XSL = manpage-normal.xsl 11 MANPAGE_XSL = manpage-normal.xsl
12-XMLTO = xmlto 12-XMLTO = xmlto
13+XMLTO = xmlto --skip-validation 13+XMLTO = xmlto --skip-validation
14 XMLTO_EXTRA = 14 XMLTO_EXTRA =
15 INSTALL ?= install 15 INSTALL ?= install
16 RM ?= rm -f 16 RM ?= rm -f
17@@ -212,16 +212,16 @@ pdf: user-manual.pdf 17@@ -218,16 +218,16 @@ pdf: user-manual.pdf
18 install: install-man 18 install: install-man
19  19
20 install-man: man 20 install-man: man
21- $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir) 21- $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
22- $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir) 22- $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
23- $(INSTALL) -d -m 755 $(DESTDIR)$(man7dir) 23- $(INSTALL) -d -m 755 $(DESTDIR)$(man7dir)
24- $(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir) 24- $(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir)
25- $(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir) 25- $(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir)
26- $(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir) 26- $(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir)
27+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man1dir) 27+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man1dir)
28+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man5dir) 28+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man5dir)
29+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man7dir) 29+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man7dir)
30+ $(BSD_INSTALL_MAN) $(DOC_MAN1) $(DESTDIR)$(man1dir) 30+ $(BSD_INSTALL_MAN) $(DOC_MAN1) $(DESTDIR)$(man1dir)
cvs diff -r1.1 -r1.2 pkgsrc/devel/git-base/patches/Attic/patch-wrapper.c (expand / switch to unified diff)

--- pkgsrc/devel/git-base/patches/Attic/patch-wrapper.c 2013/09/09 13:54:44 1.1
+++ pkgsrc/devel/git-base/patches/Attic/patch-wrapper.c 2014/08/01 19:18:39 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-wrapper.c,v 1.1 2013/09/09 13:54:44 wiz Exp $ 1$NetBSD: patch-wrapper.c,v 1.2 2014/08/01 19:18:39 schmonz Exp $
2 2
3git's wrapper around mkstemp assumes that the libc function will not 3git's wrapper around mkstemp assumes that the libc function will not
4modify the argument when the call fails. This causes one of git's 4modify the argument when the call fails. This causes one of git's
5tests to fail. This patch is from Junio C. Hamano, and will likely be 5tests to fail. This patch is from Junio C. Hamano, and will likely be
6included in future versions of git. 6included in future versions of git.
7 7
8--- wrapper.c.orig 2012-11-26 03:18:01.000000000 +0000 8--- wrapper.c.orig 2014-05-30 21:38:10.000000000 +0000
9+++ wrapper.c 9+++ wrapper.c
10@@ -229,7 +229,7 @@ int xmkstemp(char *template) 10@@ -378,7 +378,7 @@ int xmkstemp_mode(char *template, int mo
11 int saved_errno = errno; 11 int saved_errno = errno;
12 const char *nonrelative_template; 12 const char *nonrelative_template;
13  13
14- if (!template[0]) 14- if (!template[0])
15+ if (strlen(template) != strlen(origtemplate)) 15+ if (strlen(template) != strlen(origtemplate))
16 template = origtemplate; 16 template = origtemplate;
17  17
18 nonrelative_template = absolute_path(template); 18 nonrelative_template = absolute_path(template);