[packages_10.03.1] collectd: backport r29404

[openwrt/svn-archive/archive.git] / net / dansguardian / Makefile

diff --git a/net/dansguardian/Makefile b/net/dansguardian/Makefile
index 4451d54d4a98532230c3b15e1930b58e55958310..59aadec1567c8560a6cbab9e7c1509edec93b34d 100644 (file)
--- a/net/dansguardian/Makefile
+++ b/net/dansguardian/Makefile
@@ -1,30 +1,29 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dansguardian
-PKG_VERSION:=2.9.9.2
+PKG_VERSION:=2.10.1.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://dansguardian.org/downloads/2/Beta
-PKG_MD5SUM:=
+PKG_SOURCE_URL:=http://dansguardian.org/downloads/2/Stable
+PKG_MD5SUM:=0987a1c9bfbdf398118386f10279611a
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dansguardian
   SECTION:=net
-  DEPENDS:=+libpthread +uclibcxx
+  DEPENDS:=+libpthread +uclibcxx +zlib
   CATEGORY:=Network
+  SUBMENU:=Web Servers/Proxies
   TITLE:=DansGuardian
   URL:=http://dansguardian.org
 endef
@@ -36,10 +35,9 @@ endef
 CONFIGURE_VARS += \
        INCLUDES="" \
        CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
-       CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/uClibc++" \
+       CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
        LDFLAGS="$$$$LDFLAGS" \
-       LIBS="-nodefaultlibs -luClibc++ -lpthread" \
-
+       LIBS="-nodefaultlibs -luClibc++ -lpthread $(LIBGCC_S)" \
 
 define Build/Configure
        $(call Build/Configure/Default,\
@@ -47,15 +45,10 @@ define Build/Configure
                --with-sysconfsubdir=dansguardian \
                --with-proxyuser=root \
                --with-proxygroup=root \
+               --disable-pcre \
        )
 endef
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
 define Package/dansguardian/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dansguardian $(1)/usr/sbin/