From fed4931572ca5a46b4f316184f3f8d357636fbfb Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 20 Dec 2009 11:25:09 +0100
Subject: add subpackage descriptions and make menu

pkgmaker should only be run by developers. takes to long otherwise.
generated Config.in data can be committed.
---
 Makefile         | 5 +++++
 mk/build.mk      | 4 ++++
 mk/package.mk    | 1 +
 package/pkgmaker | 5 +++--
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 093fb73e2..f1d49ed44 100644
--- a/Makefile
+++ b/Makefile
@@ -64,6 +64,8 @@ pkg-help:
 	@echo 'This does not automatically resolve package dependencies!'
 
 dev-help:
+	@echo 'Regenerate menu information via "make menu"'
+	@echo
 	@echo 'Fast way of updating package patches:'
 	@echo '  run "make package=<pkgname> clean" to start with a good base'
 	@echo '  run "make package=<pkgname> patch" to fetch, unpack and patch the source'
@@ -135,6 +137,9 @@ package_index: .prereq_done
 bulk: .prereq_done
 	@${GMAKE_INV} bulk
 
+menu: .prereq_done
+	@${GMAKE_INV} menu
+
 world: .prereq_done
 	@${GMAKE_INV} world
 
diff --git a/mk/build.mk b/mk/build.mk
index c1828599f..f70d40cb1 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -352,3 +352,7 @@ distclean:
 		${TOPDIR}/package/*/info.mk
 
 endif # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
+
+menu:
+	mksh $(TOPDIR)/package/pkgmaker
+
diff --git a/mk/package.mk b/mk/package.mk
index 7562b9e4f..c9d9c7978 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -149,6 +149,7 @@ define PKG_template
 ALL_PKGOPTS+=	$(1)
 PKGNAME_$(1)=	$(2)
 PKGDEPS_$(1)=	$(4)
+PKGDESC_$(1)=	$(5)
 IPKG_$(1)=	$(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX}
 IDIR_$(1)=	$(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)
 ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},)
diff --git a/package/pkgmaker b/package/pkgmaker
index 23e2a25a5..9d5b40761 100644
--- a/package/pkgmaker
+++ b/package/pkgmaker
@@ -53,7 +53,8 @@ for sd in */Makefile; do
 		while (( ${#xf} < 34 )); do
 			xf=$xf.
 		done
-		print "\tprompt \"$xf ${pd:-$pn}\""
+		desc=$($GMAKE show=PKGDESC_$xu)
+		print "\tprompt \"$xf ${desc:-${pd:-$pn}}\""
 		print \\ttristate
 		print \\tdefault n
 		deps=$($GMAKE show=PKGDEPS_$xu)
@@ -111,6 +112,6 @@ EOF
 		print \\thelp
 		print "\t  flavour ADK_PACKAGE_${dnu}_$pf"
 	done
-	) >Config.new
+	) >Config.in
 	cd ..
 done
-- 
cgit v1.2.3