postgresql: update to version 9.0.1

[openwrt/svn-archive/archive.git] / net / matrixtunnel / Makefile

diff --git a/net/matrixtunnel/Makefile b/net/matrixtunnel/Makefile
index 91d9ddeceb304bdcba02c08b0daefde752cb0009..819f1aaa530ee85be643248f1eebdd1bc5971a5b 100644 (file)
--- a/net/matrixtunnel/Makefile
+++ b/net/matrixtunnel/Makefile
@@ -1,81 +1,53 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=matrixtunnel
-PKG_VERSION:=0.1
-PKG_RELEASE:=1
+PKG_VERSION:=0.2
+PKG_RELEASE:=2
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://znerol.ch/files
-PKG_MD5SUM:=ffbbe0c50cc1863f6080aca302f7e2c8
-PKG_CAT:=zcat
+PKG_MD5SUM:=af169751efc7d87d500716a48d74ddc5
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+MAKE_PATH:=src
+
 define Package/matrixtunnel
   SECTION:=net
   CATEGORY:=Network
+  SUBMENU:=VPN
   DEPENDS:=+libmatrixssl
   TITLE:=SSL tunnel based on matrixssl
-  DESCRIPTION:=SSL tunnel based on matrixssl.\\\
-    matrixtunnel is a stripped down version of stunnel \\\
-    based on matrixssl library
   URL:=http://znerol.ch/svn/matrixtunnel/trunk/
 endef
 
-define Build/Configure
-       (cd $(PKG_BUILD_DIR); rm -f config.cache; \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               ./configure \
-                       --target=$(GNU_TARGET_NAME) \
-                       --host=$(GNU_TARGET_NAME) \
-                       --build=$(GNU_HOST_NAME) \
-                       --program-prefix="" \
-                       --program-suffix="" \
-                       --prefix=/usr \
-                       --exec-prefix=/usr \
-                       --bindir=/usr/sbin \
-                       --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) \
-                       --without-libiconv-prefix \
-                       --without-libintl-prefix \
-                       --with-matrixssl-src=$(BUILD_DIR)/matrixssl \
-       );
+define Package/matrixtunnel/description
+       matrixtunnel is a stripped down version of stunnel 
+       based on matrixssl library.
 endef
 
-define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR)/src \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --without-libiconv-prefix \
+               --without-libintl-prefix \
+               --with-matrixssl-src="$(BUILD_DIR)/matrixssl" \
+       )
 endef
 
 define Package/matrixtunnel/install
-       install -d -m0755 $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/matrixtunnel $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/matrixtunnel $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,matrixtunnel))