Update to scmgit-1.5.3.1. Changes are too numerous to list here; please

see Documentation/RelNotes-1.5.3.1.txt (in ${WRKSRC} or the GIT tree).

10 files changed, 116 insertions, 61 deletions

diff --git a/devel/scmgit/Makefile b/devel/scmgit/Makefile
index 4546c0571e1..92f1e565ba4 100644
--- a/devel/scmgit/Makefile
+++ b/devel/scmgit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2007/08/29 23:34:51 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/11 09:23:54 bjs Exp $
 #
 
-DISTNAME=	git-1.5.2.5
+DISTNAME=	git-1.5.3.1
 PKGNAME=	scm${DISTNAME}
 CATEGORIES=	devel scm
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
@@ -10,11 +10,12 @@ MAINTAINER=	pancake@phreaker.net
 HOMEPAGE=	http://git.or.cz/
 COMMENT=	Tree History Storage Tool
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=	git-[0-9]*		# misc/git
 BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
 BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
 
-MAKE_ENV+=	DESTDIR=""
 MAKE_ENV+=	HOME=${PREFIX:Q}
 USE_LANGUAGES=	c99
 USE_TOOLS+=	gmake perl:run sh:run wish:run tar
@@ -35,6 +36,18 @@ CFLAGS.NetBSD+=	-D_NETBSD_SOURCE
 PERL5_PACKLIST=	auto/Git/.packlist
 PERL5_CONFIGURE_DIRS=	${WRKSRC}/perl
 
+.include "../../mk/bsd.prefs.mk"
+
+###
+### XXX Do all the BSDs fit this category?
+###
+.if ${OPSYS} == "NetBSD"
+.  include "../../converters/libiconv/builtin.mk"
+.  if ${ICONV_TYPE} == "native"
+CFLAGS+=	-DOLD_ICONV
+.  endif
+.endif
+
 .include "../../lang/python/application.mk"
 
 NEEDS_SUBPROCESS_PY!= \
@@ -47,8 +60,8 @@ PLIST_SUBST+=	IF_NEEDS_SUBPROCESS_PY="@comment "
 .endif
 
 post-install:
-	chmod 644 ${PREFIX}/${PKGMANDIR}/man1/git*.1
-	chmod 644 ${PREFIX}/${PKGMANDIR}/man7/git*.7
+	chmod 644 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/git*.1
+	chmod 644 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/git*.7
 
 .include "../../lang/perl5/module.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/devel/scmgit/PLIST b/devel/scmgit/PLIST
index 682b9307a75..1690a538325 100644
--- a/devel/scmgit/PLIST
+++ b/devel/scmgit/PLIST
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.7 2007/07/08 20:19:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/09/11 09:23:54 bjs Exp $
 bin/git
 bin/git-add
 bin/git-add--interactive
 bin/git-am
 bin/git-annotate
 bin/git-apply
-bin/git-applymbox
-bin/git-applypatch
 bin/git-archimport
 bin/git-archive
 bin/git-bisect
@@ -41,6 +39,7 @@ bin/git-fast-import
 bin/git-fetch
 bin/git-fetch--tool
 bin/git-fetch-pack
+bin/git-filter-branch
 bin/git-fmt-merge-msg
 bin/git-for-each-ref
 bin/git-format-patch
@@ -96,6 +95,7 @@ bin/git-push
 bin/git-quiltimport
 bin/git-read-tree
 bin/git-rebase
+bin/git-rebase--interactive
 bin/git-receive-pack
 bin/git-reflog
 bin/git-relink
@@ -123,8 +123,10 @@ bin/git-ssh-fetch
 bin/git-ssh-pull
 bin/git-ssh-push
 bin/git-ssh-upload
+bin/git-stash
 bin/git-status
 bin/git-stripspace
+bin/git-submodule
 bin/git-svn
 bin/git-svnimport
 bin/git-symbolic-ref
