From 51587fc1590d05b7e85023d5e90bbd3a1d909223 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 4 Jan 2010 13:07:01 +0100 Subject: rename pcre package -> libpcre, fix nmap build dependency --- package/dansguardian/Makefile | 6 +++--- package/lighttpd/Makefile | 2 +- package/nmap/Makefile | 4 ++-- package/pcre/Makefile | 2 +- package/snort/Makefile | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile index 7a96bda40..62e23fc53 100644 --- a/package/dansguardian/Makefile +++ b/package/dansguardian/Makefile @@ -6,12 +6,12 @@ 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:= pcre zlib +PKG_CXX:= DANSGUARDIAN +PKG_DEPENDS:= libpcre zlib +PKG_BUILDDEP+= pcre zlib PKG_URL:= http://dansguardian.org PKG_SITES:= http://dansguardian.org/downloads/2/Stable/ diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index 648d6cfd8..8a3e584c6 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 87e936ec272ddaba8a2fdfecd8c6b704 PKG_DESCR:= a flexible and lightweight web server PKG_SECTION:= net -PKG_DEPENDS:= libxml2 libsqlite pcre +PKG_DEPENDS:= libxml2 libsqlite libpcre PKG_BUILDDEP+= pcre libxml2 sqlite ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y) PKG_DEPENDS+= libopenssl diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 587ad980f..6e314970d 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -6,12 +6,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nmap PKG_VERSION:= 5.00 PKG_RELEASE:= 1 -PKG_BUILDDEP+= pcre libpcap PKG_CXX:= NMAP PKG_MD5SUM:= 32d27de32166c02d670bb4a086185886 PKG_DESCR:= utility for network exploration or security auditing PKG_SECTION:= net -PKG_DEPENDS:= libdnet libpcap pcre +PKG_DEPENDS:= libdnet libpcap libpcre +PKG_BUILDDEP+= libdnet libpcap pcre PKG_URL:= http://nmap.org PKG_SITES:= http://download.insecure.org/nmap/dist/ diff --git a/package/pcre/Makefile b/package/pcre/Makefile index 22d510c6a..e36c6a5d6 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -14,7 +14,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pcre/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBPCRE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-cpp diff --git a/package/snort/Makefile b/package/snort/Makefile index cc38c43cc..64dab93e8 100644 --- a/package/snort/Makefile +++ b/package/snort/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= b1abf3a9fa3486720c9a2b5eff920417 PKG_DESCR:= a flexible Network Intrusion Detection System (NIDS) PKG_SECTION:= net PKG_NOPARALLEL:= 1 -PKG_DEPENDS:= libnet libpcap pcre +PKG_DEPENDS:= libnet libpcap libpcre PKG_BUILDDEP+= libnet libpcap pcre PKG_URL:= http://www.snort.org/ PKG_SITES:= http://dl.snort.org/snort-current/ -- cgit v1.2.3