some native build fixes

- git package needs a better fix. but existing symlinks are broken
  build without perl
- update curl to latest upstream, including libcurl-dev package
- add libopenssl-dev package

10 files changed, 84 insertions, 32 deletions

diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index afad521e2..684801617 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -88,7 +88,7 @@ endif
 	    ${BASH} ${TOPDIR}/scripts/update-patches); \
 	    if [[ -n $$toedit && $$toedit != FAIL ]]; then \
 		echo -n 'edit patches: '; read i; \
-		cd patches && $${VISUAL:-$${EDITOR:-/usr/bin/vi}} $$toedit; \
+		cd patches && $${VISUAL:-$${EDITOR:-vi}} $$toedit; \
 	    fi; \
 	    rm -rf ${WRKDIR}.orig; \
 	    [[ $$toedit != FAIL ]]
diff --git a/mk/package.mk b/mk/package.mk
index a9339b811..64884e4b4 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -7,17 +7,23 @@ ifeq ($(ADK_STATIC),y)
 TCFLAGS:=		${TARGET_CFLAGS} -static
 TCXXFLAGS:=		${TARGET_CFLAGS} -static
 TCPPFLAGS:=		${TARGET_CPPFLAGS} -static
+ifeq ($(ADK_NATIVE),y)
+TCFLAGS:=
+TCXXFLAGS:=
+TCPPFLAGS:=
+TLDFLAGS:=
 else
 TCFLAGS:=		${TARGET_CFLAGS}
 TCXXFLAGS:=		${TARGET_CFLAGS}
 TCPPFLAGS:=		${TARGET_CPPFLAGS}
+TLDFLAGS:=		${TARGET_LDFLAGS} -Wl,-rpath -Wl,/usr/lib \
+			-Wl,-rpath-link -Wl,${STAGING_DIR}/usr/lib \
+			-L${STAGING_DIR}/lib -L${STAGING_DIR}/usr/lib
+endif
 endif
 ifeq ($(ADK_DEBUG),)
 TCPPFLAGS+=		-DNDEBUG
 endif
-TLDFLAGS:=		${TARGET_LDFLAGS} -Wl,-rpath -Wl,/usr/lib \
-			-Wl,-rpath-link -Wl,${STAGING_DIR}/usr/lib \
-			-L${STAGING_DIR}/lib -L${STAGING_DIR}/usr/lib
 ifneq ($(ADK_DEBUG),)
 CONFIGURE_ARGS+=	--enable-debug
 else
@@ -30,7 +36,11 @@ CONFIGURE_ARGS+=	--disable-ipv6
 endif
 
 ifeq ($(ADK_NATIVE),y)
-			CONFIG_SHELL='$(strip ${SHELL})'
+CONFIGURE_ENV+=		CONFIG_SHELL='$(strip ${SHELL})' \
+			CFLAGS='$(strip ${TCFLAGS})' \
+			CXXFLAGS='$(strip ${TCXXFLAGS})' \
+			CPPFLAGS='$(strip ${TCPPFLAGS})' \
+			LDFLAGS='$(strip ${TLDFLAGS})'
 else
 CONFIGURE_ENV+=		${TARGET_CONFIGURE_OPTS} \
 			${HOST_CONFIGURE_OPTS} \
@@ -59,7 +69,11 @@ INSTALL_TARGET?=	install
 ifeq ($(ADK_NATIVE),y)
 MAKE_ENV+=		\
 			WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
-			WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}'
+			WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \
+			CFLAGS='$(strip ${TCFLAGS})' \
+			CXXFLAGS='$(strip ${TCXXFLAGS})' \
+			CPPFLAGS='$(strip ${TCPPFLAGS})' \
+			LDFLAGS='$(strip ${TLDFLAGS})'
 else
 MAKE_ENV+=		PATH='${TARGET_PATH}' \
 			${HOST_CONFIGURE_OPTS} \
