From 05d0076d97ed69a531df1aa5cde3a1e6ed17f922 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 14 Sep 2010 19:04:46 +0200
Subject: replace mksh scripts with faster C programs

depmaker and pkgmaker is replaced by C programs. scan-pkgs.sh will be replaced
by another mechanism. scan-pkgs.sh is needed to recognize package flavour changes,
so that a package is rebuild.

Generation of meta-data is a lot faster now.

Fix or add new PKG variables to fulfill the needs of the new programs.
Documentation will follow as soon as it is stable.
---
 package/openssh/Makefile | 49 ++++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

(limited to 'package/openssh/Makefile')

diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 4e30924c3..1b89b4ae0 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -5,41 +5,46 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openssh
 PKG_VERSION:=		5.5p1
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		88633408f4cb1eb11ec7e2ec58b519eb
 PKG_DESCR:=		OpenSSH server
 PKG_SECTION:=		net/security
 PKG_DEPENDS:=		zlib libopenssl libpthread
-PKG_BUILDDEP+=		zlib openssl
-ifeq (${ADK_COMPILE_OPENSSH_WITH_KRB5},y)
-PKG_DEPENDS+=		libkrb5 libcom-err
-PKG_BUILDDEP+=		krb5
-endif
-ifeq (${ADK_COMPILE_OPENSSH_WITH_HEIMDAL},y)
-PKG_DEPENDS+=		libheimdal libcom-err
-PKG_BUILDDEP+=		heimdal
-endif
-PKG_URL:=		http://www.openssh.com
+PKG_BUILDDEP:=		zlib openssl
+PKG_URL:=		http://www.openssh.com/
 PKG_SITES:=		ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
 
-PKG_DESCR_CLIENT:=	OpenSSH client
-PKG_DESCR_CLIENT_UTILS:=OpenSSH client utilities
-PKG_DESCR_SFTP_CLIENT:=	OpenSSH sftp client
-PKG_DESCR_SFTP_SERVER:=	OpenSSH sftp server
+PKG_SUBPKGS:=		OPENSSH_SERVER OPENSSH_CLIENT OPENSSH_CLIENT_UTILS
+PKG_SUBPKGS+=		OPENSSH_SFTP_CLIENT OPENSSH_SFTP_SERVER
+PKGSD_OPENSSH_CLIENT:=		OpenSSH client
+PKGSD_OPENSSH_CLIENT_UTILS:=	OpenSSH client utilities
+PKGSD_OPENSSH_SFTP_CLIENT:=	OpenSSH sftp client
+PKGSD_OPENSSH_SFTP_SERVER:=	OpenSSH sftp server
+
+PKG_CHOICES:=		NOKRB WITH_KRB5 WITH_HEIMDAL
+PKGCD_NOKRB:=		no Kerberos support
+PKGCD_WITH_KRB5:=	with MIT Kerberos
+PKGCS_WITH_KRB5:=	libkrb5 libcom-err
+PKGCB_WITH_KRB5:=	krb5
+PKGCD_WITH_HEIMDAL:=	with Heimdal Kerberos
+PKGCS_WITH_HEIMDAL:=	libheimdal libcom-err
+PKGCB_WITH_HEIMDAL:=	heimdal
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,OPENSSH_SERVER,openssh-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,OPENSSH_CLIENT,openssh-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_CLIENT},${PKG_SECTION}))
-$(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_CLIENT_UTILS},${PKG_SECTION}))
-$(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SFTP_CLIENT},${PKG_SECTION}))
-$(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SFTP_SERVER},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH_CLIENT,openssh-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_OPENSSH_CLIENT},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_OPENSSH_CLIENT_UTILS},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_OPENSSH_SFTP_CLIENT},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_OPENSSH_SFTP_SERVER},${PKG_SECTION}))
 
-ifeq ($(ADK_COMPILE_OPENSSH_WITH_KERBEROS),y)
+ifeq ($(ADK_PACKAGE_OPENSSH_WITH_KRB5),y)
 CONFIGURE_ARGS+=	--with-kerberos5="${STAGING_DIR}/usr"
-else
-CONFIGURE_ARGS+=	--without-kerberos5
 endif
+ifeq ($(ADK_PACKAGE_OPENSSH_WITH_HEIMDAL),y)
+CONFIGURE_ARGS+=	--with-kerberos5="${STAGING_DIR}/usr"
+endif
+
 CONFIGURE_ENV+=		LD='${TARGET_CC}' \
 			ac_cv_func_setlogin=no \
 			ac_cv_lib_nsl_yp_match=no
-- 
cgit v1.2.3