5 files changed, 225 insertions, 0 deletions
diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in
index f1cfbff42..cdce099fc 100644
--- a/openwrt/package/Config.in
+++ b/openwrt/package/Config.in
@@ -30,6 +30,7 @@ source "package/libelf/Config.in"
 source "package/matrixssl/Config.in"
 source "package/lzo/Config.in"
 source "package/openssl/Config.in"
+source "package/pcre/Config.in"
 source "package/popt/Config.in"
 
 endmenu
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 83ed49e46..a0aa4caa9 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -15,6 +15,7 @@ package-$(BR2_PACKAGE_ZLIB) += zlib
 package-$(BR2_PACKAGE_MATRIXSSL) += matrixssl
 package-$(BR2_PACKAGE_OPENSSL) += openssl
 package-$(BR2_PACKAGE_OPENVPN) += openvpn
+package-$(BR2_PACKAGE_PCRE) += pcre
 package-$(BR2_PACKAGE_POPT) += popt
 package-$(BR2_PACKAGE_PPTPD) += pptpd
 package-$(BR2_PACKAGE_IPROUTE2) += iproute2
diff --git a/openwrt/package/pcre/Config.in b/openwrt/package/pcre/Config.in
new file mode 100644
index 000000000..3aa16d7fd
--- /dev/null
+++ b/openwrt/package/pcre/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PCRE
+	tristate "pcre"
+	default m
+	help
+	  A Perl Compatible Regular Expression library
+	  
+	  http://www.pcre.org/
+	  
+
diff --git a/openwrt/package/pcre/Makefile b/openwrt/package/pcre/Makefile
new file mode 100644
index 000000000..de5680b8b
--- /dev/null
+++ b/openwrt/package/pcre/Makefile
@@ -0,0 +1,47 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME := pcre
+PKG_VERSION := 5.0
+PKG_RELEASE := 3
+
+PKG_SOURCE_SITE := ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
+PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_CAT := zcat
+PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
+PKG_IPK := $(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+
+
+$(DL_DIR)/$(PKG_SOURCE_FILE):
+	mkdir -p $(DL_DIR)
+	$(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)
+
+$(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE)
+	mkdir -p $(TOOL_BUILD_DIR)
+	$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	$(PATCH) $(PKG_BUILD_DIR) . $(PKG_NAME)-\*.diff
+	chmod a+x $(PKG_BUILD_DIR)/ipkg/rules
+
+$(PKG_IPK): $(PKG_BUILD_DIR)/ipkg/rules
+	cd $(PKG_BUILD_DIR); \
+	ipkg/rules \
+	  TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
+	  INSTALL_DIR="$(STAGING_DIR)" \
+	 package
+
+$(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list: $(PKG_IPK)
+	$(IPKG) install $(PKG_IPK)
+
+source: $(DL_DIR)/$(PKG_SOURCE_FILE)
+prepare: $(PKG_BUILD_DIR)/ipkg/rules
+compile: $(PKG_IPK)
+install: $(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list
+
+clean:
+	-cd $(PKG_BUILD_DIR); \
+	ipkg/rules \
+	  TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
+	  INSTALL_DIR="$(STAGING_DIR)" \
+	 clean
+	rm -rf $(PKG_BUILD_DIR)
+	rm -r $(PKG_IPK)
diff --git a/openwrt/package/pcre/pcre-5.0-3.diff b/openwrt/package/pcre/pcre-5.0-3.diff
new file mode 100644
index 000000000..e5239d403
--- /dev/null
+++ b/openwrt/package/pcre/pcre-5.0-3.diff
@@ -0,0 +1,167 @@
+diff -ruN pcre-5.0-orig/ipkg/libpcre/CONTROL/control pcre-5.0-3/ipkg/libpcre/CONTROL/control
+--- pcre-5.0-orig/ipkg/libpcre/CONTROL/control	1970-01-01 01:00:00.000000000 +0100
++++ pcre-5.0-3/ipkg/libpcre/CONTROL/control	2005-03-08 03:33:59.000000000 +0100
+@@ -0,0 +1,8 @@
++Package: libpcre
++Priority: optional
++Section: libs
++Version: [TBDL]
++Architecture: [TBDL]
++Maintainer: Nico <nthill@free.fr>
++Source: http://nthill.free.fr/openwrt/sources/pcre/
++Description: a Perl Compatible Regular Expression library
+diff -ruN pcre-5.0-orig/ipkg/pcre-dev/CONTROL/control pcre-5.0-3/ipkg/pcre-dev/CONTROL/control
+--- pcre-5.0-orig/ipkg/pcre-dev/CONTROL/control	1970-01-01 01:00:00.000000000 +0100
++++ pcre-5.0-3/ipkg/pcre-dev/CONTROL/control	2005-03-08 03:34:14.000000000 +0100
+@@ -0,0 +1,8 @@
++Package: pcre-dev
++Priority: optional
++Section: devel
++Version: [TBDL]
++Architecture: [TBDL]
++Maintainer: Nico <nthill@free.fr>
++Source: http://nthill.free.fr/openwrt/sources/pcre/
++Description: a Perl Compatible Regular Expression library (development)
+diff -ruN pcre-5.0-orig/ipkg/rules pcre-5.0-3/ipkg/rules
+--- pcre-5.0-orig/ipkg/rules	1970-01-01 01:00:00.000000000 +0100
++++ pcre-5.0-3/ipkg/rules	2005-03-08 03:47:50.000000000 +0100
+@@ -0,0 +1,134 @@
++#!/usr/bin/make -f
++
++ifneq ($(strip ${IPKG_RULES_INC}),)
++  include $(IPKG_RULES_INC)
++endif
++
++##
++
++PKG_VERSION := $(shell cat ./ipkg/version)
++CURRENT_DIR := $(shell pwd)
++INSTALL_DIR = $(CURRENT_DIR)/ipkg-install
++
++I_LIBPCRE := ipkg/libpcre
++I_PCRE_DEV := ipkg/pcre-dev
++
++BUILD_DEPS := \
++
++CONFIGURE_OPTS = \
++	--enable-shared \
++	--enable-static \
++	--enable-utf8 \
++
++##
++
++all: package
++
++
++.stamp-configured: $(BUILD_DEPS)
++
++	rm -rf config.cache
++	$(TARGET_CONFIGURE_OPTS) \
++	CFLAGS="$(TARGET_CFLAGS)" \
++	./configure \
++	  --target=$(GNU_TARGET_NAME) \
++	  --host=$(GNU_TARGET_NAME) \
++	  --build=$(GNU_HOST_NAME) \
++	  --prefix=/usr \
++	  --exec-prefix=/usr \
++	  --bindir=/usr/bin \
++	  --datadir=/usr/share \
++	  --includedir=/usr/include \
++	  --infodir=/usr/share/info \
++	  --libdir=/usr/lib \
++	  --libexecdir=/usr/lib \
++	  --localstatedir=/var \
++	  --mandir=/usr/share/man \
++	  --sbindir=/usr/sbin \
++	  --sysconfdir=/etc \
++	  $(DISABLE_NLS) \
++
++	touch .stamp-configured
++
++
++.stamp-built: .stamp-configured
++
++	$(MAKE) \
++	  CC_FOR_BUILD="$(HOSTCC)" \
++	  LINK_FOR_BUILD="$(HOSTCC)" \
++	  CFLAGS_FOR_BUILD="" \
++	 dftables
++
++	$(MAKE) \
++	  $(TARGET_CONFIGURE_OPTS) \
++	  CFLAGS="$(TARGET_CFLAGS)" \
++	  
++	touch .stamp-built
++
++
++$(INSTALL_DIR)/usr/include/pcre.h: .stamp-built
++
++	mkdir -p $(INSTALL_DIR)
++
++	$(MAKE) \
++	  DESTDIR="$(INSTALL_DIR)" \
++	 install
++
++
++configure: .stamp-configured
++
++
++build: .stamp-built
++
++
++install: $(INSTALL_DIR)/usr/include/pcre.h
++
++
++package: $(INSTALL_DIR)/usr/include/pcre.h
++
++	mkdir -p $(I_LIBPCRE)/usr/lib
++	cp -fpR $(INSTALL_DIR)/usr/lib/libpcre*.so.* $(I_LIBPCRE)/usr/lib/
++	$(STRIP) $(I_LIBPCRE)/usr/lib/lib*.so.*
++
++	mkdir -p $(I_PCRE_DEV)/usr/bin
++	cp -fpR $(INSTALL_DIR)/usr/bin/pcre-config  $(I_PCRE_DEV)/usr/bin/
++	mkdir -p $(I_PCRE_DEV)/usr/include
++	cp -fpR $(INSTALL_DIR)/usr/include/pcre*.h $(I_PCRE_DEV)/usr/include/
++	mkdir -p $(I_PCRE_DEV)/usr/lib
++	cp -fpR $(INSTALL_DIR)/usr/lib/libpcre*.a $(I_PCRE_DEV)/usr/lib/
++	cp -fpR $(INSTALL_DIR)/usr/lib/libpcre*.so* $(I_PCRE_DEV)/usr/lib/
++
++	chmod 0755 ipkg/*/CONTROL/
++	chmod 0644 ipkg/*/CONTROL/control
++	
++	perl -pi -e "s/^Arch.*:.*/Architecture: $(TARGET_ARCH)/g" ipkg/*/CONTROL/control
++ifneq ($(strip $(PKG_VERSION)),)
++	perl -pi -e "s/^Vers.*:.*/Version: $(PKG_VERSION)/g" ipkg/*/CONTROL/control
++endif
++
++	$(IPKG_BUILD) $(I_LIBPCRE) $(IPKG_TARGET_DIR)
++	$(IPKG_BUILD) $(I_PCRE_DEV) $(IPKG_TARGET_DIR)
++
++
++clean:
++
++	-$(MAKE) clean
++	rm -rf .stamp-*
++	rm -rf $(INSTALL_DIR)/usr/bin/pcre*
++	rm -rf $(INSTALL_DIR)/usr/include/pcre*
++	rm -rf $(INSTALL_DIR)/usr/lib/libpcre*
++	rm -rf $(INSTALL_DIR)/usr/lib/pkgconfig/libpcre.pc
++	rm -rf $(INSTALL_DIR)/usr/share/man/man*/pcre*
++	rm -rf $(I_LIBPCRE)/usr
++	rm -rf $(I_PCRE_DEV)/usr
++
++
++control:
++
++	@cat $(I_LIBPCRE)/CONTROL/control
++	@echo
++	@cat $(I_PCRE_DEV)/CONTROL/control
++	@echo
++	
++
++.PHONY: configure build install package clean control
+diff -ruN pcre-5.0-orig/ipkg/version pcre-5.0-3/ipkg/version
+--- pcre-5.0-orig/ipkg/version	1970-01-01 01:00:00.000000000 +0100
++++ pcre-5.0-3/ipkg/version	2005-03-08 03:32:54.000000000 +0100
+@@ -0,0 +1 @@
++5.0-3