4 files changed, 19 insertions, 39 deletions
diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in
deleted file mode 100644
index bdd3e210f..000000000
--- a/package/ipsec-tools/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_IPSEC_TOOLS
-	prompt "ipsec-tools....................... IPsec management tools"
-	tristate
-	depends BR2_LINUX_2_6
-	select BR2_PACKAGE_LIBOPENSSL
-	default m if CONFIG_DEVEL
-	help
-	  IPsec management tools
-	  
-	  http://ipsec-tools.sourceforge.net/
-
diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index 06d49e968..6d27397c0 100644
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -5,20 +5,25 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=ipsec-tools
 PKG_VERSION:=0.6.4
 PKG_RELEASE:=1
-PKG_MD5SUM:=d0242a943c82c0cbf28005966ff35e21
 
-PKG_SOURCE_URL:=@SF/ipsec-tools
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@SF/ipsec-tools
+PKG_MD5SUM:=d0242a943c82c0cbf28005966ff35e21
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,IPSEC_TOOLS,ipsec-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/ipsec-tools
+SECTION:=base
+CATEGORY:=Network
+DEFAULT:=y
+TITLE:=IPsec management tools
+DESCRIPTION:=IPsec management tools
+URL:=http://ipsec-tools.sourceforge.net/
+endef
 
-$(PKG_BUILD_DIR)/.configured:
+define Build/Configure
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
 		touch configure.ac; \
 		touch aclocal.m4; \
@@ -59,27 +64,19 @@ $(PKG_BUILD_DIR)/.configured:
 			--without-libradius \
 			--without-libpam \
 	);
-	touch $@
+endef
 
-$(PKG_BUILD_DIR)/.built:
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CFLAGS="$(TARGET_CFLAGS) -Wall" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-	touch $@
-
-$(IPKG_IPSEC_TOOLS):
+define Package/ipsec-tools/install
 	install -d -m0755 $(IDIR_IPSEC_TOOLS)/etc
-	$(CP) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(IDIR_IPSEC_TOOLS)/etc/
 	install -d -m0755 $(IDIR_IPSEC_TOOLS)/usr/lib/
+	install -d -m0755 $(IDIR_IPSEC_TOOLS)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(IDIR_IPSEC_TOOLS)/etc/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(IDIR_IPSEC_TOOLS)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(IDIR_IPSEC_TOOLS)/usr/lib/
-	install -d -m0755 $(IDIR_IPSEC_TOOLS)/usr/sbin
 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/plainrsa-gen $(IDIR_IPSEC_TOOLS)/usr/sbin/
 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoon $(IDIR_IPSEC_TOOLS)/usr/sbin/
 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoonctl $(IDIR_IPSEC_TOOLS)/usr/sbin/
 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/setkey $(IDIR_IPSEC_TOOLS)/usr/sbin/
-	$(RSTRIP) $(IDIR_IPSEC_TOOLS)
-	$(IPKG_BUILD) $(IDIR_IPSEC_TOOLS) $(PACKAGE_DIR)
+endef
+
+$(eval $(call BuildPackage,ipsec-tools))
diff --git a/package/ipsec-tools/ipkg/ipsec-tools.conffiles b/package/ipsec-tools/ipkg/ipsec-tools.conffiles
deleted file mode 100644
index 434045463..000000000
--- a/package/ipsec-tools/ipkg/ipsec-tools.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/racoon.conf
diff --git a/package/ipsec-tools/ipkg/ipsec-tools.control b/package/ipsec-tools/ipkg/ipsec-tools.control
deleted file mode 100644
index c1cade10b..000000000
--- a/package/ipsec-tools/ipkg/ipsec-tools.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: ipsec-tools
-Priority: optional
-Section: net
-Depends: libopenssl
-Description: IPsec management tools