OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   13-Jan-2007 09:22:28
  Branch: HEAD                             Handle: 2007011308222800

  Modified files:
    openpkg-src/ratbox      ratbox.patch ratbox.spec

  Log:
    workaround Solaris configure-time problems (Solaris /bin/sh's internal
    test(1) doesn't know how to handle option '-e')

  Summary:
    Revision    Changes     Path
    1.28        +46 -16     openpkg-src/ratbox/ratbox.patch
    1.45        +1  -1      openpkg-src/ratbox/ratbox.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/ratbox/ratbox.patch
  ============================================================================
  $ cvs diff -u -r1.27 -r1.28 ratbox.patch
  --- openpkg-src/ratbox/ratbox.patch   8 Jan 2007 13:10:00 -0000       1.27
  +++ openpkg-src/ratbox/ratbox.patch   13 Jan 2007 08:22:28 -0000      1.28
  @@ -1,7 +1,7 @@
   Index: ircd-ratbox-2.2.4/modules/Makefile.in
  ---- ircd-ratbox-2.2.4/modules/Makefile.in.orig       2005-01-14 18:25:51 
+0100
  -+++ ircd-ratbox-2.2.4/modules/Makefile.in    2005-04-13 15:30:42 +0200
  -@@ -182,7 +182,7 @@
  +--- ircd-ratbox-2.2.4/modules/Makefile.in.orig       2006-01-07 20:44:44 
+0100
  ++++ ircd-ratbox-2.2.4/modules/Makefile.in    2007-01-13 09:19:25 +0100
  +@@ -186,7 +186,7 @@
        ${CC} ${CPPFLAGS} ${CFLAGS} -DMODNAME=`basename $< .c`_mheader -c $< -o 
$@
    
    .c.so:
  @@ -10,21 +10,9 @@
    
    .so.sl:
        $(LD) -b $< -o $@
  -Index: ratbox-services-1.1.0/include/config.h
  ---- ratbox-services-1.1.0/include/config.h.orig      2005-05-23 17:01:31 
+0200
  -+++ ratbox-services-1.1.0/include/config.h   2005-05-23 19:30:44 +0200
  -@@ -9,7 +9,7 @@
  - #define PID_PATH    RUNDIR "/ratbox-services.pid"
  - #define LOG_PATH    LOGDIR "/ratbox-services.log"
  - #define HELP_PATH       HELPDIR
  --#define DB_PATH             SYSCONFDIR "/ratbox-services.db"
  -+#define DB_PATH             RUNDIR "/ratbox-services.db"
  - 
  - /* SMALL_NETWORK
  -  * If your network is fairly small, enable this to save some memory.
   Index: ratbox-respond-1.0/ratbox-respond/configure
   --- ratbox-respond-1.0/ratbox-respond/configure.orig 2006-01-11 22:52:17 
+0100
  -+++ ratbox-respond-1.0/ratbox-respond/configure      2006-05-07 08:55:33 
+0200
  ++++ ratbox-respond-1.0/ratbox-respond/configure      2007-01-13 09:19:25 
+0100
   @@ -2889,8 +2889,6 @@
    fi
    
  @@ -34,3 +22,45 @@
    
    echo "$as_me:$LINENO: checking for OpenSSL" >&5
    echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6
  +Index: ratbox-services-1.1.0/configure
  +--- ratbox-services-1.1.0/configure.orig     2006-07-17 20:17:32 +0200
  ++++ ratbox-services-1.1.0/configure  2007-01-13 09:20:07 +0100
  +@@ -2464,7 +2464,7 @@
  + 
  +     echo $ac_n "checking for -lsqlite3 in given path""... $ac_c" 1>&6
  + echo "configure:2467: checking for -lsqlite3 in given path" >&5
  +-    if test -e "$ac_cv_sqlite3_path/lib/libsqlite3.so"; then
  ++    if test -f "$ac_cv_sqlite3_path/lib/libsqlite3.a"; then
  +             echo "$ac_t""yes" 1>&6
  +             ac_cv_found_sqlite3_lib="yes"
  +     else
  +@@ -2571,7 +2571,7 @@
  + 
  +     echo $ac_n "checking for -lmysqlclient in given path""... $ac_c" 1>&6
  + echo "configure:2574: checking for -lmysqlclient in given path" >&5
  +-    if test -e "$ac_cv_mysql_path/lib/libmysqlclient.so"; then
  ++    if test -f "$ac_cv_mysql_path/lib/libmysqlclient.a"; then
  +             echo "$ac_t""yes" 1>&6
  +             ac_cv_found_mysql_lib="yes"
  +     else
  +@@ -2734,7 +2734,7 @@
  + 
  +     echo $ac_n "checking for -lpq in given path""... $ac_c" 1>&6
  + echo "configure:2737: checking for -lpq in given path" >&5
  +-    if test -e "$ac_cv_pgsql_path/lib/libpq.so"; then
  ++    if test -f "$ac_cv_pgsql_path/lib/libpq.a"; then
  +             echo "$ac_t""yes" 1>&6
  +             ac_cv_found_pgsql_lib="yes"
  +     else
  +Index: ratbox-services-1.1.0/include/config.h
  +--- ratbox-services-1.1.0/include/config.h.orig      2007-01-07 20:54:34 
+0100
  ++++ ratbox-services-1.1.0/include/config.h   2007-01-13 09:19:25 +0100
  +@@ -9,7 +9,7 @@
  + #define PID_PATH    RUNDIR "/ratbox-services.pid"
  + #define LOG_PATH    LOGDIR "/ratbox-services.log"
  + #define HELP_PATH       HELPDIR
  +-#define DB_PATH             SYSCONFDIR "/ratbox-services.db"
  ++#define DB_PATH             RUNDIR "/ratbox-services.db"
  + 
  + /* SMALL_NETWORK
  +  * If your network is fairly small, enable this to save some memory.
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ratbox/ratbox.spec
  ============================================================================
  $ cvs diff -u -r1.44 -r1.45 ratbox.spec
  --- openpkg-src/ratbox/ratbox.spec    8 Jan 2007 13:59:00 -0000       1.44
  +++ openpkg-src/ratbox/ratbox.spec    13 Jan 2007 08:22:28 -0000      1.45
  @@ -38,7 +38,7 @@
   Group:        InstantMessaging
   License:      GPL
   Version:      %{V_server}
  -Release:      20070108
  +Release:      20070113
   
   #   list of sources
   Source0:      
ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/ircd-ratbox-%{V_server}.tgz
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to