6 files changed, 62 insertions, 18 deletions
diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile
index b502d7bb5..1605298e1 100644
--- a/package/serdisplib/Makefile
+++ b/package/serdisplib/Makefile
@@ -6,18 +6,18 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		serdisplib
-PKG_VERSION:=		1.97.3
+PKG_VERSION:=		1.97.8
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		52e4714d6a955c4d023a5ae52b2d36d8
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=serdisplib/}
+PKG_MD5SUM:=		2aa91c43d01d2dfc9fbc1116e3063ae1
+PKG_URL:=		http://serdisplib.sourceforge.net
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=serdisplib/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,SERDISPLIB,serdisplib,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SERDISPLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-libusb
-CONFIGURE_ENV+=		ac_cv_func_malloc_0_nonnull=yes
 BUILD_STYLE:=		auto
 TCFLAGS+=		${TCPPFLAGS}
 
diff --git a/package/serdisplib/ipkg/serdisplib.control b/package/serdisplib/ipkg/serdisplib.control
deleted file mode 100644
index 3fcddcc70..000000000
--- a/package/serdisplib/ipkg/serdisplib.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: serdisplib
-Priority: optional
-Section: libs
-Description: A library for controlling displays 
diff --git a/package/serdisplib/patches/patch-Makefile_in b/package/serdisplib/patches/patch-Makefile_in
index 91ccdb872..a140feb5e 100644
--- a/package/serdisplib/patches/patch-Makefile_in
+++ b/package/serdisplib/patches/patch-Makefile_in
@@ -1,7 +1,7 @@
 $Id$
---- serdisplib-1.97.3.orig/Makefile.in	2006-03-25 23:58:20.000000000 +0100
-+++ serdisplib-1.97.3/Makefile.in	2007-02-21 23:28:24.000000000 +0100
-@@ -19,7 +19,7 @@ CC = @CC@
+--- serdisplib-1.97.8.orig/Makefile.in	2008-07-30 23:05:37.000000000 +0200
++++ serdisplib-1.97.8/Makefile.in	2009-05-30 18:04:39.430445031 +0200
+@@ -20,7 +20,7 @@ CC = @CC@
  MAKE=@MAKE@
  
  
diff --git a/package/serdisplib/patches/patch-configure b/package/serdisplib/patches/patch-configure
index aaf687695..b4ea718bd 100644
--- a/package/serdisplib/patches/patch-configure
+++ b/package/serdisplib/patches/patch-configure
@@ -1,7 +1,7 @@
 $Id$
---- serdisplib-1.97.3.orig/configure	2007-02-15 23:24:51.000000000 +0100
-+++ serdisplib-1.97.3/configure	2007-05-23 00:00:41.000000000 +0200
-@@ -2644,18 +2644,6 @@ echo "${ECHO_T}no" >&6
+--- serdisplib-1.97.8.orig/configure	2008-07-19 00:40:38.000000000 +0200
++++ serdisplib-1.97.8/configure	2009-05-30 18:04:39.526453915 +0200
+@@ -2661,18 +2661,6 @@ echo "${ECHO_T}no" >&6
  fi
  
  
diff --git a/package/serdisplib/patches/patch-src_Makefile_in b/package/serdisplib/patches/patch-src_Makefile_in
index 08a980b6a..ad9c6a9c7 100644
--- a/package/serdisplib/patches/patch-src_Makefile_in
+++ b/package/serdisplib/patches/patch-src_Makefile_in
@@ -1,7 +1,7 @@
 $Id$
---- serdisplib-1.97.3.orig/src/Makefile.in	2007-02-15 23:24:41.000000000 +0100
-+++ serdisplib-1.97.3/src/Makefile.in	2007-02-21 23:25:04.000000000 +0100
-@@ -75,7 +75,7 @@ endif
+--- serdisplib-1.97.8.orig/src/Makefile.in	2008-07-30 23:05:37.000000000 +0200
++++ serdisplib-1.97.8/src/Makefile.in	2009-05-30 18:04:39.534451861 +0200
+@@ -126,7 +126,7 @@ endif
  
  .SUFFIXES : .c .o
  
diff --git a/package/serdisplib/patches/patch-src_serdisp_control_c b/package/serdisplib/patches/patch-src_serdisp_control_c
new file mode 100644
index 000000000..f881ab3fe
--- /dev/null
+++ b/package/serdisplib/patches/patch-src_serdisp_control_c
@@ -0,0 +1,48 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- serdisplib-1.97.8.orig/src/serdisp_control.c	2008-07-30 01:04:44.000000000 +0200
++++ serdisplib-1.97.8/src/serdisp_control.c	2009-05-30 18:07:14.100111588 +0200
+@@ -450,7 +450,7 @@ serdisp_t* serdisp_init(serdisp_CONN_t* 
+   }
+ 
+   if (found) {
+-    char* idxpos = index(patternptr, '=');
++    char* idxpos = strchr(patternptr, '=');
+     int keylen = patternlen;
+ 
+     /* '=' found and position not outside patternlen? */
+@@ -568,7 +568,7 @@ serdisp_t* serdisp_init(serdisp_CONN_t* 
+   * \since   1.98
+   */
+ long serdisp_getversioncode(void) {
+-  return (long) SERDISP_VERSION_CODE;
++  return (long)SERDISP_VERSION_CODE;
+ }
+ 
+ 
+@@ -1831,7 +1831,7 @@ int serdisp_setupwirings(serdisp_t* dd, 
+   while( (patternptr = sdtools_nextpattern(patternptr, ',', &patternlen, &patternborder)) ) {
+     char* valueptr = 0;
+     int valuelen = 0;
+-    char* idxpos = index(patternptr, ':');
++    char* idxpos = strchr(patternptr, ':');
+     int keylen = patternlen;
+     
+     int tabidxkey = 0, tabidxvalue;
+@@ -2003,7 +2003,7 @@ int serdisp_setupoptions(serdisp_t* dd, 
+     while( (optionptr = sdtools_nextpattern(optionptr, ';', &optionlen, &optionborder)) ) {
+       char* valueptr = 0;
+       int valuelen = 0;
+-      char* idxpos = index(optionptr, '=');
++      char* idxpos = strchr(optionptr, '=');
+       int keylen = optionlen;
+ 
+       int stdoptidx;   /* index of an option found in standard options */
+@@ -2072,7 +2072,7 @@ int serdisp_setupoptions(serdisp_t* dd, 
+           int definefound = 0;
+ 
+           while( !definefound && (defineptr = sdtools_nextpattern(defineptr, ',', &definelen, &defineborder)) ) {
+-            char* defineidxpos = index(defineptr, '=');
++            char* defineidxpos = strchr(defineptr, '=');
+             int definekeylen = definelen;
+             char* definevalueptr = 0;
+             int definevaluelen = 0;