BitTorrent btpd 0.13 package
[openwrt/svn-archive/archive.git] / net / apache / Makefile
index 5045ba3..47dbcd0 100644 (file)
@@ -14,9 +14,9 @@ PKG_RELEASE:=2
 PKG_SOURCE_NAME:=httpd
 
 PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://ftp.uni-erlangen.de/pub/mirrors/apache/httpd/
+PKG_SOURCE_URL:=http://ftp.uni-erlangen.de/pub/mirrors/apache/httpd/ \
+               http://apache.imsam.info/httpd/
 PKG_MD5SUM:=d050a49bd7532ec21c6bb593b3473a5d
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -26,24 +26,32 @@ include $(INCLUDE_DIR)/package.mk
 define Package/apache/Default
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+apr +apr-util +zlib +libexpat +libpcre +libopenssl +libsqlite3
+  SUBMENU:=Web
   TITLE:=The Apache Web Server
   URL:=http://httpd.apache.org/
-  SUBMENU:=apache
+endef
+
+define Package/apache
+  $(call Package/apache/Default)
+  MENU=1
+  DEPENDS:=+libapr +libaprutil +zlib +libexpat +libpcre +libopenssl +libsqlite3
 endef
 
 define Package/apache-server
   $(call Package/apache/Default)
   TITLE:=The apache server & and some tools
-  DESCRIPTION:=\
-       Take care that you don't include apache at the moment into your image\\\
-       please select it only as module because busybox will override\\\
-       /usr/sbin/httpd. It'll be solved soon. If you need to include this\\\
-       package in the image anyway, remove httpd from busybox\\\
-       (Base system --> Configuration --> Networking Utilities --> httpd).\\\
-       Also you should take care for the initscripts, apache's httpd isn't\\\
-       compatible with the one from busybox, so if you want to use apache\\\
-       for running your webif, you'll need to change the parameters in the\\\
+  DEPENDS:=apache
+endef
+
+define Package/apache-server/description
+       Take care that you don't include apache at the moment into your image
+       please select it only as module because busybox will override
+       /usr/sbin/httpd. It'll be solved soon. If you need to include this
+       package in the image anyway, remove httpd from busybox
+       (Base system --> Configuration --> Networking Utilities --> httpd).
+       Also you should take care for the initscripts, apache's httpd isn't
+       compatible with the one from busybox, so if you want to use apache
+       for running your webif, you'll need to change the parameters in the
        scripts and configure the rest in /etc/httpd.conf.
 endef
 
@@ -67,14 +75,14 @@ endef
 define Package/apache-icons
   $(call Package/apache/Default)
   TITLE:=Icons from Apache
-  DEPENDS:=
+  DEPENDS:=apache
 endef
 
 define Build/Configure 
        $(call Build/Configure/Default, \
-               --with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
-               --with-apr-util="$(STAGING_DIR)/usr/bin/apu-1-config" \
-               --with-pcre="$(STAGING_DIR)/usr/bin/pcre-config" \
+               --with-apr="$(STAGING_DIR)/host/bin/apr-1-config" \
+               --with-apr-util="$(STAGING_DIR)/host/bin/apu-1-config" \
+               --with-pcre="$(STAGING_DIR)/host/bin/pcre-config" \
                --enable-http \
                --enable-ssl \
                --enable-proxy \
@@ -98,29 +106,21 @@ define Build/InstallDev
        rm -rf  $(PKG_INSTALL_DIR)/usr/man/ \
                $(PKG_INSTALL_DIR)/usr/share/manual/
        # if you need docs take a look into the build-dir :)
-       mkdir -p $(STAGING_DIR)/etc
+       mkdir -p $(1)/etc
        $(CP)   $(PKG_INSTALL_DIR)/etc/* \
-               $(STAGING_DIR)/etc
-       mkdir -p $(STAGING_DIR)/usr/include
+               $(1)/etc
+       mkdir -p $(1)/usr/include
        $(CP)   $(PKG_INSTALL_DIR)/usr/include/* \
-               $(STAGING_DIR)/usr/include
-       mkdir -p $(STAGING_DIR)/usr/lib
+               $(1)/usr/include
+       mkdir -p $(1)/usr/lib
        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/httpd.exp \
-               $(STAGING_DIR)/usr/lib
-       mkdir -p $(STAGING_DIR)/usr/sbin
+               $(1)/usr/lib
+       mkdir -p $(1)/usr/sbin
        $(CP)   $(PKG_INSTALL_DIR)/usr/sbin/* \
-               $(STAGING_DIR)/usr/sbin
-       mkdir -p $(STAGING_DIR)/usr/share
+               $(1)/usr/sbin
+       mkdir -p $(1)/usr/share
        $(CP)   $(PKG_INSTALL_DIR)/usr/share/* \
-               $(STAGING_DIR)/usr/share
-endef
-
-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/include/{ap_*,http*,mod_*,mpm*,os.h,scoreboard.h,unixd.h,util_*} \
-               $(STAGING_DIR)/etc/{httpd.conf,magic,mime.types,extra,original} \
-               $(STAGING_DIR)/usr/sbin/{ab,apachectl,apxs,checkgid,dbmmanage,envvars,envvars-std,htcacheclean,htdbm,htdigest,htpasswd,httpd,httxt2dbm,logresolve,rotatelogs} \
-               $(STAGING_DIR)/usr/share/{error,icons,htdocs,cgi-bin,build} \
-               $(STAGING_DIR)/usr/lib/httpd.exp
+               $(1)/usr/share
 endef
 
 define Package/apache-server/preinst
@@ -132,7 +132,7 @@ endef
 define Package/apache-server/install
        $(INSTALL_DIR) $(1)/usr/sbin
        # we don't need apxs on the router, it's just for building apache modules.  
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/{ab,apachectl,checkgid,dbmmanage,envvars,envvars-std,htcacheclean,htdbm,htdigest,htpasswd,httpd,httxt2dbm,logresolve,rotatelogs} $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{ab,apachectl,checkgid,dbmmanage,envvars,envvars-std,htcacheclean,htdbm,htdigest,htpasswd,httpd,httxt2dbm,logresolve,rotatelogs} $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/httpd.exp $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/share
@@ -154,5 +154,6 @@ define Package/apache-icons/install
        $(CP) $(PKG_INSTALL_DIR)/usr/share/icons $(1)/usr/share/
 endef
 
+$(eval $(call BuildPackage,apache))
 $(eval $(call BuildPackage,apache-server))
 $(eval $(call BuildPackage,apache-icons))