From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 May 2009 20:39:07 +0200 Subject: optimize ipkg package management - generate ipkg control file from PKG_* variables - automatically install init scripts from ./files/*.init set #PKG pkgname to set the binary package - rename FWINIT -> INIT - move postinst and conffiles meta data to ./files - update the packages to the latest upstream version - remove some unready or unused package (strongswan,..) more cleanups needed after allmodconfig --- package/php/Makefile | 43 ++++++++++++++++++-------------- package/php/files/php-cgi.conffiles | 1 + package/php/files/php-cli.conffiles | 1 + package/php/files/php-fastcgi.conffiles | 1 + package/php/files/php-fastcgi.postinst | 4 +++ package/php/files/php.init | 4 ++- package/php/ipkg/php-cgi.conffiles | 1 - package/php/ipkg/php-cgi.control | 6 ----- package/php/ipkg/php-cli.conffiles | 1 - package/php/ipkg/php-cli.control | 6 ----- package/php/ipkg/php-fastcgi.conffiles | 1 - package/php/ipkg/php-fastcgi.control | 6 ----- package/php/ipkg/php-fastcgi.postinst | 4 --- package/php/ipkg/php-mod-curl.control | 5 ---- package/php/ipkg/php-mod-ftp.control | 5 ---- package/php/ipkg/php-mod-gd.control | 5 ---- package/php/ipkg/php-mod-gmp.control | 5 ---- package/php/ipkg/php-mod-ldap.control | 5 ---- package/php/ipkg/php-mod-mysql.control | 5 ---- package/php/ipkg/php-mod-openssl.control | 5 ---- package/php/ipkg/php-mod-pcre.control | 5 ---- package/php/ipkg/php-mod-pgsql.control | 5 ---- package/php/ipkg/php-mod-session.control | 5 ---- package/php/ipkg/php-mod-sockets.control | 5 ---- package/php/ipkg/php-mod-sqlite.control | 5 ---- package/php/ipkg/php-mod-xml.control | 5 ---- 26 files changed, 34 insertions(+), 110 deletions(-) create mode 100644 package/php/files/php-cgi.conffiles create mode 100644 package/php/files/php-cli.conffiles create mode 100644 package/php/files/php-fastcgi.conffiles create mode 100644 package/php/files/php-fastcgi.postinst delete mode 100644 package/php/ipkg/php-cgi.conffiles delete mode 100644 package/php/ipkg/php-cgi.control delete mode 100644 package/php/ipkg/php-cli.conffiles delete mode 100644 package/php/ipkg/php-cli.control delete mode 100644 package/php/ipkg/php-fastcgi.conffiles delete mode 100644 package/php/ipkg/php-fastcgi.control delete mode 100644 package/php/ipkg/php-fastcgi.postinst delete mode 100644 package/php/ipkg/php-mod-curl.control delete mode 100644 package/php/ipkg/php-mod-ftp.control delete mode 100644 package/php/ipkg/php-mod-gd.control delete mode 100644 package/php/ipkg/php-mod-gmp.control delete mode 100644 package/php/ipkg/php-mod-ldap.control delete mode 100644 package/php/ipkg/php-mod-mysql.control delete mode 100644 package/php/ipkg/php-mod-openssl.control delete mode 100644 package/php/ipkg/php-mod-pcre.control delete mode 100644 package/php/ipkg/php-mod-pgsql.control delete mode 100644 package/php/ipkg/php-mod-session.control delete mode 100644 package/php/ipkg/php-mod-sockets.control delete mode 100644 package/php/ipkg/php-mod-sqlite.control delete mode 100644 package/php/ipkg/php-mod-xml.control (limited to 'package/php') 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/files/php-cgi.conffiles b/package/php/files/php-cgi.conffiles new file mode 100644 index 000000000..f1b6b5fc9 --- /dev/null +++ b/package/php/files/php-cgi.conffiles @@ -0,0 +1 @@ +/etc/php.ini diff --git a/package/php/files/php-cli.conffiles b/package/php/files/php-cli.conffiles new file mode 100644 index 000000000..f1b6b5fc9 --- /dev/null +++ b/package/php/files/php-cli.conffiles @@ -0,0 +1 @@ +/etc/php.ini diff --git a/package/php/files/php-fastcgi.conffiles b/package/php/files/php-fastcgi.conffiles new file mode 100644 index 000000000..f1b6b5fc9 --- /dev/null +++ b/package/php/files/php-fastcgi.conffiles @@ -0,0 +1 @@ +/etc/php.ini diff --git a/package/php/files/php-fastcgi.postinst b/package/php/files/php-fastcgi.postinst new file mode 100644 index 000000000..4497d75d1 --- /dev/null +++ b/package/php/files/php-fastcgi.postinst @@ -0,0 +1,4 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf php php NO +add_rcconf php_flags php_flags "-b 1026" 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.conffiles b/package/php/ipkg/php-cgi.conffiles deleted file mode 100644 index f1b6b5fc9..000000000 --- a/package/php/ipkg/php-cgi.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/php.ini 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.conffiles b/package/php/ipkg/php-cli.conffiles deleted file mode 100644 index f1b6b5fc9..000000000 --- a/package/php/ipkg/php-cli.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/php.ini 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.conffiles b/package/php/ipkg/php-fastcgi.conffiles deleted file mode 100644 index f1b6b5fc9..000000000 --- a/package/php/ipkg/php-fastcgi.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/php.ini 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-fastcgi.postinst b/package/php/ipkg/php-fastcgi.postinst deleted file mode 100644 index 4497d75d1..000000000 --- a/package/php/ipkg/php-fastcgi.postinst +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf php php NO -add_rcconf php_flags php_flags "-b 1026" 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 -- cgit v1.2.3