remove a broken patch that should have been nuked with the busybox upgrade (#2809)

[openwrt.git] / package / keynote / Makefile

diff --git a/package/keynote/Makefile b/package/keynote/Makefile
index 4df4e14..1aea7cb 100644 (file)
--- a/package/keynote/Makefile
+++ b/package/keynote/Makefile
@@ -4,56 +4,57 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id: Makefile 4619 2006-08-22 09:50:02Z florian $
+# $Id$

 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=keynote
 PKG_VERSION:=2.3
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=keynote
 PKG_VERSION:=2.3

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

-PKG_SOURCE_URL:=@SF/keynote
+PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/

 PKG_MD5SUM:=b569066ac2ba1356c2112b118a7d74d0
 PKG_MD5SUM:=b569066ac2ba1356c2112b118a7d74d0

-PKG_CAT:=bzcat
-
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 
 include $(INCLUDE_DIR)/package.mk
 
 include $(INCLUDE_DIR)/package.mk

-include $(INCLUDE_DIR)/kernel.mk

 
 define Package/keynote
 
 define Package/keynote

-SECTION:=base
-CATEGORY:=Network
-DEPENDS:=@LINUX_2_6
-TITLE:=IPsec management tools
-DESCRIPTION:=IPsec management tools
-URL:=http://keynote.sourceforge.net/
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=@LINUX_2_6 +libopenssl
+  TITLE:=Simple and flexible trust-management system
+  URL:=http://www1.cs.columbia.edu/~angelos/keynote.html

 endef
 
 endef
 

-define Build/Configure
-$(call Build/Configure/Default,--enable-static --enable-shared,LDFLAGS="-L$(STAGING_DIR)/usr/lib")
+define Package/keynote/description
+ KeyNote is a simple and flexible trust-management system designed to work 
+ well for a variety of large- and small- scale Internet-based applications.
+ It provides a single, unified language for both local policies and 
+ credentials.

 endef
 
 endef
 

-define Build/Compile
-       $(call Build/Compile/Default,$(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               all)
-endef
+CONFIGURE_ARGS += \
+       --enable-static \
+       --enable-shared

 
 

-define Package/keynote/install
-       install -d -m0755 $(1)/usr/sbin
-       $(CP) $(PKG_BUILD_DIR)/keynote $(1)/usr/sbin/
-endef
+MAKE_FLAGS += \
+       CFLAGS="$(TARGET_CFLAGS)"

 
 define Build/InstallDev
 
 define Build/InstallDev

-       $(CP) $(PKG_BUILD_DIR)/*.h $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_BUILD_DIR)/libkeynote.a $(STAGING_DIR)/usr/lib/
+       mkdir -p $(1)/usr/include/keynote
+       $(CP) $(PKG_BUILD_DIR)/{assertion,header,keynote,signature}.h $(1)/usr/include/keynote/
+       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/libkeynote.a $(1)/usr/lib/

 endef
 
 define Build/UninstallDev
 endef
 
 define Build/UninstallDev

-       rm -rf $(STAGING_DIR)/usr/include/{assertion,getopt,header,keynote,signature}.h
+       rm -rf  $(1)/usr/include/keynote \
+               $(1)/usr/lib/libkeynote.a
+endef
+
+define Package/keynote/install
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/keynote $(1)/usr/sbin/

 endef
 
 $(eval $(call BuildPackage,keynote))
 endef
 
 $(eval $(call BuildPackage,keynote))