summaryrefslogtreecommitdiff
path: root/package/dansguardian
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-24 12:02:33 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-24 12:02:33 +0100
commitb3259201a158cb1a571c2a3b2976fbd7b95a4b80 (patch)
treed1bf8edcf012880df29e52bf326b96c18c624dab /package/dansguardian
parent0c0ed379d9f34a2d085d9ebf7accf63d48684439 (diff)
parent537a2c4eaa446e52c6ba07007eb9ae75998b5580 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/dansguardian')
-rw-r--r--package/dansguardian/Config.in27
-rw-r--r--package/dansguardian/Makefile10
2 files changed, 3 insertions, 34 deletions
diff --git a/package/dansguardian/Config.in b/package/dansguardian/Config.in
deleted file mode 100644
index 2bffe7da6..000000000
--- a/package/dansguardian/Config.in
+++ /dev/null
@@ -1,27 +0,0 @@
-config ADK_PACKAGE_DANSGUARDIAN
- prompt "dansguardian...................... web content filter proxy"
- tristate
- select ADK_PACKAGE_LIBPCRE
- select ADK_PACKAGE_ZLIB
- default n
- help
- http://dansguardian.org
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_DANSGUARDIAN
-default ADK_COMPILE_DANSGUARDIAN_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_DANSGUARDIAN_WITH_STDCXX
- bool "Standard C++ library"
- select ADK_PACKAGE_LIBSTDCXX
- help
-
-config ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX
- bool "Embedded uClibc++ library"
- select ADK_PACKAGE_UCLIBCXX
- help
-
-endchoice
-
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
index 2a21584c5..7a96bda40 100644
--- a/package/dansguardian/Makefile
+++ b/package/dansguardian/Makefile
@@ -6,19 +6,15 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= dansguardian
PKG_VERSION:= 2.10.1.1
PKG_RELEASE:= 1
+PKG_BUILDDEP+= pcre zlib
+PKG_CXX:= DANSGUARDIAN
PKG_MD5SUM:= 0987a1c9bfbdf398118386f10279611a
PKG_DESCR:= web content filter proxy
PKG_SECTION:= net
-PKG_DEPENDS:= libpcre zlib
+PKG_DEPENDS:= pcre zlib
PKG_URL:= http://dansguardian.org
PKG_SITES:= http://dansguardian.org/downloads/2/Stable/
-ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y)
-PKG_DEPENDS+= uclibc++
-else
-PKG_DEPENDS+= libstdcxx
-endif
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,DANSGUARDIAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))