* pcre.in, libpcre.in:

	renamed

	* pcre.make, libpcre.make:
	renamed

	* Kconfig
	pcre -> libpcre

	* nmap.in, pop3spam.in
	changed select PCRE -> LIBPCRE


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8223 33e552b5-05e3-0310-8538-816dae2090ed

7 files changed, 122 insertions, 151 deletions

diff --git a/rules/Kconfig b/rules/Kconfig
index e5643462a..94e7aadb9 100644
--- a/rules/Kconfig
+++ b/rules/Kconfig
@@ -169,10 +169,12 @@ source "rules/libgmp.in"
 source "rules/libgsloop.in"
 source "rules/libiconv.in"
 source "rules/liblist.in"
+source "rules/liblzo.in"
 source "rules/libmqueue.in"
 source "rules/libnetpbm.in"
 source "rules/liboil.in"
 source "rules/liboop.in"
+source "rules/libpcre.in"
 source "rules/libpopt.in"
 source "rules/librn.in"
 source "rules/libsigcpp.in"
@@ -184,7 +186,6 @@ source "rules/libxslt.in"
 source "rules/live.in"
 source "rules/mysql.in"
 source "rules/ncurses.in"
-source "rules/pcre.in"
 source "rules/readline.in"
 
 source "rules/slang.in"
diff --git a/rules/libpcre.in b/rules/libpcre.in
new file mode 100644
index 000000000..9bbc4a33d
--- /dev/null
+++ b/rules/libpcre.in
@@ -0,0 +1,13 @@
+menuconfig LIBPCRE
+	bool "libpcre                     "
+	select GCCLIBS_CXX if LIBPCRE__LIBPCRECPP
+	help
+	  Perl Compatible Regluar Expressions Library
+
+config LIBPCRE__LIBPCREPOSIX
+       bool "install libpcreposix"
+       depends on PCRE
+
+config LIBPCRE__LIBPCRECPP
+       bool "install libpcrecpp (c++ bindings for libpcre)"
+       depends on PCRE
diff --git a/rules/libpcre.make b/rules/libpcre.make
new file mode 100644
index 000000000..0a933c05f
--- /dev/null
+++ b/rules/libpcre.make
@@ -0,0 +1,97 @@
+# -*-makefile-*-
+#
+# $Id:$
+#
+# Copyright (C) 2004 by Robert Schwebel
+#               2008 by Marc Kleine-Budde <mkl@pengutronix.de>
+#          
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBPCRE) += libpcre
+
+#
+# Paths and names
+#
+LIBPCRE_VERSION	:= 7.7
+LIBPCRE		:= pcre-$(LIBPCRE_VERSION)
+LIBPCRE_SUFFIX	:= tar.bz2
+LIBPCRE_URL	:= $(PTXCONF_SETUP_SFMIRROR)/pcre/$(LIBPCRE).$(LIBPCRE_SUFFIX)
+LIBPCRE_SOURCE	:= $(SRCDIR)/$(LIBPCRE).$(LIBPCRE_SUFFIX)
+LIBPCRE_DIR	:= $(BUILDDIR)/$(LIBPCRE)
+
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+$(LIBPCRE_SOURCE):
+	@$(call targetinfo)
+	@$(call get, LIBPCRE)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+libpcre_prepare: $(STATEDIR)/libpcre.prepare
+
+LIBPCRE_PATH	:=  PATH=$(CROSS_PATH)
+LIBPCRE_ENV 	:=  $(CROSS_ENV)
+
+#
+# autoconf
+#
+LIBPCRE_AUTOCONF := $(CROSS_AUTOCONF_USR)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libpcre.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, libpcre)
+	@$(call install_fixup, libpcre,PACKAGE,libpcre)
+	@$(call install_fixup, libpcre,PRIORITY,optional)
+	@$(call install_fixup, libpcre,VERSION,$(LIBPCRE_VERSION))
+	@$(call install_fixup, libpcre,SECTION,base)
+	@$(call install_fixup, libpcre,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, libpcre,DEPENDS,)
+	@$(call install_fixup, libpcre,DESCRIPTION,missing)
+
+	@$(call install_copy, libpcre, 0, 0, 0644, $(LIBPCRE_DIR)/.libs/libpcre.so.0.0.1, /usr/lib/libpcre.so.0.0.1)
+	@$(call install_link, libpcre, /usr/lib/libpcre.so.0.0.1, /usr/lib/libpcre.so.0) 
+	@$(call install_link, libpcre, /usr/lib/libpcre.so.0.0.1, /usr/lib/libpcre.so) 
+
+ifdef PTXCONF_LIBPCRE__LIBPCREPOSIX
+	@$(call install_copy, libpcre, 0, 0, 0644, $(LIBPCRE_DIR)/.libs/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so.0.0.0)
+	@$(call install_link, libpcre, libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so.0) 
+	@$(call install_link, libpcre, libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so) 
+endif
+
+ifdef PTXCONF_LIBPCRE__LIBPCRECPP
+	@$(call install_copy, libpcre, 0, 0, 0644, $(LIBPCRE_DIR)/.libs/libpcrecpp.so.0.0.0, /usr/lib/libpcrecpp.so.0.0.0)
+	@$(call install_link, libpcre, libpcrecpp.so.0.0.0, /usr/lib/libpcrecpp.so.0) 
+	@$(call install_link, libpcre, libpcrecpp.so.0.0.0, /usr/lib/libpcrecpp.so) 
+endif
+
+	@$(call install_finish, libpcre)
+
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+libpcre_clean:
+	rm -rf $(STATEDIR)/libpcre.*
+	rm -rf $(IMAGEDIR)/libpcre_*
+	rm -rf $(LIBPCRE_DIR)
+
+# vim: syntax=make
diff --git a/rules/nmap.in b/rules/nmap.in
index a1c5a4e6d..66822b1b9 100644
--- a/rules/nmap.in
+++ b/rules/nmap.in
@@ -1,7 +1,8 @@
 menuconfig NMAP
 	bool "nmap                "