diff --git a/package/Makefile b/package/Makefile
index c6c2d4114..401780da6 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -200,7 +200,9 @@ package-$(ADK_PACKAGE_LIBPCAP) += libpcap
 package-$(ADK_PACKAGE_LIBPCIACCESS) += libpciaccess
 package-$(ADK_PACKAGE_LIBPNG) += libpng
 package-$(ADK_PACKAGE_LIBPRI) += libpri
+ifeq (${ADK_NATIVE},n)
 package-$(ADK_PACKAGE_LIBPTHREAD) += libpthread
+endif
 package-$(ADK_COMPILE_LIBSHOUT) += libshout
 package-$(ADK_PACKAGE_LIBSIGCXX) += libsigc++
 package-$(ADK_PACKAGE_LIBSTDCXX) += libstdcxx
diff --git a/package/curl/Config.in b/package/curl/Config.in
index b5d42ea1f..c9d34b5c8 100644
--- a/package/curl/Config.in
+++ b/package/curl/Config.in
@@ -11,16 +11,24 @@ config ADK_PACKAGE_LIBCURL
 	select ADK_PACKAGE_LIBOPENSSL
 	select ADK_PACKAGE_ZLIB
 	help
-	  A client-side URL transfer library.
+	  http://curl.haxx.se/
 
+config ADK_PACKAGE_LIBCURL_DEV
+	prompt "libcurl-dev....................... development files for libcurl"
+	tristate
+	default n
+	depends on ADK_PACKAGE_LIBCURL
+	select ADK_COMPILE_CURL
+	select ADK_PACKAGE_LIBOPENSSL
+	select ADK_PACKAGE_ZLIB
+	help
 	  http://curl.haxx.se/
 
+
 config ADK_PACKAGE_CURL
 	prompt   "curl............................ A client-side URL transfer tool"
 	tristate
 	default n
 	depends on ADK_PACKAGE_LIBCURL
 	help
-	  A client-side URL transfer tool.
-
 	  http://curl.haxx.se/
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 078a940bf..a0e27d77c 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		curl
-PKG_VERSION:=		7.19.0
+PKG_VERSION:=		7.19.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		35f51ac7bcff689b2d2d6e38a3c4d1ae
+PKG_MD5SUM:=		6625de9d42d1b8d3af372d3241a576fd
 PKG_DESCR:=		a client-side URL transfer tool
 PKG_SECTION:=		net
 PKG_URL:=		http://curl.haxx.se