@@ -147,8 +149,6 @@ man/man1/git-add.1
 man/man1/git-am.1
 man/man1/git-annotate.1
 man/man1/git-apply.1
-man/man1/git-applymbox.1
-man/man1/git-applypatch.1
 man/man1/git-archimport.1
 man/man1/git-archive.1
 man/man1/git-bisect.1
@@ -162,6 +162,7 @@ man/man1/git-checkout-index.1
 man/man1/git-checkout.1
 man/man1/git-cherry-pick.1
 man/man1/git-cherry.1
+man/man1/git-citool.1
 man/man1/git-clean.1
 man/man1/git-clone.1
 man/man1/git-commit-tree.1
@@ -181,6 +182,7 @@ man/man1/git-diff.1
 man/man1/git-fast-import.1
 man/man1/git-fetch-pack.1
 man/man1/git-fetch.1
+man/man1/git-filter-branch.1
 man/man1/git-fmt-merge-msg.1
 man/man1/git-for-each-ref.1
 man/man1/git-format-patch.1
@@ -189,6 +191,7 @@ man/man1/git-fsck.1
 man/man1/git-gc.1
 man/man1/git-get-tar-commit-id.1
 man/man1/git-grep.1
+man/man1/git-gui.1
 man/man1/git-hash-object.1
 man/man1/git-http-fetch.1
 man/man1/git-http-push.1
@@ -216,7 +219,6 @@ man/man1/git-mktag.1
 man/man1/git-mktree.1
 man/man1/git-mv.1
 man/man1/git-name-rev.1
-man/man1/git-p4import.1
 man/man1/git-pack-objects.1
 man/man1/git-pack-redundant.1
 man/man1/git-pack-refs.1
@@ -255,8 +257,10 @@ man/man1/git-show-ref.1
 man/man1/git-show.1
 man/man1/git-ssh-fetch.1
 man/man1/git-ssh-upload.1
+man/man1/git-stash.1
 man/man1/git-status.1
 man/man1/git-stripspace.1
+man/man1/git-submodule.1
 man/man1/git-svn.1
 man/man1/git-svnimport.1
 man/man1/git-symbolic-ref.1
@@ -277,6 +281,7 @@ man/man1/git-write-tree.1
 man/man1/gitk.1
 man/man5/gitattributes.5
 man/man5/gitignore.5
+man/man5/gitmodules.5
 man/man7/git.7
 share/git-core/templates/description
 share/git-core/templates/hooks/applypatch-msg
@@ -291,18 +296,27 @@ share/git-core/templates/hooks/update
 share/git-core/templates/info/exclude
 share/git-gui/lib/blame.tcl
 share/git-gui/lib/branch.tcl
+share/git-gui/lib/branch_checkout.tcl
+share/git-gui/lib/branch_create.tcl
+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_rev.tcl
 share/git-gui/lib/class.tcl
 share/git-gui/lib/commit.tcl
 share/git-gui/lib/console.tcl
 share/git-gui/lib/database.tcl
 share/git-gui/lib/diff.tcl
+share/git-gui/lib/encoding.tcl
 share/git-gui/lib/error.tcl
 share/git-gui/lib/index.tcl
 share/git-gui/lib/merge.tcl
 share/git-gui/lib/option.tcl
 share/git-gui/lib/remote.tcl
+share/git-gui/lib/remote_branch_delete.tcl
 share/git-gui/lib/shortcut.tcl
+share/git-gui/lib/status_bar.tcl
 share/git-gui/lib/tclIndex
 share/git-gui/lib/transport.tcl
 @dirrm share/git-gui/lib
diff --git a/devel/scmgit/distinfo b/devel/scmgit/distinfo
index 01a9af8ac97..6f49376272c 100644
--- a/devel/scmgit/distinfo
+++ b/devel/scmgit/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.12 2007/08/29 23:34:51 wiz Exp $
+$NetBSD: distinfo,v 1.13 2007/09/11 09:23:54 bjs Exp $
 
