From 75501a06c2e6b3df982ff3fa03dab9ecc16c9c2f Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sun, 20 Dec 2009 18:26:02 +0059
Subject: =?UTF-8?q?optional=20per-subpackage=20default=20other=20than=20?=
 =?UTF-8?q?=E2=80=98n=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 package/cfgfs/Makefile    | 2 ++
 package/dropbear/Makefile | 2 ++
 package/pkgmaker          | 6 ++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 17ab5e6a7..8a0454e07 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -16,6 +16,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+PKGDFLT_CFGFS=		y
+
 BUILD_STYLE:=		auto
 
 do-configure:
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 22a5680ac..43a157700 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -20,6 +20,8 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
 
+PKGDFLT_DROPBEAR:=	y if !ADK_TOOLCHAIN_ONLY
+
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-pam \
 			--enable-openpty \
diff --git a/package/pkgmaker b/package/pkgmaker
index d27045a27..56c1565fc 100644
--- a/package/pkgmaker
+++ b/package/pkgmaker
@@ -54,11 +54,12 @@ for dn in */Makefile; do
 	# PKGNAME_*: subpackage (ipkg) package name, by subpackage option
 	# PKGDESC_*: subpackage description, by subpackage option
 	# PKGDEPS_*: subpackage depends on ipkg packages, by subpkg option
+	# PKGDFLT_*: subpackage 'default {:-n}', by subpackage option
 	# CFLINE_*: one free-format Config.in line per subpackage option
 	# PKGFD_*: flavour description, per package flavour option
 	eval $($GMAKE dump="PKG_NAME PKG_FLAVOURS PKG_DESCR PKG_URL PKG_CXX \
 	    ALL_PKGOPTS \$(foreach x,\${ALL_PKGOPTS},PKGNAME_\${x} \
-	    PKGDESC_\${x} PKGDEPS_\${x} CFLINE_\${x}) \
+	    PKGDESC_\${x} PKGDEPS_\${x} PKGDFLT_\${x} CFLINE_\${x}) \
 	    \$(foreach x,\${PKG_FLAVOURS},PKGFD_\${x})")
 
 	# dnu: directory name, uppercase, y/-+/_X/
@@ -100,6 +101,7 @@ for dn in */Makefile; do
 		eval desc=\$PKGDESC_$spcu	# desc: subpackage description
 		: ${desc:=$PKG_DESCR}		# take from main pkg if empty
 		eval deps=\$PKGDEPS_$spcu	# deps: subpackage dependencies
+		eval dflt=\$PKGDFLT_$spcu	# dflt: config 'default' opt.
 		eval xline=\$CFLINE_$spcu	# xline: one free-format line
 
 		if [[ $spcu = LIB* ]]; then
@@ -120,7 +122,7 @@ for dn in */Makefile; do
 		fi
 		print -u$h "\tprompt \"$spnf\""
 		print -u$h \\ttristate
-		print -u$h \\tdefault n
+		print -u$h "\tdefault ${dflt:-n}"
 		for dep in $deps; do		# dep: ipkg name of one rundep.
 			# skip dependencies on uclibc++ and libstdcxx iff
 			# we produce these automatically
-- 
cgit v1.2.3