@@ -26,6 +26,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1}))
+$(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		curl_typeof_curl_socklen_t=socklen_t
@@ -54,7 +55,9 @@ INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_CURL}/usr/bin ${IDIR_LIBCURL}/usr/lib
+	${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl
 	${CP} ${WRKINST}/usr/bin/curl ${IDIR_CURL}/usr/bin/
 	${CP} ${WRKINST}/usr/lib/libcurl.so.* ${IDIR_LIBCURL}/usr/lib/
+	${CP} ${WRKINST}/usr/include/curl/*.h ${IDIR_LIBCURL_DEV}/usr/include/curl/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/curl/patches/patch-configure b/package/curl/patches/patch-configure
index d046721f0..3cb59e18e 100644
--- a/package/curl/patches/patch-configure
+++ b/package/curl/patches/patch-configure
@@ -1,21 +1,16 @@
-$Id$
-
-	Don't do *THAT* for cross-compiling.
-
---- curl-7.16.3.orig/configure	2007-06-25 11:18:41.000000000 +0200
-+++ curl-7.16.3/configure	2007-08-02 17:44:28.000000000 +0200
-@@ -25783,17 +25783,6 @@ fi
- 
+--- curl-7.19.6.orig/configure	2009-07-22 22:11:25.000000000 +0200
++++ curl-7.19.6/configure	2009-10-01 14:05:37.578930054 +0200
+@@ -25479,16 +25479,6 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    fi
--
+ 
 -  if test "$OPENSSL_ENABLED" = "1"; then
 -    if test -n "$LIB_OPENSSL"; then
 -
 -       LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"
 -       export LD_LIBRARY_PATH
--       { echo "$as_me:$LINENO: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5
--echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;}
+-       { $as_echo "$as_me:$LINENO: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5
+-$as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;}
 -    fi
 -  fi
 -
diff --git a/package/git/Makefile b/package/git/Makefile
index db4082797..e02c9e669 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		git
 PKG_VERSION:=		1.6.4.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		d7732d13a227d89f05122d230c5c8048
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		misc
@@ -17,7 +17,8 @@ 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
+MAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1
+XAKE_FLAGS+=		V=1
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_c_c99_format=yes \
 			ac_cv_fread_reads_directories=no \
diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile
index c0e2e28ce..172f4c882 100644
--- a/package/git/patches/patch-Makefile
+++ b/package/git/patches/patch-Makefile
@@ -1,24 +1,35 @@
---- 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.4.2.orig/Makefile	2009-08-29 23:58:52.000000000 +0200
++++ git-1.6.4.2/Makefile	2009-10-01 15:36:20.567802008 +0200
+@@ -212,8 +212,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
+@@ -1345,8 +1345,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 || \
+-	ln -s git$X $@ 2>/dev/null || \
  	cp git$X $@
  
-@@ -1663,11 +1662,11 @@ endif
+ common-cmds.h: ./generate-cmdlist.sh command-list.txt
+@@ -1663,12 +1661,9 @@ 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 || \
  		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 || \
+-		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
  		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
  	  done; } && \
+ 	./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index fa93afd82..5afcec4ed 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -19,10 +19,12 @@ PKG_SITES:=		http://www.openssl.org/source/ \
 PKG_DESCR_UTIL:=	OpenSSL (Secure Socket Layer) command line tool
 PKG_SECTION_UTIL:=	admin
 PKG_DEPENDS_UTIL:=	libopenssl
+PKG_DEPENDS_DEV:=	libopenssl
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBOPENSSL_DEV,libopenssl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_DEV},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_UTIL},${PKG_DESCR_UTIL},${PKG_SECTION_UTIL}))
 
 BUILD_STYLE:=		manual
@@ -67,5 +69,7 @@ post-install:
 	${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/etc/ssl/{,certs,private}
 	${CP} ${WRKSRC}/apps/openssl.cnf ${IDIR_OPENSSL_UTIL}/etc/ssl/
 	chmod 0700 ${IDIR_OPENSSL_UTIL}/etc/ssl/private
+	${INSTALL_DIR} ${IDIR_LIBOPENSSL_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBOPENSSL_DEV}/usr/include
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 69f2b1e3a..1faaeaeb8 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -23,6 +23,13 @@ out=0
 
 . $topdir/.config
 
+if [[ -n $ADK_NATIVE ]];then
+	if [[ -n $ADK_PACKAGE_GIT ]];then
+		NEED_CURLDEV="$NEED_CURLDEV git"
+		NEED_SSLDEV="$NEED_SSLDEV git"
+	fi
+fi
+
 if [[ -n $ADK_PACKAGE_ALSA_UTILS ]]; then
 	NEED_XMLTO="$NEED_XMLTO alsa-utils"
 fi
@@ -60,6 +67,13 @@ if [[ -n $NEED_GETTEXT ]]; then
 	fi
 fi
 
+if [[ -n $NEED_CURLDEV ]];then
+	if ! test -f /usr/include/curl/curl.h >/dev/null; then
+		echo >&2 You need curl headers to build $NEED_CURLDEV
+		out=1
+	fi
+fi
+
 if [[ -n $NEED_SSLDEV ]]; then
 	if ! test -f /usr/lib/pkgconfig/openssl.pc >/dev/null; then
 		if ! test -f /usr/include/openssl/ssl.h >/dev/null; then