-SHA1 (git-1.5.2.5.tar.gz) = 18e9580d7f7ac1da9da6e614a20a90df40bda6e0
-RMD160 (git-1.5.2.5.tar.gz) = d6f376179355e5929f9d70b67507c6241f28ade0
-Size (git-1.5.2.5.tar.gz) = 1413507 bytes
-SHA1 (patch-aa) = 5e04beafa83732910493a5e3f4fe0c314b62e671
-SHA1 (patch-ab) = 59aaf91ef1f0d5a9ded006157467d8bd12d7b87b
-SHA1 (patch-ac) = 5c86dfda134040f6eeafe4f18a742d99a5b003cc
-SHA1 (patch-ae) = d267e41f5f883bde801728328c67fd733d3bd351
-SHA1 (patch-af) = 28b0d77a56c0ca6c9ce6fe992956a79e23064695
-SHA1 (patch-ag) = 6f4e3c0418286c0ca3fbc00a72a90e59983cb6bc
-SHA1 (patch-ah) = 8715acb5c596573c7bd39fc327dd12009ff57ee3
+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 (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
diff --git a/devel/scmgit/patches/patch-aa b/devel/scmgit/patches/patch-aa
index 494cb0bcd73..1d6a2ebccdc 100644
--- a/devel/scmgit/patches/patch-aa
+++ b/devel/scmgit/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.8 2007/07/08 20:19:57 wiz Exp $
+$NetBSD: patch-aa,v 1.9 2007/09/11 09:23:55 bjs Exp $
 
 NetBSD 3.0 needs -liconv, too.
 
 AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
 
---- Makefile.orig	2007-07-02 08:11:39.000000000 +0000
+--- Makefile.orig	2007-09-02 01:57:44.000000000 -0400
 +++ Makefile
-@@ -137,8 +137,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de
+@@ -135,8 +135,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -15,18 +15,20 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  ALL_CFLAGS = $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -174,10 +172,6 @@ GITWEB_SITE_FOOTER =
+@@ -173,12 +171,8 @@ GITWEB_SITE_FOOTER =
  
  export prefix bindir gitexecdir sharedir template_dir sysconfdir
  
 -CC = gcc
 -AR = ar
+ RM = rm -f
 -TAR = tar
+ FIND = find
 -INSTALL = install
  RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
-@@ -408,6 +402,7 @@ ifeq ($(uname_S),Darwin)
+@@ -398,6 +392,7 @@ ifeq ($(uname_S),Darwin)
  	NO_STRLCPY = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
@@ -34,7 +36,7 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  	NEEDS_SOCKET = YesPlease
  	NEEDS_NSL = YesPlease
  	SHELL_PATH = /bin/bash
-@@ -426,8 +421,6 @@ ifeq ($(uname_S),SunOS)
+@@ -416,8 +411,6 @@ ifeq ($(uname_S),SunOS)
  		NO_C99_FORMAT = YesPlease
  		NO_STRTOUMAX = YesPlease
  	endif
@@ -43,7 +45,7 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  	BASIC_CFLAGS += -D__EXTENSIONS__
  endif
  ifeq ($(uname_O),Cygwin)
-@@ -457,9 +450,7 @@ ifeq ($(uname_S),OpenBSD)
+@@ -447,9 +440,7 @@ ifeq ($(uname_S),OpenBSD)
  	BASIC_LDFLAGS += -L/usr/local/lib
  endif
  ifeq ($(uname_S),NetBSD)
@@ -54,8 +56,8 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  	BASIC_CFLAGS += -I/usr/pkg/include
  	BASIC_LDFLAGS += -L/usr/pkg/lib
  	ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
-@@ -711,7 +702,7 @@ PERL_PATH_SQ = $(subst ','\'',$(PERL_PAT
- PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
+@@ -710,7 +701,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_P
+ PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
  TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
  
 -LIBS = $(GITLIBS) $(EXTLIBS)
@@ -63,7 +65,7 @@ AR, CC, CFLAGS, LDFLAGS and LIBS should be taken from the environment.
  
  BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
  	-DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $(COMPAT_CFLAGS)
-@@ -997,14 +988,14 @@ check: common-cmds.h
+@@ -986,14 +977,14 @@ remove-dashes:
  ### Installation rules
  
  install: all
diff --git a/devel/scmgit/patches/patch-ab b/devel/scmgit/patches/patch-ab
index 4ef9702ff06..0c6792a3db1 100644
--- a/devel/scmgit/patches/patch-ab
+++ b/devel/scmgit/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2007/04/15 21:46:41 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2007/09/11 09:23:55 bjs Exp $
 
---- git-compat-util.h.orig	2007-04-12 01:41:44.000000000 +0000
+--- git-compat-util.h.orig	2007-09-02 01:57:44.000000000 -0400
 +++ git-compat-util.h
 @@ -6,6 +6,8 @@
  #ifndef FLEX_ARRAY
diff --git a/devel/scmgit/patches/patch-ac b/devel/scmgit/patches/patch-ac
index 8e7a72d8b43..aa6fa46e294 100644
--- a/devel/scmgit/patches/patch-ac
+++ b/devel/scmgit/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2007/01/22 14:33:31 rillig Exp $
+$NetBSD: patch-ac,v 1.2 2007/09/11 09:23:55 bjs Exp $
 
---- cache.h.orig	2006-11-23 03:38:07.000000000 +0100
-+++ cache.h	2007-01-20 03:01:16.958825320 +0100
+--- cache.h.orig	2007-09-02 01:57:44.000000000 -0400
++++ cache.h
 @@ -6,7 +6,7 @@
  #include SHA1_HEADER
  #include <zlib.h>
diff --git a/devel/scmgit/patches/patch-ae b/devel/scmgit/patches/patch-ae
index 3491c823818..9b316e7d0e3 100644
--- a/devel/scmgit/patches/patch-ae
+++ b/devel/scmgit/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.3 2007/04/15 21:46:41 wiz Exp $
+$NetBSD: patch-ae,v 1.4 2007/09/11 09:23:55 bjs Exp $
 
 In pkgsrc, all Perl modules are installed into vendor_perl, not
 site_perl.
 
---- perl/Makefile.orig	2007-04-12 01:41:44.000000000 +0000
+--- perl/Makefile.orig	2007-09-02 01:57:44.000000000 -0400
 +++ perl/Makefile
 @@ -11,7 +11,7 @@ ifndef V
  endif
diff --git a/devel/scmgit/patches/patch-af b/devel/scmgit/patches/patch-af
index 55df8a4aadc..d66006ec3be 100644
--- a/devel/scmgit/patches/patch-af
+++ b/devel/scmgit/patches/patch-af
@@ -1,9 +1,9 @@
-$NetBSD: patch-af,v 1.2 2007/07/08 20:19:58 wiz Exp $
+$NetBSD: patch-af,v 1.3 2007/09/11 09:23:55 bjs Exp $
 
---- Documentation/Makefile.orig	2007-07-02 08:11:39.000000000 +0000
+--- Documentation/Makefile.orig	2007-09-02 01:57:44.000000000 -0400
 +++ Documentation/Makefile
-@@ -67,12 +67,12 @@ man5: $(DOC_MAN5)
- man7: $(DOC_MAN7)
+@@ -75,16 +75,16 @@ man7: $(DOC_MAN7)
+ info: git.info
  
  install: man
 -	$(INSTALL) -d -m755 $(DESTDIR)$(man1dir)
@@ -19,5 +19,11 @@ $NetBSD: patch-af,v 1.2 2007/07/08 20:19:58 wiz Exp $
 +	$(BSD_INSTALL_MAN) $(DOC_MAN5) $(DESTDIR)$(man5dir)
 +	$(BSD_INSTALL_MAN) $(DOC_MAN7) $(DESTDIR)$(man7dir)
  
- 
- ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
+ install-info: info
+-	$(INSTALL) -d -m755 $(DESTDIR)$(infodir)
+-	$(INSTALL) -m644 git.info $(DESTDIR)$(infodir)
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(infodir)
++	$(BSD_INSTALL_DATA) git.info $(DESTDIR)$(infodir)
+ 	if test -r $(DESTDIR)$(infodir)/dir; then \
+ 	  $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\
+ 	else \
diff --git a/devel/scmgit/patches/patch-ag b/devel/scmgit/patches/patch-ag
index cf9d1620f35..0d77446ea8a 100644
--- a/devel/scmgit/patches/patch-ag
+++ b/devel/scmgit/patches/patch-ag
@@ -1,9 +1,9 @@
-$NetBSD: patch-ag,v 1.1 2007/04/26 01:23:49 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.2 2007/09/11 09:23:55 bjs Exp $
 
---- templates/Makefile.orig	2007-03-05 02:15:33.000000000 +0000
+--- templates/Makefile.orig	2007-09-02 01:57:44.000000000 -0400
 +++ templates/Makefile
-@@ -41,6 +41,6 @@ clean:
- 	rm -rf blt boilerplates.made
+@@ -46,6 +46,6 @@ clean:
+ 	$(RM) -r blt boilerplates.made
  
  install: all
 -	$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(template_dir_SQ)'
diff --git a/devel/scmgit/patches/patch-ah b/devel/scmgit/patches/patch-ah
index f169160bd50..f620b737bf6 100644
--- a/devel/scmgit/patches/patch-ah
+++ b/devel/scmgit/patches/patch-ah
@@ -1,15 +1,34 @@
-$NetBSD: patch-ah,v 1.2 2007/07/08 20:19:58 wiz Exp $
+$NetBSD: patch-ah,v 1.3 2007/09/11 09:23:55 bjs Exp $
 
---- git-gui/Makefile.orig	2007-07-02 08:11:39.000000000 +0000
+--- git-gui/Makefile.orig	2007-09-02 01:57:44.000000000 -0400
 +++ git-gui/Makefile
-@@ -115,8 +115,8 @@ GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
- all:: $(ALL_PROGRAMS) lib/tclIndex
+@@ -31,11 +31,11 @@ ifndef INSTALL
+ 	INSTALL = install
+ endif
  
- install: all
--	$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
--	$(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)'
-+	$(BSD_INSTALL_PROGRAM_DIR) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
-+	$(BSD_INSTALL_SCRIPT) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)'
- 	$(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
- 	$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(libdir_SQ)'
- 	$(INSTALL) -m644 lib/tclIndex '$(DESTDIR_SQ)$(libdir_SQ)'
+-INSTALL_D0 = $(INSTALL) -d -m755 # 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_R1 =
+-INSTALL_X0 = $(INSTALL) -m755 # 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
+ 	QUIET_2DEVNULL = 2>/dev/null
+ 
+ 	INSTALL_D0 = dir=
+-	INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m755 "$$dir"
++	INSTALL_D1 = && echo ' ' DEST $$dir && $(BSD_INSTALL_DATA_DIR) "$$dir"
+ 	INSTALL_R0 = src=
+-	INSTALL_R1 = && echo '   ' INSTALL 644 `basename $$src` && $(INSTALL) -m644 $$src
++	INSTALL_R1 = && echo '   ' INSTALL 644 `basename $$src` && $(BSD_INSTALL_DATA) $$src
+ 	INSTALL_X0 = src=
+-	INSTALL_X1 = && echo '   ' INSTALL 755 `basename $$src` && $(INSTALL) -m755 $$src
++	INSTALL_X1 = && echo '   ' INSTALL 755 `basename $$src` && $(BSD_INSTALL_SCRIPT) $$src
+ 
+ 	INSTALL_L0 = dst=
+ 	INSTALL_L1 = && src=