add git package

6 files changed, 81 insertions, 10 deletions

diff --git a/package/Config.in b/package/Config.in
index 96aeec3aa..eb1f5aa65 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -245,6 +245,7 @@ menu "Misc"
 source "package/cups/Config.in"
 source "package/fakeidentd/Config.in"
 source "package/gkrellmd/Config.in"
+source "package/git/Config.in"
 source "package/net-snmp/Config.in"
 source "package/nut/Config.in"
 source "package/openldap/Config.in"
diff --git a/package/Depends.mk b/package/Depends.mk
index 9a45f5823..ef792d9df 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -47,6 +47,7 @@ gatling-compile: libowfat-compile libiconv-compile
 gcc-compile: gmp-compile mpfr-compile
 gdb-compile: ncurses-compile readline-compile
 gettext-compile: libiconv-compile libpthread-compile
+git-compile: openssl-compile curl-compile expat-compile
 gkrellmd-compile: glib-compile
 glib-compile: gettext-compile libiconv-compile
 gmediaserver-compile: id3lib-compile libupnp-compile
@@ -245,22 +246,12 @@ apr-compile: libpthread-compile
 endif
 
 asterisk-compile: ncurses-compile openssl-compile zlib-compile curl-compile popt-compile
-ifneq ($(ADK_PACKAGE_ASTERISK_CHAN_BLUETOOTH),)
-asterisk-compile: bluez-compile
-endif
 ifneq ($(ADK_PACKAGE_ASTERISK_CODEC_SPEEX),)
 asterisk-compile: speex-compile
 endif
 ifneq ($(ADK_PACKAGE_ASTERISK_PGSQL),)
 asterisk-compile: postgresql-compile
 endif
-ifneq ($(ADK_PACKAGE_ASTERISK_MYSQL),)
-asterisk-compile: mysql-compile
-endif
-ifneq ($(ADK_PACKAGE_ASTERISK_SQLITE),)
-asterisk-compile: sqlite-compile
-endif
-
 
 freeradius-client-compile: openssl-compile
 freeradius-server-compile: libtool-compile openssl-compile
diff --git a/package/Makefile b/package/Makefile
index 68d6cc5f5..a51c4b42f 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -102,6 +102,7 @@ package-$(ADK_PACKAGE_GCC) += gcc
 package-$(ADK_PACKAGE_GDB) += gdb
 package-$(ADK_PACKAGE_GDBSERVER) += gdbserver
 package-$(ADK_PACKAGE_GETTEXT) += gettext
+package-$(ADK_PACKAGE_GIT) += git
 package-$(ADK_PACKAGE_GKRELLMD) += gkrellmd
 package-$(ADK_PACKAGE_GLIB) += glib
 ifeq (${ADK_TARGET_LIB_GLIBC},y)
diff --git a/package/git/Config.in b/package/git/Config.in
new file mode 100644
index 000000000..0ee3e3ea3
--- /dev/null
+++ b/package/git/Config.in
@@ -0,0 +1,9 @@
+config ADK_PACKAGE_GIT
+	prompt "git............................... fast version control system"
+	tristate
+	select ADK_PACKAGE_LIBOPENSSL
+	select ADK_PACKAGE_LIBCURL
+	select ADK_PACKAGE_LIBEXPAT
+	default n
+	help
+	  Fast version control system.
diff --git a/package/git/Makefile b/package/git/Makefile
new file mode 100644
index 000000000..9df88b92b
--- /dev/null
+++ b/package/git/Makefile
@@ -0,0 +1,37 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		git
+PKG_VERSION:=		1.6.3.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		a634d76881f3bd6b92cb1892ea5f88fe
+PKG_DESCR:=		fast version control system
+PKG_SECTION:=		misc
+PKG_DEPENDS:=		openssl curl
+PKG_URL:=		http://git-scm.com
+PKG_SITES:=		http://kernel.org/pub/software/scm/git/
+
+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
+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
+	$(CP) $(WRKINST)/usr/bin/git $(IDIR_GIT)/usr/bin
+	$(CP) $(WRKINST)/usr/bin/git-shell $(IDIR_GIT)/usr/bin
+	$(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
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile
new file mode 100644
index 000000000..46b1488e5
--- /dev/null
+++ b/package/git/patches/patch-Makefile
@@ -0,0 +1,32 @@
+use symlinks instead of hardlinks
+--- git-1.6.3.3.orig/Makefile	2009-06-22 08:24:25.000000000 +0200
++++ git-1.6.3.3/Makefile	2009-07-24 20:59:26.186421458 +0200
+@@ -215,7 +215,7 @@ bindir_relative = bin
+ bindir = $(prefix)/$(bindir_relative)
+ mandir = share/man
+ infodir = share/info
+-gitexecdir = libexec/git-core
++gitexecdir = bin
+ sharedir = $(prefix)/share
+ template_dir = share/git-core/templates
+ htmldir = share/doc/git-doc
+@@ -1239,7 +1239,6 @@ builtin-help.o: builtin-help.c common-cm
+ 
+ $(BUILT_INS): git$X
+ 	$(QUIET_BUILT_IN)$(RM) $@ && \
+-	ln git$X $@ 2>/dev/null || \
+ 	ln -s git$X $@ 2>/dev/null || \
+ 	cp git$X $@
+ 
+@@ -1554,11 +1553,9 @@ endif
+ 	execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
+ 	{ $(RM) "$$execdir/git-add$X" && \
+ 		test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
+-		ln "$$bindir/git$X" "$$execdir/git-add$X" 2>/dev/null || \
+ 		cp "$$bindir/git$X" "$$execdir/git-add$X"; } && \
+ 	{ for p in $(filter-out git-add$X,$(BUILT_INS)); do \
+ 		$(RM) "$$execdir/$$p" && \
+-		ln "$$execdir/git-add$X" "$$execdir/$$p" 2>/dev/null || \
+ 		ln -s "git-add$X" "$$execdir/$$p" 2>/dev/null || \
+ 		cp "$$execdir/git-add$X" "$$execdir/$$p" || exit; \
+ 	  done; } && \