Update to 1.5.4.3. While here, change pkgsrc Makefiles to use the included

configure script.  This not only makes our Makefiles more readable, but
also performs various checks that were previously hard-coded, e.g.
whether or not iconv's *char arguments are constified or not.  We also
no longer need the huge mess which checks for the asciidoc/xmlto versions
in git-docs/Makefile. Also, misc. makefile fixes/stylistic changes and
removal of Python dependencies. I don't see how they are needed.
Python modules should be installed as seperate ${PKGPKGPREFIX}-scmgit
packages.

This was a somewhat radical change, so please report any problems.

Changes since 1.5.4:

 * RPM spec used to pull in everything with 'git'.  This has been
   changed so that 'git' package contains just the core parts,
   and we now supply 'git-all' metapackage to slurp in everything.
   This should match end user's expectation better.
 * When some refs failed to update, git-push reported "failure"
   which was unclear if some other refs were updated or all of
   them failed atomically (the answer is the former).  Reworded
   the message to clarify this.
 * "git clone" from a repository whose HEAD was misconfigured
   did not set up the remote properly.  Now it tries to do
   better.
 * Updated git-push documentation to clarify what "matching"
   means, in order to reduce user confusion.
 * Updated git-add documentation to clarify "add -u" operates in
   the current subdirectory you are in, just like other commands.
 * git-gui updates to work on OSX and Windows better.
 * The configuration parser was not prepared to see string
   valued variables misspelled as boolean and segfaulted.
 * Temporary files left behind due to interrupted object
   transfers were not cleaned up with "git prune".
 * "git config --unset" was confused when the unset variables
   were spelled with continuation lines in the config file.
 * The merge message detection in "git cvsimport" did not catch
   a message that began with "Merge...".
 * "git status" suggests "git rm --cached" for unstaging the
   earlier "git add" before the initial commit.
 * "git status" output was incorrect during a partial commit.
 * "git bisect" refused to start when the HEAD was detached.
 * "git bisect" allowed a wildcard character in the commit
   message expanded while writing its log file.
 * Manual pages were not formatted correctly with docbook xsl
   1.72; added a workaround.
 * "git-commit -C $tag" used to work but rewrite in C done in
   1.5.4 broke it.  This was fixed in 1.5.4.1.
 * An entry in the .gitattributes file that names a pattern in a
   subdirectory of the directory it is in did not match
   correctly (e.g. pattern "b/*.c" in "a/.gitattributes" should
   match "a/b/foo.c" but it didn't).  This was fixed in 1.5.4.1.
 * Customized color specification was parsed incorrectly when
   numeric color values are used.  This was fixed in 1.5.4.1.
 * http transport misbehaved when linked with curl-gnutls.
 * "git-commit -C $tag" used to work but rewrite in C done in
   1.5.4 broke it.
 * An entry in the .gitattributes file that names a pattern in a
   subdirectory of the directory it is in did not match
   correctly (e.g. pattern "b/*.c" in "a/.gitattributes" should
   match "a/b/foo.c" but it didn't).
 * Customized color specification was parsed incorrectly when
   numeric color values are used.  This was fixed in 1.5.4.1.

4 files changed, 25 insertions, 61 deletions

diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index ea2ff629201..b4a47d3efbb 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/02/06 07:53:31 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2008/02/28 15:11:29 bjs Exp $
 #
 
 .include "${.CURDIR}/../scmgit/Makefile.common"
@@ -13,40 +13,24 @@ CONFLICTS+=		git-[0-9]*		# misc/git
 USE_LANGUAGES=		c99
 USE_TOOLS+=		perl:run sh:run wish:run msgfmt
 
-MAKE_ENV+=		CURLDIR=${BUILDLINK_PREFIX.curl:Q}
-MAKE_ENV+=		PYTHON_PATH=${PYTHONBIN:Q}
+CFLAGS.NetBSD+=	 	-D_NETBSD_SOURCE
+
+CONFIGURE_ARGS+=	--with-curl=${BUILDLINK_PREFIX.curl:Q}
+CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat:Q}
+CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv:Q}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
+CONFIGURE_ARGS+=	--with-tcltk=${TOOLS_PREFIX.wish}
+CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib:Q}
 
 BUILD_TARGET=		all
 INSTALL_TARGET=		install
 
+PERL5_CONFIGURE= 	no
 PERL5_PACKLIST=		auto/Git/.packlist
