7 files changed, 20 insertions, 172 deletions
diff --git a/package/popt/Config.in b/package/popt/Config.in
index 291e69330b..9f61204d5c 100644
--- a/package/popt/Config.in
+++ b/package/popt/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_POPT
-	tristate "popt (a command line option parsing library)"
+	prompt "popt"
+	tristate 
 	default m
 	help
 	  A command line option parsing library
@@ -7,3 +8,7 @@ config BR2_PACKAGE_POPT
 	  ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
 	  
 
+config BR2_PACKAGE_LIBPOPT
+	tristate
+	default BR2_PACKAGE_POPT
+
diff --git a/package/popt/Makefile b/package/popt/Makefile
index 5d67b80c14..7297ce7b01 100644
--- a/package/popt/Makefile
+++ b/package/popt/Makefile
@@ -7,28 +7,26 @@ PKG_VERSION:=1.7
 PKG_RELEASE:=4
 PKG_MD5SUM:=5988e7aeb0ae4dac8d83561265984cc9
 
-PKG_SOURCE_URL:=\
+PKG_SOURCE_URL:= \
 	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ \
 	http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-IPKG_LIBPOPT:=$(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-IDIR_LIBPOPT:=$(PKG_BUILD_DIR)/ipkg/lib$(PKG_NAME)
-INFO_LIBPOPT:=$(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list
+include $(TOPDIR)/package/templates.mk
 
-$(DL_DIR)/$(PKG_SOURCE):
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+$(eval $(call PKG_template,LIBPOPT,libpopt,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
-	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-#	$(PATCH) $(PKG_BUILD_DIR) ./patches
-	touch $(PKG_BUILD_DIR)/.prepared
+include $(TOPDIR)/package/rules.mk
+
+COMPILE_TARGETS += install-dev
+CLEAN_TARGETS += uninstall-dev
 
 $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
-	(cd $(PKG_BUILD_DIR); rm -rf config.cache config.status; \
+	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
@@ -68,24 +66,16 @@ $(STAGING_DIR)/usr/lib/libpopt.so: $(PKG_BUILD_DIR)/.built
 		install
 	rm -f $(STAGING_DIR)/usr/lib/libpopt.la
 
-$(IPKG_LIBPOPT): $(STAGING_DIR)/usr/lib/libpopt.so
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPOPT) lib$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+$(IPKG_LIBPOPT): $(IDIR_LIBPOPT)/CONTROL/control $(STAGING_DIR)/usr/lib/libpopt.so
 	mkdir -p $(IDIR_LIBPOPT)/usr/lib
-	cp -fp $(STAGING_DIR)/usr/lib/libpopt.so.* $(IDIR_LIBPOPT)/usr/lib/
-	$(STRIP) $(IDIR_LIBPOPT)/usr/lib/*.so*
+	cp -fpR $(STAGING_DIR)/usr/lib/libpopt.so.* $(IDIR_LIBPOPT)/usr/lib/
+	$(RSTRIP) $(IDIR_LIBPOPT)
 	mkdir -p $(PACKAGE_DIR)
 	$(IPKG_BUILD) $(IDIR_LIBPOPT) $(PACKAGE_DIR)
 
-$(INFO_LIBPOPT): $(IPKG_LIBPOPT)
-	$(IPKG) install $(IPKG_LIBPOPT)
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(IPKG_LIBPOPT)
-install: $(INFO_LIBPOPT)
+install-dev: $(STAGING_DIR)/usr/lib/libpopt.so
 
-clean:
+uninstall-dev:
 	-$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(STAGING_DIR)" \
 		uninstall
-	rm -rf $(PKG_BUILD_DIR) $(IPKG_LIBPOPT)
diff --git a/package/popt/ipkg/libpopt-dev/CONTROL/control b/package/popt/ipkg/libpopt-dev/CONTROL/control
deleted file mode 100644
index 47faa7ab82..0000000000
--- a/package/popt/ipkg/libpopt-dev/CONTROL/control
+++ /dev/null
@@ -1,8 +0,0 @@
-Package: libpopt-dev
-Priority: optional
-Section: devel
-Version: [TBDL]
-Architecture: [TBDL]
-Maintainer: Nico <nthill@free.fr>
-Source: http://nthill.free.fr/openwrt/sources/popt/
-Description: a command line option parsing library (development)
diff --git a/package/popt/libpopt.control b/package/popt/ipkg/libpopt.control
index b932c4a48f..b932c4a48f 100644
--- a/package/popt/libpopt.control
+++ b/package/popt/ipkg/libpopt.control
diff --git a/package/popt/ipkg/libpopt/CONTROL/control b/package/popt/ipkg/libpopt/CONTROL/control
deleted file mode 100644
index b932c4a48f..0000000000
--- a/package/popt/ipkg/libpopt/CONTROL/control
+++ /dev/null
@@ -1,8 +0,0 @@
-Package: libpopt
-Priority: optional
-Section: libs
-Version: [TBDL]
-Architecture: [TBDL]
-Maintainer: Nico <nthill@free.fr>
-Source: http://nthill.free.fr/openwrt/sources/popt/
-Description: a command line option parsing library
diff --git a/package/popt/ipkg/rules b/package/popt/ipkg/rules
deleted file mode 100644
index 7a615a5f2c..0000000000
--- a/package/popt/ipkg/rules
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/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
-
-unexport INSTALL_DIR
-
-I_LIBPOPT := ipkg/libpopt
-I_LIBPOPT_DEV := ipkg/libpopt-dev
-
-BUILD_DEPS := \
-
-CONFIGURE_OPTS = \
-	--enable-shared \
-	--enable-static \
-
-##
-
-all: package
-
-
-.stamp-configured: $(BUILD_DEPS)
-
-	rm -rf config.cache
-	$(TARGET_CONFIGURE_OPTS) \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	am_cv_func_iconv=no \
-	./configure \
-	  --target=$(GNU_TARGET_NAME) \
-	  --host=$(GNU_TARGET_NAME) \
-	  --build=$(GNU_HOST_NAME) \
-	  --program-prefix="" \
-	  --program-suffix="" \
-	  --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_LARGEFILE) \
-	  $(DISABLE_NLS) \
-	  $(CONFIGURE_OPTS) \
-
-	touch .stamp-configured
-
-
-.stamp-built: .stamp-configured
-
-	$(MAKE)
-	  
-	touch .stamp-built
-
-
-$(INSTALL_DIR)/usr/include/popt.h: .stamp-built
-
-	mkdir -p $(INSTALL_DIR)
-
-	$(MAKE) \
-	  DESTDIR="$(INSTALL_DIR)" \
-	 install
-
-	rm -f $(INSTALL_DIR)/usr/lib/libpopt.la
-
-
-configure: .stamp-configured
-
-
-build: .stamp-built
-
-
-install: $(INSTALL_DIR)/usr/include/popt.h
-
-
-package: $(INSTALL_DIR)/usr/include/popt.h
-
-	mkdir -p $(I_LIBPOPT)/usr/lib
-	cp -fpR $(INSTALL_DIR)/usr/lib/libpopt*.so.* $(I_LIBPOPT)/usr/lib/
-	$(STRIP) $(I_LIBPOPT)/usr/lib/lib*.so.*
-
-	mkdir -p $(I_LIBPOPT_DEV)/usr/include
-	cp -fpR $(INSTALL_DIR)/usr/include/popt.h $(I_LIBPOPT_DEV)/usr/include/
-	mkdir -p $(I_LIBPOPT_DEV)/usr/lib
-	cp -fpR $(INSTALL_DIR)/usr/lib/libpopt*.a $(I_LIBPOPT_DEV)/usr/lib/
-	cp -fpR $(INSTALL_DIR)/usr/lib/libpopt*.so* $(I_LIBPOPT_DEV)/usr/lib/
-
-	chmod 0755 ipkg/*/CONTROL/
-	chmod 0644 ipkg/*/CONTROL/control
-	
-	perl -pi -e "s/^Arch.*:.*/Architecture: $(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_LIBPOPT) $(IPKG_TARGET_DIR)
-	$(IPKG_BUILD) $(I_LIBPOPT_DEV) $(IPKG_TARGET_DIR)
-
-
-clean:
-
-	-$(MAKE) \
-	  DESTDIR="$(INSTALL_DIR)" \
-	 uninstall clean
-
-	rm -rf .stamp-* \
-	  $(I_LIBPOPT)/usr \
-	  $(I_LIBPOPT_DEV)/usr \
-
-
-control:
-
-	@cat $(I_LIBPOPT)/CONTROL/control
-	@echo
-	@cat $(I_LIBPOPT_DEV)/CONTROL/control
-	@echo
-	
-
-.PHONY: configure build install package clean control
diff --git a/package/popt/ipkg/version b/package/popt/ipkg/version
deleted file mode 100644
index 75b1827094..0000000000
--- a/package/popt/ipkg/version
+++ /dev/null
@@ -1 +0,0 @@
-1.7-4