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

resolve conflicts

Conflicts:

	mk/pkg-bottom.mk
	package/ctorrent/Makefile
	package/gcc/Makefile
	package/gmp/Makefile
	package/id3lib/Makefile
	package/libelf/Makefile
	package/libnl/patches/patch-include_netlink-local_h
	package/mpd/Makefile
	package/nmap/Makefile
	package/rrs/Makefile
	package/weechat/Makefile
	scripts/rstrip.sh
	target/Config.in

22 files changed, 27 insertions, 103 deletions

diff --git a/package/php/Makefile b/package/php/Makefile
index 21bc36c86..6e3ded395 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -9,12 +9,20 @@ PKG_NAME:=		php
 PKG_VERSION:=		5.2.9
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		98b647561dc664adefe296106056cf11
-MASTER_SITES:=		http://de.php.net/distributions/
+PKG_DESCR:=		PHP cli
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libopenssl zlib
+PHP_URL:=		http://www.php.net
+PKG_SITES:=		http://de.php.net/distributions/
+
+PKG_DESCR_1:=		PHP for FastCGI usage
+
+# FIX PKG_DEPENDS
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,PHP_CLI,php-cli,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,PHP_FASTCGI,php-fastcgi,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,PHP_CLI,php-cli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PHP_FASTCGI,php-fastcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
 
 define PKG_mod_template
 
@@ -118,19 +126,19 @@ else
 PKG_CONFIGURE_OPTS+=	--disable-xml
 endif
 
