From: Nicolas Thill <nico@openwrt.org>
Date: Sat, 23 Sep 2006 13:59:21 +0000 (+0000)
Subject: standardize Makefile, change section from base to libs and utils, add detailed descri... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c1391b0713da55c36e4a51560605c5018dccd3bf;p=openwrt%2Fstaging%2Fwigyori.git

standardize Makefile, change section from base to libs and utils, add detailed descriptions

SVN-Revision: 4829
---

diff --git a/openwrt/package/openssl/Makefile b/openwrt/package/openssl/Makefile
index 3f60dcfbfe..4b7995af4a 100644
--- a/openwrt/package/openssl/Makefile
+++ b/openwrt/package/openssl/Makefile
@@ -11,55 +11,72 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=openssl
 PKG_VERSION:=0.9.8b
 PKG_RELEASE:=1
-PKG_MD5SUM:=12cedbeb6813a0d7919dbf1f82134b86
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.openssl.org/source/ \
 	ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \
 	ftp://ftp.webmonster.de/pub/openssl/source/ \
 	ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=12cedbeb6813a0d7919dbf1f82134b86
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-rmd160 no-aes192
-OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-krb5 no-threads zlib-dynamic no-engines
-
 include $(INCLUDE_DIR)/package.mk
 
+define Package/openssl/Default
+  TITLE:=Open source SSL toolkit
+  DESCRIPTION:=\
+	The OpenSSL Project is a collaborative effort to develop a robust, \\\
+	commercial-grade, full-featured, and Open Source toolkit implementing the \\\
+	Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) \\\
+	protocols as well as a full-strength general purpose cryptography library.
+  URL:=http://www.openssl.org/
+endef
+
 define Package/libopenssl
-SECTION:=base
-CATEGORY:=Libraries
-TITLE:=Open source SSL libraries
-DEPENDS:=+zlib
-DESCRIPTION:=Open source SSL (Secure Socket Layer) libraries
-URL:=http://www.openssl.org/
+  $(call Package/openssl/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+zlib
+  TITLE+= (libraries)
+  DESCRIPTION+=\\\
+	\\\
+	This package contains the OpenSSL shared libraries, needed by other \\\
+	programs.
 endef
 
 define Package/openssl-util
-$(call Package/libopenssl)
-DEPENDS:=libopenssl
-TITLE:=OpenSSL command line utilities
-DESCRIPTION:=OpenSSL command line utilities
+  $(call Package/openssl/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libopenssl
+  TITLE+= (utility)
+  DESCRIPTION+=\\\
+	\\\
+	This package contains the OpenSSL command-line utility.
 endef
 
 define Package/openssl-util/conffiles
 /etc/ssl/openssl.cnf
 endef
 
+OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-rmd160 no-aes192
+OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-krb5 no-threads zlib-dynamic no-engines
+
 define Build/Configure
 	$(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' $(PKG_BUILD_DIR)/Configure
 	$(SED) s/OPENWRT_OPTIMIZATION_FLAGS/$(BR2_TARGET_OPTIMIZATION)/g $(PKG_BUILD_DIR)/Configure
 	(cd $(PKG_BUILD_DIR); \
 		./Configure linux-openwrt \
-		  --prefix=/usr \
-		  --openssldir=/etc/ssl \
-		  -I$(STAGING_DIR)/usr/include \
-		  -L$(STAGING_DIR)/usr/lib -ldl \
-		  -DOPENSSL_SMALL_FOOTPRINT \
-		  $(OPENSSL_NO_CIPHERS) \
-		  $(OPENSSL_OPTIONS) \
+			--prefix=/usr \
+			--openssldir=/etc/ssl \
+			-I$(STAGING_DIR)/usr/include \
+			-L$(STAGING_DIR)/usr/lib -ldl \
+			-DOPENSSL_SMALL_FOOTPRINT \
+			$(OPENSSL_NO_CIPHERS) \
+			$(OPENSSL_OPTIONS) \
 	)
 endef
 
@@ -91,9 +108,10 @@ define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(STAGING_DIR)/usr/lib/
 endef
-	
+
 define Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/include/openssl \
+	rm -rf \
+		$(STAGING_DIR)/usr/include/openssl \
 		$(STAGING_DIR)/usr/lib/lib{crypto,ssl}.{a,so*}
 endef