Update to version 1.5.3.2. See release notes in tarball for changes.

Added beginnings of emacs support; I intend on supporting this and
other stuff from ${WRKSRC}/contrib after the freeze.

6 files changed, 41 insertions, 21 deletions

diff --git a/devel/scmgit/Makefile b/devel/scmgit/Makefile
index 92f1e565ba4..2c9c6692459 100644
--- a/devel/scmgit/Makefile
+++ b/devel/scmgit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2007/09/11 09:23:54 bjs Exp $
+# $NetBSD: Makefile,v 1.17 2007/09/21 23:13:26 bjs Exp $
 #
 
-DISTNAME=	git-1.5.3.1
+DISTNAME=	git-1.5.3.2
 PKGNAME=	scm${DISTNAME}
 CATEGORIES=	devel scm
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
@@ -59,6 +59,8 @@ PLIST_SUBST+=	IF_NEEDS_SUBPROCESS_PY=""
 PLIST_SUBST+=	IF_NEEDS_SUBPROCESS_PY="@comment "
 .endif
 
+#.include "../../mk/emacs.mk" # XXX TODO (see patch-ad)
+
 post-install:
 	chmod 644 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/git*.1
 	chmod 644 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/git*.7
diff --git a/devel/scmgit/PLIST b/devel/scmgit/PLIST
index 1690a538325..bcad458e585 100644
--- a/devel/scmgit/PLIST
+++ b/devel/scmgit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2007/09/11 09:23:54 bjs Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/09/21 23:13:26 bjs Exp $
 bin/git
 bin/git-add
 bin/git-add--interactive
@@ -302,6 +302,7 @@ share/git-gui/lib/branch_delete.tcl
 share/git-gui/lib/branch_rename.tcl
 share/git-gui/lib/browser.tcl
 share/git-gui/lib/checkout_op.tcl
+share/git-gui/lib/choose_font.tcl
 share/git-gui/lib/choose_rev.tcl
 share/git-gui/lib/class.tcl
 share/git-gui/lib/commit.tcl
diff --git a/devel/scmgit/distinfo b/devel/scmgit/distinfo
index 6f49376272c..bf37f785221 100644
--- a/devel/scmgit/distinfo
+++ b/devel/scmgit/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.13 2007/09/11 09:23:54 bjs Exp $
+$NetBSD: distinfo,v 1.14 2007/09/21 23:13:26 bjs Exp $
 
-SHA1 (git-1.5.3.1.tar.gz) = b1e75e5f62408432ff992efa12d1e8a018c7e438
-RMD160 (git-1.5.3.1.tar.gz) = 59425bc0c215bde8599e138496af149e9de06ce4
-Size (git-1.5.3.1.tar.gz) = 1595543 bytes
+SHA1 (git-1.5.3.2.tar.gz) = 735aaa1a329d26537a483775b5e62c8a108e30fd
+RMD160 (git-1.5.3.2.tar.gz) = c81dc6454a6d0513d5294f1778e02519d68f3dc0
+Size (git-1.5.3.2.tar.gz) = 1595159 bytes
 SHA1 (patch-aa) = dd2075bb0bd330d286e792564f28691cba3120ca
 SHA1 (patch-ab) = ac5f9e2723ec3470d47c20e98be2375a4750d45f
 SHA1 (patch-ac) = c2571c4397282b0d06061af62698b3e224ed70d8
-SHA1 (patch-ad) = 89de9fdc75293506309def1393898f95b2a137c3
 SHA1 (patch-ae) = 44f30c796c922b028773668e80d71c0a48606f5c
 SHA1 (patch-af) = d2b6fff88913d89f37bf5453babc65027a6a5a54
-SHA1 (patch-ag) = bf21ed224fda5b2cad53b6cf1e4d3f557a68128e
-SHA1 (patch-ah) = 2a8ff2d42fbb1696a7ee828f74a3812b94a8b900
+SHA1 (patch-ag) = feb17b439e0e4e89c25985f2e14e300d698c8dcf
+SHA1 (patch-ah) = 4cf802facbc3dd9f78e923427c4b5f455f954722
+SHA1 (patch-ai) = 569ca315a6ed73f8d06fa265945af3e2d920556a
diff --git a/devel/scmgit/patches/patch-ag b/devel/scmgit/patches/patch-ag
index 0d77446ea8a..48c30a94e02 100644
--- a/devel/scmgit/patches/patch-ag
+++ b/devel/scmgit/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.2 2007/09/11 09:23:55 bjs Exp $
+$NetBSD: patch-ag,v 1.3 2007/09/21 23:13:26 bjs Exp $
 
