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/libcli/Makefile               | 12 +++++++-----
 package/libcli/ipkg/libcli.control    |  5 -----
 package/libcli/patches/patch-Makefile | 20 +++++++++-----------
 3 files changed, 16 insertions(+), 21 deletions(-)
 delete mode 100755 package/libcli/ipkg/libcli.control

(limited to 'package/libcli')

diff --git a/package/libcli/Makefile b/package/libcli/Makefile
index 025ed48b1..ba99e764f 100755
--- a/package/libcli/Makefile
+++ b/package/libcli/Makefile
@@ -6,15 +6,17 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libcli
-PKG_VERSION:=		1.8.6
+PKG_VERSION:=		1.9.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		fde7103a3771f550bfd366ee3ca1ef53
-
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=libcli/}
+PKG_MD5SUM:=		b917617d21b90db214971efe64a33416
+PKG_DESCR:=		Cisco-like command-line interface library
+PKG_SECTION:=		libs
+PKG_URL:=		http://code.google.com/p/libcli
+PKG_SITES:=		http://libcli.googlecode.com/files/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBCLI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBCLI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
diff --git a/package/libcli/ipkg/libcli.control b/package/libcli/ipkg/libcli.control
deleted file mode 100755
index 6ef456b59..000000000
--- a/package/libcli/ipkg/libcli.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: libcli
-Section: libs
-Architecture: mipsel
-Priority: optional
-Description: Provides a shared library for including a Cisco-like command-line interface into other software. 
\ No newline at end of file
diff --git a/package/libcli/patches/patch-Makefile b/package/libcli/patches/patch-Makefile
index 26f11e041..03c26c349 100644
--- a/package/libcli/patches/patch-Makefile
+++ b/package/libcli/patches/patch-Makefile
@@ -1,23 +1,21 @@
-$Id$
-allow CFLAGS overwrite, change some defaults
---- libcli-1.8.6.orig/Makefile	2006-03-07 00:13:11.000000000 +0100
-+++ libcli-1.8.6/Makefile	2007-01-07 21:27:49.000000000 +0100
-@@ -1,14 +1,14 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- libcli-1.9.4.orig/Makefile	2008-10-09 04:38:01.000000000 +0200
++++ libcli-1.9.4/Makefile	2009-05-29 17:42:04.310095050 +0200
+@@ -1,15 +1,12 @@
  DESTDIR =
 -PREFIX = /usr/local
 +PREFIX = /usr
  
  MAJOR = 1
- MINOR = 8
- REVISION = 6
+ MINOR = 9
+ REVISION = 3
  LIB = libcli.so
  
 -CC = gcc
 -DEBUG = -g
 -OPTIM = -O3
-+#CC := gcc
-+#DEBUG = -g
-+#OPTIM = -O3
- CFLAGS += $(DEBUG) $(OPTIM) -Wall -Wformat-security -Wno-format-zero-length
+-CFLAGS += $(DEBUG) $(OPTIM) -Wall -Wformat-security -Wno-format-zero-length
++CFLAGS += -Wall -Wformat-security -Wno-format-zero-length
  LDFLAGS += -shared -Wl,-soname,$(LIB).$(MAJOR).$(MINOR)
  LIBPATH += -L.
+ LIBS = -lcrypt
-- 
cgit v1.2.3