Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	BUGS
	package/autoconf/Makefile

3 files changed, 35 insertions, 30 deletions

diff --git a/package/git/Config.in b/package/git/Config.in
deleted file mode 100644
index c897385a7..000000000
--- a/package/git/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_GIT
-	prompt "git............................... fast version control system"
-	tristate
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBCURL
-	select ADK_PACKAGE_LIBEXPAT
-	select ADK_PACKAGE_LIBPTHREAD
-	default n
-	help
-	  Fast version control system.
diff --git a/package/git/Makefile b/package/git/Makefile
index db4082797..fb9f114a3 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -4,12 +4,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		git
-PKG_VERSION:=		1.6.4.2
+PKG_VERSION:=		1.7.0.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d7732d13a227d89f05122d230c5c8048
+PKG_MD5SUM:=		05485caf5c503ce378a87759bc3a0509
 PKG_DESCR:=		fast version control system
-PKG_SECTION:=		misc
-PKG_DEPENDS:=		openssl curl
+PKG_SECTION:=		scm
+PKG_DEPENDS:=		libopenssl libcurl libexpat libpthread
+PKG_BUILDDEP+=		openssl curl expat
 PKG_URL:=		http://git-scm.com
 PKG_SITES:=		http://kernel.org/pub/software/scm/git/
 
@@ -17,16 +18,16 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-DNO_NSEC -DNO_TCLTK -DNO_PERL
-CONFIGURE_STYLE:=	gnu
+MAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 \
+			NO_CROSS_DIRECTORY_HARDLINKS=1 \
+			CURLDIR=${STAGING_DIR} EXPATDIR=${STAGING_DIR}
+XAKE_FLAGS+=		uname_S=Linux uname_O=GNU/Linux
 CONFIGURE_ENV+=		ac_cv_c_c99_format=yes \
 			ac_cv_fread_reads_directories=no \
 			ac_cv_snprintf_returns_bogus=no
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
-	$(INSTALL_DIR) $(IDIR_GIT)/usr/bin $(IDIR_GIT)/usr/sbin/git-core
+	$(INSTALL_DIR) $(IDIR_GIT)/usr/bin $(IDIR_GIT)/usr/libexec/git-core
 	$(INSTALL_DIR) $(IDIR_GIT)/usr/share/git-core/templates
 	$(CP) $(WRKINST)/usr/share/git-core/templates/* \
 		$(IDIR_GIT)/usr/share/git-core/templates
@@ -35,6 +36,6 @@ post-install:
 	$(CP) $(WRKINST)/usr/bin/git-receive-pack $(IDIR_GIT)/usr/bin
 	$(CP) $(WRKINST)/usr/bin/git-upload-pack $(IDIR_GIT)/usr/bin
 	$(CP) $(WRKINST)/usr/bin/git-upload-archive $(IDIR_GIT)/usr/bin
-	${CP} $(WRKINST)/usr/sbin/git-core/* $(IDIR_GIT)/usr/sbin/git-core
+	${CP} $(WRKINST)/usr/libexec/git-core/* $(IDIR_GIT)/usr/libexec/git-core
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile
index c0e2e28ce..6f3b70e98 100644
--- a/package/git/patches/patch-Makefile
+++ b/package/git/patches/patch-Makefile
@@ -1,6 +1,26 @@
---- git-1.6.4.1.orig/Makefile	2009-08-22 06:54:01.000000000 +0200
-+++ git-1.6.4.1/Makefile	2009-08-23 12:11:07.755226105 +0200
-@@ -1345,7 +1345,6 @@ builtin-help.o: builtin-help.c common-cm
+--- git-1.6.5.5.orig/Makefile	2009-12-06 04:51:25.000000000 +0100
++++ git-1.6.5.5/Makefile	2009-12-07 20:13:40.753866786 +0100
+@@ -218,8 +218,8 @@ uname_V := $(shell sh -c 'uname -v 2>/de
+ 
+ # CFLAGS and LDFLAGS are for the users to override from the command line.
+ 
+-CFLAGS = -g -O2 -Wall
+-LDFLAGS =
++CFLAGS ?= -g -O2 -Wall
++LDFLAGS ?=
+ ALL_CFLAGS = $(CFLAGS)
+ ALL_LDFLAGS = $(LDFLAGS)
+ STRIP ?= strip
+@@ -241,7 +241,7 @@ bindir_relative = bin
+ bindir = $(prefix)/$(bindir_relative)
+ mandir = share/man
+ infodir = share/info
+-gitexecdir = libexec/git-core
++gitexecdir = sbin/git-core
+ sharedir = $(prefix)/share
+ template_dir = share/git-core/templates
+ htmldir = share/doc/git-doc
+@@ -1417,7 +1417,6 @@ builtin-help.o: builtin-help.c common-cm
  
  $(BUILT_INS): git$X
  	$(QUIET_BUILT_IN)$(RM) $@ && \
@@ -8,17 +28,11 @@
  	ln -s git$X $@ 2>/dev/null || \
  	cp git$X $@
  
-@@ -1663,11 +1662,11 @@ endif
- 	{ test "$$bindir/" = "$$execdir/" || \
- 		{ $(RM) "$$execdir/git$X" && \
- 		test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
--		ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
-+		ln -s "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
+@@ -1749,7 +1748,6 @@ endif
  		cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
  	{ for p in $(BUILT_INS); do \
  		$(RM) "$$execdir/$$p" && \
 -		ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
-+		ln -s "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
  		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
  		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
  	  done; } && \