3 files changed, 51 insertions, 57 deletions
diff --git a/package/matrixssl/Config.in b/package/matrixssl/Config.in
index b8faecd412..1d2e92d0cf 100644
--- a/package/matrixssl/Config.in
+++ b/package/matrixssl/Config.in
@@ -1,11 +1,15 @@
-config BR2_PACKAGE_MATRIXSSL
+config BR2_PACKAGE_LIBMATRIXSSL
 	select BR2_PACKAGE_LIBPTHREAD
-	tristate "matrixssl"
+	tristate "libmatrixssl - an embedded SSL implementation"
 	default m if CONFIG_DEVEL
 	help
-	  an embedded SSL implementation
+	  An embedded SSL implementation
 	  
 	  http://www.matrixssl.org/
 	  
 	  Depends: libpthread
 	  
+
+config BR2_PACKAGE_MATRIXSSL
+	tristate
+	default BR2_PACKAGE_LIBMATRIXSSL
diff --git a/package/matrixssl/Makefile b/package/matrixssl/Makefile
index 3ea33144b5..0b08e222f1 100644
--- a/package/matrixssl/Makefile
+++ b/package/matrixssl/Makefile
@@ -2,58 +2,48 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME := matrixssl
-PKG_VERSION := 1.2.4
-PKG_RELEASE := 1
-PKG_MD5SUM := 771c1489488e62668d673478311d63ca
-
-PKG_SOURCE_SITE := http://nbd.vd-s.ath.cx/openwrt \
-		   http://openwrt.openbsd-geek.de/
-PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_CAT := zcat
-PKG_SOURCE_DIR := $(PKG_NAME)
-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)
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
-
-$(PKG_BUILD_DIR)/.patched: $(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) ./patches
-	touch $(PKG_BUILD_DIR)/.patched
-
-$(PKG_BUILD_DIR)/src/libmatrixssl.so: $(PKG_BUILD_DIR)/.patched
-	$(MAKE) -C $(PKG_BUILD_DIR)/src \
-	  $(TARGET_CONFIGURE_OPTS) \
-	  DFLAGS="$(TARGET_CFLAGS) -Wall"
-
-$(STAGING_DIR)/lib/libmatrixssl.so: $(PKG_BUILD_DIR)/src/libmatrixssl.so
-	cp -a $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(STAGING_DIR)/lib
-	mkdir -p $(STAGING_DIR)/include/matrixSsl
-	cp $(PKG_BUILD_DIR)/matrixSsl.h $(STAGING_DIR)/include/matrixSsl
-	ln -sf matrixSsl/matrixSsl.h $(STAGING_DIR)/include/matrixSsl.h
-
-$(PKG_IPK): $(STAGING_DIR)/lib/libmatrixssl.so
-	mkdir -p $(PACKAGE_DIR)
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/matrixssl matrixssl.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	mkdir -p $(PKG_BUILD_DIR)/ipkg/matrixssl/usr/lib
-	cp -a $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(PKG_BUILD_DIR)/ipkg/matrixssl/usr/lib
-	$(STRIP) $(PKG_BUILD_DIR)/ipkg/matrixssl/usr/lib/*
-	$(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/matrixssl $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/libmatrixssl.list: $(PKG_IPK)
-	$(IPKG) install $(PKG_IPK)
-
-source: $(DL_DIR)/$(PKG_SOURCE_FILE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(STAGING_DIR)/lib/libmatrixssl.so $(PKG_IPK)
-install: $(PKG_ZLIB) $(IPKG_STATE_DIR)/info/libmatrixssl.list
-
-clean:
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(STAGING_DIR)/lib/libmatrixssl* $(STAGING_DIR)/include/matrixssl*
-	rm -f $(PKG_IPK)
+PKG_NAME:=matrixssl
+PKG_VERSION:=1.2.4
+PKG_RELEASE:=1
+PKG_MD5SUM:=771c1489488e62668d673478311d63ca
+
+PKG_SOURCE_URL:=http://nbd.vd-s.ath.cx/openwrt \
+	http://openwrt.openbsd-geek.de/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,LIBMATRIXSSL,libmatrixssl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.built:
+	$(MAKE) -C $(PKG_BUILD_DIR)/src \
+		$(TARGET_CONFIGURE_OPTS) \
+		DFLAGS="$(TARGET_CFLAGS) -Wall"
+	touch $(PKG_BUILD_DIR)/.built
+
+$(IPKG_LIBMATRIXSSL):
+	install -d -m0755 $(IDIR_LIBMATRIXSSL)/usr/lib
+	cp -fpR $(PKG_BUILD_DIR)/src/libmatrixssl.so.* $(IDIR_LIBMATRIXSSL)/usr/lib/
+	$(RSTRIP) $(IDIR_LIBMATRIXSSL)
+	$(IPKG_BUILD) $(IDIR_LIBMATRIXSSL) $(PACKAGE_DIR)
+
+$(STAGING_DIR)/usr/lib/libmatrixssl.so: $(PKG_BUILD_DIR)/.built
+	mkdir -p $(STAGING_DIR)/usr/include/matrixSsl
+	cp -fpR $(PKG_BUILD_DIR)/matrixSsl.h $(STAGING_DIR)/usr/include/matrixSsl
+	ln -sf matrixSsl/matrixSsl.h $(STAGING_DIR)/usr/include/matrixSsl.h
+	mkdir -p $(STAGING_DIR)/usr/lib
+	cp -fpR $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(STAGING_DIR)/usr/lib
+
+install-dev: $(STAGING_DIR)/usr/lib/libmatrixssl.so
+
+uninstall-dev:
+	rm -rf \
+	  $(STAGING_DIR)/usr/include/matrixSsl* \
+	  $(STAGING_DIR)/usr/lib/libmatrixssl.so* \
+
+compile: install-dev
+clean: uninstall-dev
diff --git a/package/matrixssl/matrixssl.control b/package/matrixssl/ipkg/libmatrixssl.control
index c0dacdbb0d..c0dacdbb0d 100644
--- a/package/matrixssl/matrixssl.control
+++ b/package/matrixssl/ipkg/libmatrixssl.control