-$(eval $(call PKG_template,PHP_MOD_CURL,php-mod-curl,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,PHP_MOD_FTP,php-mod-ftp,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,PHP_MOD_GD,php-mod-gd,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,PHP_MOD_GMP,php-mod-gmp,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,PHP_MOD_LDAP,php-mod-ldap,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,PHP_MOD_MYSQL,php-mod-mysql,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,PHP_MOD_OPENSSL,php-mod-openssl,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,PHP_MOD_PCRE,php-mod-pcre,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,PHP_MOD_PGSQL,php-mod-pgsql,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,PHP_MOD_SESSION,php-mod-session,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,PHP_MOD_SOCKETS,php-mod-sockets,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,PHP_MOD_SQLITE,php-mod-sqlite,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,PHP_MOD_XML,php-mod-xml,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,PHP_MOD_CURL,php-mod-curl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PHP_MOD_FTP,php-mod-ftp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PHP_MOD_GD,php-mod-gd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PHP_MOD_GMP,php-mod-gmp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PHP_MOD_LDAP,php-mod-ldap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PHP_MOD_MYSQL,php-mod-mysql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PHP_MOD_OPENSSL,php-mod-openssl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PHP_MOD_PCRE,php-mod-pcre,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PHP_MOD_PGSQL,php-mod-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PHP_MOD_SESSION,php-mod-session,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PHP_MOD_SOCKETS,php-mod-sockets,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PHP_MOD_SQLITE,php-mod-sqlite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PHP_MOD_XML,php-mod-xml,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 $(eval $(call PKG_mod_template,PHP_MOD_CURL,curl))
 $(eval $(call PKG_mod_template,PHP_MOD_FTP,ftp))
@@ -158,9 +166,6 @@ do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 	${INSTALL_BIN} $(WRKBUILD)/sapi/cli/php $(IDIR_PHP_CLI)/usr/bin/php
 	${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/etc
 	${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_FASTCGI)/etc/
-	${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/etc/init.d
-	${INSTALL_BIN} ./files/php.init \
-		$(IDIR_PHP_FASTCGI)/etc/init.d/php
 	${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/usr/sbin
 	${INSTALL_BIN} $(WRKBUILD)/sapi/cgi/php-cgi $(IDIR_PHP_FASTCGI)/usr/sbin/php
 
diff --git a/package/php/ipkg/php-cgi.conffiles b/package/php/files/php-cgi.conffiles
index f1b6b5fc9..f1b6b5fc9 100644
--- a/package/php/ipkg/php-cgi.conffiles
+++ b/package/php/files/php-cgi.conffiles
diff --git a/package/php/ipkg/php-cli.conffiles b/package/php/files/php-cli.conffiles
index f1b6b5fc9..f1b6b5fc9 100644
--- a/package/php/ipkg/php-cli.conffiles
+++ b/package/php/files/php-cli.conffiles
diff --git a/package/php/ipkg/php-fastcgi.conffiles b/package/php/files/php-fastcgi.conffiles
index f1b6b5fc9..f1b6b5fc9 100644
--- a/package/php/ipkg/php-fastcgi.conffiles
+++ b/package/php/files/php-fastcgi.conffiles
diff --git a/package/php/ipkg/php-fastcgi.postinst b/package/php/files/php-fastcgi.postinst
index 4497d75d1..4497d75d1 100644
--- a/package/php/ipkg/php-fastcgi.postinst
+++ b/package/php/files/php-fastcgi.postinst
diff --git a/package/php/files/php.init b/package/php/files/php.init
index c48ae227d..63a91d4c7 100644
--- a/package/php/files/php.init
+++ b/package/php/files/php.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 80
+#PKG php-fastcgi
+#INIT 80
+
 . /etc/rc.conf
 
 export PHP_FCGI_CHILDREN=''
diff --git a/package/php/ipkg/php-cgi.control b/package/php/ipkg/php-cgi.control
deleted file mode 100644
index b80794a65..000000000
--- a/package/php/ipkg/php-cgi.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: php-cgi
-Priority: optional
-Section: net
-Provides: php
-Depends: libopenssl, zlib
-Description: PHP5 compiled as for CGI
diff --git a/package/php/ipkg/php-cli.control b/package/php/ipkg/php-cli.control
deleted file mode 100644
index 6b0889836..000000000
--- a/package/php/ipkg/php-cli.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: php-cli
-Priority: optional
-Section: net
-Provides: php
-Depends: libopenssl, zlib
-Description: PHP5 CLI (Command Line Interface)
diff --git a/package/php/ipkg/php-fastcgi.control b/package/php/ipkg/php-fastcgi.control
deleted file mode 100644
index 9a95cedf0..000000000
--- a/package/php/ipkg/php-fastcgi.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: php-fastcgi
-Priority: optional
-Section: net
-Provides: php
-Depends: libopenssl, zlib
-Description: PHP5 compiled for FastCGI (for use with libhttpd-fastcgi)
diff --git a/package/php/ipkg/php-mod-curl.control b/package/php/ipkg/php-mod-curl.control
deleted file mode 100644
index 4ca5f42a2..000000000
--- a/package/php/ipkg/php-mod-curl.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: php-mod-curl
-Priority: optional
-Section: net
-Depends: php, libcurl
-Description: cURL module for PHP5
diff --git a/package/php/ipkg/php-mod-ftp.control b/package/php/ipkg/php-mod-ftp.control
deleted file mode 100644
index a8dd0b3fd..000000000
--- a/package/php/ipkg/php-mod-ftp.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: php-mod-ftp
-Priority: optional
-Section: net
-Depends: php
-Description: FTP module for PHP5
diff --git a/package/php/ipkg/php-mod-gd.control b/package/php/ipkg/php-mod-gd.control
deleted file mode 100644
index 2cf37cb03..000000000
--- a/package/php/ipkg/php-mod-gd.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: php-mod-gd
-Priority: optional
-Section: net
-Depends: php, libgd, libpng
-Description: GD module for PHP5
diff --git a/package/php/ipkg/php-mod-gmp.control b/package/php/ipkg/php-mod-gmp.control
deleted file mode 100644
index aa54fbb89..000000000
--- a/package/php/ipkg/php-mod-gmp.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: php-mod-gmp
-Priority: optional
-Section: net
-Depends: php, libgmp
-Description: GMP (GNU MP) module for PHP5
diff --git a/package/php/ipkg/php-mod-ldap.control b/package/php/ipkg/php-mod-ldap.control
deleted file mode 100644
index 19f8431cf..000000000
--- a/package/php/ipkg/php-mod-ldap.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: php-mod-ldap
-Priority: optional
-Section: net
-Depends: php, libopenldap
-Description: LDAP module for PHP5
diff --git a/package/php/ipkg/php-mod-mysql.control b/package/php/ipkg/php-mod-mysql.control
deleted file mode 100644
index 91803e7d5..000000000
--- a/package/php/ipkg/php-mod-mysql.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: php-mod-mysql
-Priority: optional
-Section: net
-Depends: php, libmysqlclient
-Description: MySQL module for PHP5
diff --git a/package/php/ipkg/php-mod-openssl.control b/package/php/ipkg/php-mod-openssl.control
deleted file mode 100644
index eeb9283e6..000000000
--- a/package/php/ipkg/php-mod-openssl.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: php-mod-openssl
-Priority: optional
-Section: net
-Depends: php, libopenssl
-Description: OpenSSL module for PHP5
diff --git a/package/php/ipkg/php-mod-pcre.control b/package/php/ipkg/php-mod-pcre.control
deleted file mode 100644
index 5effe2f94..000000000
--- a/package/php/ipkg/php-mod-pcre.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: php-mod-pcre
-Priority: optional
-Section: net
-Depends: php, libpcre
-Description: PCRE module for PHP5
diff --git a/package/php/ipkg/php-mod-pgsql.control b/package/php/ipkg/php-mod-pgsql.control
deleted file mode 100644
index c55da6966..000000000
--- a/package/php/ipkg/php-mod-pgsql.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: php-mod-pgsql
-Priority: optional
-Section: net
-Depends: php, libpq
-Description: PostgreSQL module for PHP5
diff --git a/package/php/ipkg/php-mod-session.control b/package/php/ipkg/php-mod-session.control
deleted file mode 100644
index accbf97aa..000000000
--- a/package/php/ipkg/php-mod-session.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: php-mod-session
-Priority: optional
-Section: net
-Depends: php
-Description: Sessions module for PHP5
diff --git a/package/php/ipkg/php-mod-sockets.control b/package/php/ipkg/php-mod-sockets.control
deleted file mode 100644
index b93a85657..000000000
--- a/package/php/ipkg/php-mod-sockets.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: php-mod-sockets
-Priority: optional
-Section: net
-Depends: php
-Description: Sockets module for PHP5
diff --git a/package/php/ipkg/php-mod-sqlite.control b/package/php/ipkg/php-mod-sqlite.control
deleted file mode 100644
index 427e779f4..000000000
--- a/package/php/ipkg/php-mod-sqlite.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: php-mod-sqlite
-Priority: optional
-Section: net
-Depends: php, libsqlite
-Description: SQLite module for PHP5
diff --git a/package/php/ipkg/php-mod-xml.control b/package/php/ipkg/php-mod-xml.control
deleted file mode 100644
index ff25d7dd9..000000000
--- a/package/php/ipkg/php-mod-xml.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: php-mod-xml
-Priority: optional
-Section: net
-Depends: php, libexpat
-Description: XML module for PHP5