-PERL5_CONFIGURE_DIRS=	${WRKSRC}/perl
-
-.include "../../mk/bsd.fast.prefs.mk"
-.include "../../lang/python/application.mk"
-
-NEEDS_SUBPROCESS_PY!= \
-	if ok=`${PYTHONBIN} -c 'import subprocess; print "OK"' 2>/dev/null` \
-	&& ${TEST} "$$ok" = "OK"; then echo "no"; else echo "yes"; fi
-.if ${NEEDS_SUBPROCESS_PY} == "yes"
-PLIST_SUBST+=	IF_NEEDS_SUBPROCESS_PY=""
-.else
-PLIST_SUBST+=	IF_NEEDS_SUBPROCESS_PY="@comment "
-.endif
+REPLACE_PERL+=		*.perl */*.perl */*/*.perl
 
 #.include "../../mk/emacs.mk" # XXX TODO (see patch-ad)
 
-## XXX Do all the BSDs fit this category?
-#
-.if ${OPSYS} == "NetBSD"
-CHECK_BUILTIN.iconv:=yes
-.  include "../../converters/libiconv/builtin.mk"
-CHECK_BUILTIN.iconv:=no
-.  if ${ICONV_TYPE} == "native"
-CFLAGS+=	-DOLD_ICONV
-.  endif
-.endif
-
 .include "../../lang/perl5/module.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index a1301e0c0c6..04cd63de7fd 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2008/02/10 19:00:27 tnn Exp $
+$NetBSD: distinfo,v 1.4 2008/02/28 15:11:29 bjs Exp $
 
-SHA1 (git-1.5.4.tar.gz) = e4114d06231a038e70bd3f3ff0abedd0c94c3e7f
-RMD160 (git-1.5.4.tar.gz) = 7211e87c82b56fc9a94baa83df232b27fbce11fa
-Size (git-1.5.4.tar.gz) = 1894329 bytes
+SHA1 (git-1.5.4.3.tar.gz) = de9a68a6628465376a02b563d902dad05421c917
+RMD160 (git-1.5.4.3.tar.gz) = c3c3e8f15a0323ee3bcb9d8dfa2a58c23db14b85
+Size (git-1.5.4.3.tar.gz) = 1899555 bytes
 SHA1 (patch-aa) = 5af7779f0ac99aa6694d2a4d87ed999ef21c9375
 SHA1 (patch-ab) = 746bcea15853cd78b14dc2916f5f02bf67e59751
 SHA1 (patch-ac) = b8b70fabbd2857d5b4962b94d2c852f8d092ef27
diff --git a/devel/scmgit-docs/Makefile b/devel/scmgit-docs/Makefile
index 984df6e0324..9bbda5a864d 100644
--- a/devel/scmgit-docs/Makefile
+++ b/devel/scmgit-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/02/06 07:53:32 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2008/02/28 15:11:29 bjs Exp $
 #
 
 PKGNAME=		scmgit-docs-${GIT_VERSION}
@@ -16,20 +16,6 @@ BUILD_TARGET=		doc
 USE_LANGUAGES=		# none
 INSTALL_TARGET=		install-doc
 
-.include "../../mk/bsd.fast.prefs.mk"
-
-.for d in asciidoc docbook-xsl
-GITDOCDEP.${d}=	${${${PKG_INFO} -E ${d} || echo:L:sh}:L:C/[^[0-9]]*/ /g:[1..3]:ts.}
-.endfor
-
-.if !empty(GITDOCDEP.asciidoc:M[8]*)
-MAKE_ENV+=	AsciiDoc8=YesPlease
-.endif
-
-.if !empty(GITDOCDEP.docbook-xsl:M1.7[2-9]*)
-MAKE_ENV+=	DOCBOOK_XSL_172=YesPlease
-.endif
-
 .include "${.CURDIR}/../scmgit/Makefile.common"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/scmgit/Makefile.common b/devel/scmgit/Makefile.common
index 9e682617953..cc10b0b23b1 100644
--- a/devel/scmgit/Makefile.common
+++ b/devel/scmgit/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2008/02/10 19:00:27 tnn Exp $
+# $NetBSD: Makefile.common,v 1.6 2008/02/28 15:11:29 bjs Exp $
 #
 # used by devel/scmgit-base/Makefile
 # used by devel/scmgit-docs/Makefile
@@ -10,10 +10,9 @@ MASTER_SITES?=	http://www.kernel.org/pub/software/scm/git/
 MAINTAINER?=	pancake@phreaker.net
 HOMEPAGE?=	http://git.or.cz/
 
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GIT_VERSION=	1.5.4
+GIT_VERSION=	1.5.4.3
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -21,17 +20,12 @@ GIT_VERSION=	1.5.4
 PATCHDIR=	${.CURDIR}/../scmgit-base/patches
 DISTINFO_FILE=	${.CURDIR}/../scmgit-base/distinfo
 
-USE_TOOLS+=	gmake tar perl sh
-EXTRACT_USING=	gtar
-
-MAKE_ENV+=	PERL_PATH=${PERL5:Q}
-MAKE_ENV+=	SHELL_PATH=${SH:Q}
-MAKE_ENV+=	TAR=${TAR:Q}
-MAKE_FLAGS+=	mandir=${PREFIX}/${PKGMANDIR}
-
-LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib
-LIBS.SunOS+=	-liconv
-CFLAGS.NetBSD+=	-D_NETBSD_SOURCE
+GNU_CONFIGURE?= 	yes
+USE_TOOLS+=		gmake tar perl sh
+EXTRACT_USING=		gtar
 
-AUTO_MKDIRS?=	yes
+CONFIGURE_ARGS+= 	--with-perl=${PERL5:Q}
+CONFIGURE_ARGS+= 	--with-shell=${SH:Q}
+CONFIGURE_ARGS+= 	--with-tar=${TAR:Q}
+CONFIGURE_ARGS+= 	--mandir=${${PREFIX}/${PKGMANDIR}:L:Q}
 .endif