X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Flighttpd%2FMakefile;h=468801af5af3b96392a2897010dfc3f103a61ae0;hp=1c74d78fbde833d09cc615459ac2782a1f88c056;hb=d195c514f6cbd13f84b15ccbf31d71d22aa7e078;hpb=28dcd092353c8a0670881f3c2f378cd65b9d3f9b

diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile
index 1c74d78fbd..468801af5a 100644
--- a/net/lighttpd/Makefile
+++ b/net/lighttpd/Makefile
@@ -9,13 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lighttpd
-PKG_VERSION:=1.4.11
+PKG_VERSION:=1.4.13
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.lighttpd.net/download/
-PKG_MD5SUM:=f55eebb9815c94a7de35906bb557ecd3
+PKG_MD5SUM:=d775d6478391b95d841a1018c8db0b95
 PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -26,7 +26,7 @@ define Package/lighttpd
   MENU:=1
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libopenssl +libpcre +libpthread
+  DEPENDS:=+libopenssl +libpcre +libpthread +libsqlite3 +libxml2
   TITLE:=A flexible and lightweight web server
   URL:=http://www.lighttpd.net/
 endef
@@ -188,23 +188,23 @@ define Build/Compile
 endef
 
 define Package/lighttpd/install
-	install -m0755 -d $(1)/etc
-	install -m0644 ./files/lighttpd.conf $(1)/etc/
-	install -m0755 -d $(1)/etc/default
-	install -m0644 ./files/lighttpd.default $(1)/etc/default/lighttpd
-	install -m0755 -d $(1)/etc/init.d
-	install -m0755 ./files/lighttpd.init $(1)/etc/init.d/lighttpd
-	install -m0755 -d $(1)/usr/lib/lighttpd
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DATA) ./files/lighttpd.conf $(1)/etc/
+	$(INSTALL_DIR) $(1)/etc/default
+	$(INSTALL_DATA) ./files/lighttpd.default $(1)/etc/default/lighttpd
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/lighttpd.init $(1)/etc/init.d/lighttpd
+	$(INSTALL_DIR) $(1)/usr/lib/lighttpd
 	for m in dirlisting indexfile staticfile; do \
 		$(CP) $(PKG_INSTALL_DIR)/usr/lib/lighttpd/mod_$$$${m}.so $(1)/usr/lib/lighttpd/ ; \
 	done
-	install -m0755 -d $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/lighttpd $(1)/usr/sbin/
 endef
 
 define BuildPlugin
   define Package/$(1)/install
-	[ -z "$(2)" ] || install -d -m0755 $$(1)/usr/lib/lighttpd
+	[ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/lighttpd
 	for m in $(2); do \
 		$(CP) $(PKG_INSTALL_DIR)/usr/lib/lighttpd/mod_$$$$$$$${m}.so $$(1)/usr/lib/lighttpd/ ; \
 	done