OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 18-Jul-2003 14:59:35
Branch: HEAD Handle: 2003071813593302
Added files:
openpkg-src/lemon lemon.patch
Modified files:
openpkg-src/lemon lemon.spec
openpkg-web news.txt
Log:
replace varargs with stdarg
Summary:
Revision Changes Path
1.1 +46 -0 openpkg-src/lemon/lemon.patch
1.10 +5 -3 openpkg-src/lemon/lemon.spec
1.5643 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/lemon/lemon.patch
============================================================================
$ cvs diff -u -r0 -r1.1 lemon.patch
--- /dev/null 2003-07-18 14:59:35.000000000 +0200
+++ lemon.patch 2003-07-18 14:59:35.000000000 +0200
@@ -0,0 +1,46 @@
+--- lemon.c.dist 2003-07-18 14:52:02.000000000 +0200
++++ lemon.c 2003-07-18 14:56:02.000000000 +0200
+@@ -26,7 +26,7 @@
+ ** http://www.hwaci.com/drh/
+ */
+ #include <stdio.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include <string.h>
+ #include <ctype.h>
+
+@@ -89,7 +89,7 @@
+ void Configlist_reset(/* void */);
+
+ /********* From the file "error.h" ***************************************/
+-void ErrorMsg( /* char *, int, char *, ... */ );
++void ErrorMsg(char *, int, char *, ... );
+
+ /****** From the file "option.h" ******************************************/
+ struct s_options {
+@@ -1108,12 +1108,8 @@
+ #define ERRMSGSIZE 10000 /* Hope this is big enough. No way to error check */
+ #define LINEWIDTH 79 /* Max width of any output line */
+ #define PREFIXLIMIT 30 /* Max width of the prefix on each line */
+-void ErrorMsg(va_alist)
+-va_dcl
++void ErrorMsg(char *filename, int lineno, char *format, ...)
+ {
+- char *filename;
+- int lineno;
+- char *format;
+ char errmsg[ERRMSGSIZE];
+ char prefix[PREFIXLIMIT+10];
+ int errmsgsize;
+@@ -1122,10 +1118,7 @@
+ va_list ap;
+ int end, restart, base;
+
+- va_start(ap);
+- filename = va_arg(ap,char*);
+- lineno = va_arg(ap,int);
+- format = va_arg(ap,char*);
++ va_start(ap, format);
+ /* Prepare a prefix to be prepended to every output line */
+ if( lineno>0 ){
+ sprintf(prefix,"%.*s:%d: ",PREFIXLIMIT-10,filename,lineno);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lemon/lemon.spec
============================================================================
$ cvs diff -u -r1.9 -r1.10 lemon.spec
--- openpkg-src/lemon/lemon.spec 8 Jul 2003 14:40:25 -0000 1.9
+++ openpkg-src/lemon/lemon.spec 18 Jul 2003 12:59:35 -0000 1.10
@@ -33,18 +33,19 @@
Group: Language
License: GPL
Version: 1.0
-Release: 20020821
+Release: 20030718
# list of sources
Source0: http://www.hwaci.com/sw/lemon/lemon.c
Source1: http://www.hwaci.com/sw/lemon/lempar.c
Source2: http://www.hwaci.com/sw/lemon/lemon.html
+Patch0: lemon.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206
-PreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: OpenPKG, openpkg >= 20030717
+PreReq: OpenPKG, openpkg >= 20030717
AutoReq: no
AutoReqProv: no
@@ -56,6 +57,7 @@
%prep
%setup -T -c -n lemon-%{version}
cp %{SOURCE lemon.c} lemon.c
+ %patch -p0
%{l_shtool} subst \
-e 's;"lempar.c";"%{l_prefix}/share/lemon/lempar.c";g' \
lemon.c
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5642 -r1.5643 news.txt
--- openpkg-web/news.txt 18 Jul 2003 12:35:02 -0000 1.5642
+++ openpkg-web/news.txt 18 Jul 2003 12:59:33 -0000 1.5643
@@ -1,3 +1,4 @@
+18-Jul-2003: Upgraded package: P<lemon-1.0-20030718>
18-Jul-2003: Upgraded package: P<units-1.80-20030718>
18-Jul-2003: Upgraded package: P<proftpd-1.2.8-20030718>
18-Jul-2003: Upgraded package: P<prngd-0.9.27-20030718>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
