From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 May 2009 20:39:07 +0200
Subject: optimize ipkg package management

- generate ipkg control file from PKG_* variables
- automatically install init scripts from ./files/*.init
  set #PKG pkgname to set the binary package
- rename FWINIT -> INIT
- move postinst and conffiles meta data to ./files
- update the packages to the latest upstream version
- remove some unready or unused package (strongswan,..)

more cleanups needed after allmodconfig
---
 package/ruby/Makefile          | 10 +++++++---
 package/ruby/ipkg/ruby.control |  4 ----
 2 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 package/ruby/ipkg/ruby.control

(limited to 'package/ruby')

diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index b9ccceb8f..76d35b1ee 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -9,11 +9,14 @@ PKG_NAME:=		ruby
 PKG_VERSION:=		1.9.1-p129
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c71f413514ee6341c627be2957023a5c
-MASTER_SITES:=		ftp://ftp.ruby-lang.org/pub/ruby/1.9/
+PKG_DESCR:=		interpreter for the ruby language
+PKG_SECTION:=		net
+PKG_URL:=		http://www.ruby-lang.org
+PKG_SITES:=		ftp://ftp.ruby-lang.org/pub/ruby/1.9/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,RUBY,ruby,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,RUBY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 MAKE_FILE:=		GNUmakefile
 XAKE_FLAGS+=		optflags='' debugflags=''
@@ -30,8 +33,9 @@ post-configure:
 	echo "socket" >> ${WRKBUILD}/ext/Setup
 
 post-install:
+	${INSTALL_DIR} ${IDIR_RUBY}/usr
 	rm -rf ${WRKINST}/usr/lib/site_ruby
 	find ${WRKINST}/usr -name "*.h" -delete
-	cp -a ${WRKINST}/usr ${IDIR_RUBY}
+	${CP} ${WRKINST}/usr ${IDIR_RUBY}/usr
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ruby/ipkg/ruby.control b/package/ruby/ipkg/ruby.control
deleted file mode 100644
index 090143e3d..000000000
--- a/package/ruby/ipkg/ruby.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: ruby
-Priority: optional
-Section: admin
-Description: Ruby1.8 is the interpreter for the ruby language.
-- 
cgit v1.2.3