+	select OPENSSL if NMAP__OPENSSL
 	select OPENSSL
-	select PCRE
+	select LIBPCRE
 	select GCCLIBS_CXX
 	help
 	  Nmap ("Network Mapper") is a utility for network exploration
@@ -10,7 +11,13 @@ menuconfig NMAP
 	  managing service upgrade schedules, and monitoring host or
 	  service uptime.
 
-config NMAP_SERVICES
+config NMAP__OPENSSL
+       bool "openssl support"
+
+config NMAP__IPV6
+       bool "ipv6 support (in included libpcap)"
+
+config NMAP__SERVICES
 	bool "Install nmap-services"
 	default y
 	depends on NMAP
diff --git a/rules/pcre.in b/rules/pcre.in
deleted file mode 100644
index cbc6e9db0..000000000
--- a/rules/pcre.in
+++ /dev/null
@@ -1,5 +0,0 @@
-config PCRE
-	bool "PCRE"
-	help
-	  Perl Compatible Regluar Expressions Library
-
diff --git a/rules/pcre.make b/rules/pcre.make
deleted file mode 100644
index b1328cf37..000000000
--- a/rules/pcre.make
+++ /dev/null
@@ -1,142 +0,0 @@
-# -*-makefile-*-
-#
-# $Id:$
-#
-# Copyright (C) 2004 by Robert Schwebel
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_PCRE) += pcre
-
-#
-# Paths and names
-#
-PCRE_VERSION	= 5.0
-PCRE		= pcre-$(PCRE_VERSION)
-PCRE_SUFFIX	= tar.gz
-PCRE_URL	= $(PTXCONF_SETUP_SFMIRROR)/pcre/$(PCRE).$(PCRE_SUFFIX)
-PCRE_SOURCE	= $(SRCDIR)/$(PCRE).$(PCRE_SUFFIX)
-PCRE_DIR	= $(BUILDDIR)/$(PCRE)
-
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-pcre_get: $(STATEDIR)/pcre.get
-
-$(STATEDIR)/pcre.get: $(pcre_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
-$(PCRE_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, PCRE)
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-pcre_extract: $(STATEDIR)/pcre.extract
-
-$(STATEDIR)/pcre.extract: $(pcre_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(PCRE_DIR))
-	@$(call extract, PCRE)
-	@$(call patchin, PCRE)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-pcre_prepare: $(STATEDIR)/pcre.prepare
-
-PCRE_PATH	=  PATH=$(CROSS_PATH)
-PCRE_ENV 	=  $(CROSS_ENV)
-
-#
-# autoconf
-#
-PCRE_AUTOCONF = $(CROSS_AUTOCONF_USR)
-
-$(STATEDIR)/pcre.prepare: $(pcre_prepare_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(PCRE_DIR)/config.cache)
-	cd $(PCRE_DIR) && \
-		$(PCRE_PATH) $(PCRE_ENV) \
-		./configure $(PCRE_AUTOCONF)
-
-	# Hack: libtool wants --tag=C when linking host side tools
-	perl -i -p -e 's/LINK_FOR_BUILD = \$$\(LIBTOOL\)/LINK_FOR_BUILD = \$$\(LIBTOOL\) --tag=C/g' $(PCRE_DIR)/Makefile	
-
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-pcre_compile: $(STATEDIR)/pcre.compile
-
-$(STATEDIR)/pcre.compile: $(pcre_compile_deps_default)
-	@$(call targetinfo, $@)
-	cd $(PCRE_DIR) && $(PCRE_ENV) $(PCRE_PATH) make
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-pcre_install: $(STATEDIR)/pcre.install
-
-$(STATEDIR)/pcre.install: $(pcre_install_deps_default)
-	@$(call targetinfo, $@)
-	@$(call install, PCRE)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-pcre_targetinstall: $(STATEDIR)/pcre.targetinstall
-
-$(STATEDIR)/pcre.targetinstall: $(pcre_targetinstall_deps_default)
-	@$(call targetinfo, $@)
-
-	@$(call install_init, pcre)
-	@$(call install_fixup, pcre,PACKAGE,pcre)
-	@$(call install_fixup, pcre,PRIORITY,optional)
-	@$(call install_fixup, pcre,VERSION,$(PCRE_VERSION))
-	@$(call install_fixup, pcre,SECTION,base)
-	@$(call install_fixup, pcre,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup, pcre,DEPENDS,)
-	@$(call install_fixup, pcre,DESCRIPTION,missing)
-
-	@$(call install_copy, pcre, 0, 0, 0644, $(PCRE_DIR)/.libs/libpcre.so.0.0.1, /usr/lib/libpcre.so.0.0.1)
-	@$(call install_link, pcre, /usr/lib/libpcre.so.0.0.1, /usr/lib/libpcre.so.0) 
-	@$(call install_link, pcre, /usr/lib/libpcre.so.0.0.1, /usr/lib/libpcre.so) 
-	@$(call install_copy, pcre, 0, 0, 0644, $(PCRE_DIR)/.libs/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so.0.0.0)
-	@$(call install_link, pcre, /usr/lib/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so.0) 
-	@$(call install_link, pcre, /usr/lib/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so) 
-
-	@$(call install_finish, pcre)
-
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-pcre_clean:
-	rm -rf $(STATEDIR)/pcre.*
-	rm -rf $(IMAGEDIR)/pcre_*
-	rm -rf $(PCRE_DIR)
-
-# vim: syntax=make
diff --git a/rules/pop3spam.in b/rules/pop3spam.in
index c6e26b435..1a50f38a9 100644
--- a/rules/pop3spam.in
+++ b/rules/pop3spam.in
@@ -1,7 +1,7 @@
 config POP3SPAM
 	bool
 	prompt "pop3spam"
-	select PCRE
+	select LIBPCRE
 	help
 	  pop3spam is a rudimentary POP3 client. It is normally supposed
 	  to delete spam in a POP3 box but also can be used to make