---- templates/Makefile.orig	2007-09-02 01:57:44.000000000 -0400
+--- templates/Makefile.orig	2007-09-19 14:02:17.000000000 -0400
 +++ templates/Makefile
 @@ -46,6 +46,6 @@ clean:
  	$(RM) -r blt boilerplates.made
diff --git a/devel/scmgit/patches/patch-ah b/devel/scmgit/patches/patch-ah
index f620b737bf6..4943266c70c 100644
--- a/devel/scmgit/patches/patch-ah
+++ b/devel/scmgit/patches/patch-ah
@@ -1,23 +1,23 @@
-$NetBSD: patch-ah,v 1.3 2007/09/11 09:23:55 bjs Exp $
+$NetBSD: patch-ah,v 1.4 2007/09/21 23:13:26 bjs Exp $
 
---- git-gui/Makefile.orig	2007-09-02 01:57:44.000000000 -0400
+--- git-gui/Makefile.orig	2007-09-19 14:02:17.000000000 -0400
 +++ git-gui/Makefile
-@@ -31,11 +31,11 @@ ifndef INSTALL
- 	INSTALL = install
- endif
+@@ -34,11 +34,11 @@ endif
+ RM_F      ?= rm -f
+ RMDIR     ?= rmdir
  
 -INSTALL_D0 = $(INSTALL) -d -m755 # space is required here
-+INSTALL_D0 = $(BSD_INSTALL_DATA_DIR) # space is required here
++INSTALL_D0 = ${BSD_INSTALL_DATA_DIR} # space is required here
  INSTALL_D1 =
 -INSTALL_R0 = $(INSTALL) -m644 # space is required here
-+INSTALL_R0 = $(BSD_INSTALL_DATA) # space is required here
++INSTALL_R0 = ${BSD_INSTALL_DATA} # space is required here
  INSTALL_R1 =
 -INSTALL_X0 = $(INSTALL) -m755 # space is required here
-+INSTALL_X0 = $(BSD_INSTALL_SCRIPT) # space is required here
++INSTALL_X0 = ${BSD_INSTALL_SCRIPT} # space is required here
  INSTALL_X1 =
  INSTALL_L0 = rm -f # space is required here
  INSTALL_L1 = && ln # space is required here
-@@ -50,11 +50,11 @@ ifndef V
+@@ -59,11 +59,11 @@ ifndef V
  	QUIET_2DEVNULL = 2>/dev/null
  
  	INSTALL_D0 = dir=
diff --git a/devel/scmgit/patches/patch-ai b/devel/scmgit/patches/patch-ai
new file mode 100644
index 00000000000..6757f54b64c
--- /dev/null
+++ b/devel/scmgit/patches/patch-ai
@@ -0,0 +1,17 @@
+$NetBSD: patch-ai,v 1.1 2007/09/21 23:13:26 bjs Exp $
+
+Beginnings of emacs support, not enabled yet.  We must use mk/emacs.mk.
+
+--- contrib/emacs/Makefile.orig	2007-09-19 14:02:17.000000000 -0400
++++ contrib/emacs/Makefile
+@@ -12,8 +12,8 @@ RM ?= rm -f
+ all: $(ELC)
+ 
+ install: all
+-	$(INSTALL) -d $(DESTDIR)$(emacsdir)
+-	$(INSTALL_ELC) $(ELC:.elc=.el) $(ELC) $(DESTDIR)$(emacsdir)
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(emacsdir)
++	${BSD_INSTALL_DATA} $(ELC:.elc=.el) $(ELC) $(DESTDIR)$(emacsdir)
+ 
+ %.elc: %.el
+ 	$(EMACS) -batch -f batch-byte-compile $<