2 files changed, 3 insertions, 36 deletions
diff --git a/package/nmap/Config.in b/package/nmap/Config.in
deleted file mode 100644
index 56a561ec7..000000000
--- a/package/nmap/Config.in
+++ /dev/null
@@ -1,29 +0,0 @@
-config ADK_PACKAGE_NMAP
-	prompt "nmap.............................. Network exploration and/or security auditing utility"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBDNET
-	select ADK_PACKAGE_LIBPCAP
-	select ADK_PACKAGE_LIBPCRE
-	help
-	  A free open source utility for network exploration or security auditing. 
-	  
-	  http://www.insecure.org/nmap/
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_NMAP
-default ADK_COMPILE_NMAP_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_NMAP_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_NMAP_WITH_STDCXX
-	bool "Standard C++ library"
-	select ADK_PACKAGE_LIBSTDCXX
-	help
-
-config ADK_COMPILE_NMAP_WITH_UCLIBCXX
-	bool "Embedded uClibc++ library"
-	select ADK_PACKAGE_UCLIBCXX
-	help
-
-endchoice
diff --git a/package/nmap/Makefile b/package/nmap/Makefile
index 269a84ce3..587ad980f 100644
--- a/package/nmap/Makefile
+++ b/package/nmap/Makefile
@@ -6,10 +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 libpcre
+PKG_DEPENDS:=		libdnet libpcap pcre
 PKG_URL:=		http://nmap.org
 PKG_SITES:=		http://download.insecure.org/nmap/dist/
 
@@ -17,12 +19,6 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-ifeq ($(ADK_COMPILE_NMAP_WITH_UCLIBCXX),y)
-PKG_DEPENDS+=		uclibc++
-else
-PKG_DEPENDS+=		libstdcxx
-endif
-
 $(eval $(call PKG_template,NMAP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TCPPFLAGS+=		-DNOLUA