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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   16-Feb-2003 10:18:16
  Branch: OPENPKG_1_STABLE                 Handle: 2003021609181500

  Modified files:           (Branch: OPENPKG_1_STABLE)
    openpkg-src/postgresql  pg_migrate postgresql.spec rc.postgresql

  Log:
    MFC: mass merge all packaging fixes

  Summary:
    Revision    Changes     Path
    1.2.2.1     +6  -4      openpkg-src/postgresql/pg_migrate
    1.31.2.2    +160 -84    openpkg-src/postgresql/postgresql.spec
    1.2.4.1     +3  -2      openpkg-src/postgresql/rc.postgresql
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/postgresql/pg_migrate
  ============================================================================
  $ cvs diff -u -r1.2 -r1.2.2.1 pg_migrate
  --- openpkg-src/postgresql/pg_migrate 30 Dec 2002 22:06:16 -0000      1.2
  +++ openpkg-src/postgresql/pg_migrate 16 Feb 2003 09:18:15 -0000      1.2.2.1
  @@ -28,6 +28,8 @@
   l_prefix="@l_prefix@"
   l_rusr="@l_rusr@"
   l_rgrp="@l_rgrp@"
  +l_pguser="@l_pguser@"
  +l_pgpass="@l_pgpass@"
   
   #   establish sane environment
   LC_CTYPE=C
  @@ -77,7 +79,7 @@
   
           echo "++ dumping all databases into 
$l_prefix/var/postgresql/db.dump.sql.bz2"
           $l_prefix/bin/pg_dumpall \
  -            -U postgresql -Spostgresql -o -Xuse-set-session-authorization |\
  +            -U $l_pguser -S$l_pgpass -o -Xuse-set-session-authorization |\
               $l_prefix/lib/openpkg/bzip2 -9 \
                   >$l_prefix/var/postgresql/db.dump.sql.bz2
           chown ${l_rusr}:${l_rgrp} $l_prefix/var/postgresql/db.dump.sql.bz2
  @@ -134,8 +136,8 @@
   
           su - ${l_rusr} -c \
               "LC_CTYPE=C; export LC_CTYPE; umask 022; \
  -            (echo 'postgresql'; echo 'postgresql') |\
  -            $l_prefix/bin/pg_initdb -U postgresql -W -D 
$l_prefix/var/postgresql/db" 2>&1 |\
  +            (echo $l_pguser; echo $l_pgpass) |\
  +            $l_prefix/bin/pg_initdb -U $l_pguser -W -D $l_prefix/var/postgresql/db" 
2>&1 |\
                   $l_prefix/lib/openpkg/shtool prop \
                       -p "++ creating new database data"
   
  @@ -163,7 +165,7 @@
           echo "++ restoring all databases from 
$l_prefix/var/postgresql/db.dump.sql.bz2"
           $l_prefix/lib/openpkg/bzip2 -c -d \
               $l_prefix/var/postgresql/db.dump.sql.bz2 |\
  -                $l_prefix/bin/psql -U postgresql -d template1 2>&1 |\
  +                $l_prefix/bin/psql -U $l_pguser -d template1 2>&1 |\
                       tee $l_prefix/var/postgresql/db.log |\
                           $l_prefix/lib/openpkg/shtool prop \
                               -p "++ restoring data (see 
$l_prefix/var/postgresql/db.log)"
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/postgresql/postgresql.spec
  ============================================================================
  $ cvs diff -u -r1.31.2.1 -r1.31.2.2 postgresql.spec
  --- openpkg-src/postgresql/postgresql.spec    18 Jan 2003 14:14:10 -0000      
1.31.2.1
  +++ openpkg-src/postgresql/postgresql.spec    16 Feb 2003 09:18:15 -0000      
1.31.2.2
  @@ -24,8 +24,11 @@
   ##
   
   #   package versions
  -%define       V_postgresql  7.3.1
  -%define       V_libpqxx     4.0
  +%define       V_postgresql      7.3.1
  +%define       V_libpqpp         4.0
  +%define       V_libpqxx         1.4.1
  +%define       V_pgperl          2.0.2
  +%define       V_psqlodbc        7.2.5
   
   #   package information
   Name:         postgresql
  @@ -37,40 +40,36 @@
   Group:        Database
   License:      GPL
   Version:      %{V_postgresql}
  -Release:      1.20030103
  +Release:      1.20030216
   
   #   package options
  -%option       with_openssl  no
  -%option       with_odbc     no
  +%option       with_cxx      no
   %option       with_perl     no
  -%option       with_tcl      no
  +%option       with_odbc     no
  +%option       with_compat   no
   
   #   list of sources
   Source0:      
ftp://ftp.postgresql.org/pub/source/v%{V_postgresql}/postgresql-%{V_postgresql}.tar.gz
  -Source1:      
ftp://gborg.postgresql.org/pub/libpqpp/stable/libpq++-%{V_libpqxx}.tar.gz
  -Source2:      rc.postgresql
  -Source3:      pg_migrate
  +Source1:      
ftp://gborg.postgresql.org/pub/libpqpp/stable/libpq++-%{V_libpqpp}.tar.gz
  +Source2:      
ftp://gborg.postgresql.org/pub/libpqxx/stable/libpqxx-%{V_libpqxx}.tar.gz
  +Source3:      ftp://gborg.postgresql.org/pub/pgperl/stable/pgperl-%{V_pgperl}.tar.gz
  +Source4:      
ftp://ftp.us.postgresql.org/odbc/versions/src/psqlodbc-%{V_psqlodbc}.tar.gz
  +Source5:      rc.postgresql
  +Source6:      pg_migrate
   
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 1.20030103, make, gcc, readline, flex, bison, zlib
  +BuildPreReq:  OpenPKG, openpkg >= 1.20030103, make, gcc, readline, flex, bison, 
zlib, openssl
   PreReq:       OpenPKG, openpkg >= 1.20030103
  -%if "%{with_openssl}" == "yes"
  -BuildPreReq:  openssl
  +%if "%{with_perl}" == "yes"
  +BuildPreReq:  perl, perl-openpkg
  +PreReq:       perl, perl-openpkg
   %endif
   %if "%{with_odbc}" == "yes"
   BuildPreReq:  unixodbc
   PreReq:       unixodbc
   %endif
  -%if "%{with_perl}" == "yes"
  -BuildPreReq:  perl
  -PreReq:       perl
  -%endif
  -%if "%{with_tcl}" == "yes"
  -BuildPreReq:  tcl
  -PreReq:       tcl
  -%endif
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -82,58 +81,52 @@
   
   %prep
       %setup0 -q
  +%if "%{with_cxx}" == "yes"
       %setup1 -q -T -D -a 1
  +    %setup2 -q -T -D -a 2
  +%endif
  +%if "%{with_perl}" == "yes"
  +    %setup3 -q -T -D -a 3
  +%endif
  +%if "%{with_odbc}" == "yes"
  +    %setup4 -q -T -D -a 4
  +%endif
  +
  +    #   adjust source tree
       %{l_shtool} subst \
           -e 
's;\(#define.*DEFAULT_PGSOCKET_DIR[^"]*"\)/tmp\("\);\1%{l_prefix}/var/postgresql/run\2;'
 \
           src/include/pg_config.h.in
  -    case "%{l_target}" in
  -        *-solaris* )
  -            %{l_shtool} subst \
  -                -e 's;^\(sqlmansect *=\).*$;\1 7;' \
  -                src/makefiles/Makefile.solaris
  -            ;;
  -    esac
  +    %{l_shtool} subst \
  +        -e 's;^\(sqlmansect *=\).*$;\1 7;' \
  +        src/makefiles/Makefile.solaris
  +    %{l_shtool} subst \
  +        -e 's;$(INSTALL_SHLIB);#$(INSTALL_SHLIB);g' \
  +        src/backend/utils/mb/conversion_procs/proc.mk
   
   %build
       #   configure package
  -    CC="%{l_cc}"; export CC
  -    CFLAGS="%{l_cflags -O}"; export CFLAGS
  -    CPPFLAGS="%{l_cppflags}"; export CPPFLAGS
  -    LDFLAGS="%{l_ldflags}"; export LDFLAGS
  -%if "%{with_odbc}" == "yes"
  -%endif
  -%if "%{with_tcl}" == "yes"
  -    CFLAGS="$CFLAGS -I%{l_prefix}/include/tcl"
  -    LDFLAGS="$LDFLAGS -L%{l_prefix}/lib"
  -%endif
  +    CC="%{l_cc}" \
  +    CFLAGS="%{l_cflags -O}" \
  +    CPPFLAGS="%{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix} \
  -%if "%{with_openssl}" == "yes"
           --with-openssl=%{l_prefix} \
  -%endif
  -%if "%{with_odbc}" == "yes"
  -        --enable-odbc \
  -        --with-unixodbc \
  -        --with-odbcinst=%{l_prefix}/etc/unixodbc \
  -%endif
  -%if "%{with_perl}" == "yes"
  -        --with-perl \
  -%endif
  -%if "%{with_tcl}" == "yes"
  -        --with-tcl \
  -%endif
  -        --without-CXX \
  -        --disable-syslog
  +        --with-readline \
  +        --with-zlib \
  +        --disable-syslog \
  +        --disable-shared
   
       #   build package
       %{l_make} %{l_mflags -O}
   
  -    #   build libpq++ (C++ bindings)
  -    ( cd libpq++-%{V_libpqxx}
  +    #   build C++ bindings (both old and new one)
  +%if "%{with_cxx}" == "yes"
  +    ( cd libpq++-%{V_libpqpp}
         CXX="%{l_cxx}"
         CFLAGS="%{l_cflags -O}"
         CPPFLAGS="-DHAVE_NAMESPACE_STD -DHAVE_CXX_STRING_HEADER -DDLLIMPORT= "
  -      CPPFLAGS="$CPPFLAGS -I. -I../src/interfaces -I../src/interfaces/libpq "
  +      CPPFLAGS="$CPPFLAGS -I. -I../src/interfaces/libpq -I../src/interfaces"
         CPPFLAGS="$CPPFLAGS -I../src/include %{l_cppflags}"
         LDFLAGS="%{l_ldflags}"
         OBJS="pgconnection.o pgdatabase.o pgtransdb.o pgcursordb.o pglobject.o"
  @@ -143,9 +136,62 @@
         rm -f libpq++.a
         ar rc libpq++.a $OBJS
       )
  +    ( cd libpqxx-%{V_libpqxx}
  +      export CC="%{l_cc}"
  +      export CXX="%{l_cxx}"
  +      export CFLAGS="%{l_cflags -O}"
  +      export CXXFLAGS="%{l_cxxflags -O}"
  +      export CPPFLAGS="-I`pwd`/../src/include %{l_cppflags}"
  +      export LDFLAGS="%{l_ldflags}"
  +      export LIBS="-lssl -lcrypto -lcrypt"
  +      ./configure \
  +          --with-postgres-lib=`pwd`/../src/interfaces/libpq \
  +          --with-postgres-include=`pwd`/../src/interfaces/libpq \
  +          --disable-shared
  +      %{l_make} %{l_mflags -O}
  +    )
  +%endif
  +
  +    #   build Perl bindings
  +%if "%{with_perl}" == "yes"
  +    rm -rf $RPM_BUILD_ROOT
  +    ( cd Pg-%{V_pgperl}
  +      %{l_prefix}/bin/perl-openpkg prolog
  +      export POSTGRES_INCLUDE=dummy
  +      export POSTGRES_LIB=dummy
  +      %{l_shtool} subst \
  +          -e 's;-I$POSTGRES_INCLUDE;-I../src/interfaces/libpq -I../src/include;' \
  +          -e 's;-L$POSTGRES_LIB;-L../src/interfaces/libpq;' \
  +          -e 's;-lpq;-lpq %{l_ldflags} -lssl -lcrypto -lcrypt;' \
  +          Makefile.PL
  +      %{l_prefix}/bin/perl-openpkg install
  +      %{l_prefix}/bin/perl-openpkg epilog
  +    )
  +%endif
  +
  +    #   build ODBC driver
  +%if "%{with_odbc}" == "yes"
  +    ( cd psqlodbc-%{V_psqlodbc}
  +      export CC="%{l_cc}"
  +      export CXX="%{l_cxx}"
  +      export CFLAGS="%{l_cflags -O}"
  +      export CXXFLAGS="%{l_cxxflags -O}"
  +      export CPPFLAGS="-I`pwd`/../src/include"
  +      CPPFLAGS="$CPPFLAGS -I`pwd`/../src/interfaces -I`pwd`/../src/interfaces/libpq"
  +      CPPFLAGS="$CPPFLAGS %{l_cppflags}"
  +      export LDFLAGS="-L`pwd`/../src/interfaces/libpq %{l_ldflags}"
  +      ./configure \
  +          --prefix=%{l_prefix} \
  +          --with-unixodbc \
  +          --with-odbcinst=%{l_prefix}/etc/unixodbc
  +      %{l_make} %{l_mflags -O}
  +    )
  +%endif
   
   %install
  +%if "%{with_perl}" != "yes"
       rm -rf $RPM_BUILD_ROOT
  +%endif
   
       #   perform standard installation procedure
       %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
  @@ -156,16 +202,20 @@
       rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/pgaccess.1
       rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/pgtclsh.1
       rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/pgtksh.1
  -    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.so*
   
       #   namespace adjustments to installation
       for prog in \
           createdb createlang createuser dropdb droplang \
           dropuser initdb initlocation ipcclean vacuumdb; do
  -        mv $RPM_BUILD_ROOT%{l_prefix}/bin/$prog \
  -           $RPM_BUILD_ROOT%{l_prefix}/bin/pg_$prog
  -        mv $RPM_BUILD_ROOT%{l_prefix}/man/man1/$prog.1 \
  -           $RPM_BUILD_ROOT%{l_prefix}/man/man1/pg_$prog.1
  +%if "%{with_compat}" == "yes"
  +        cmd="ln"
  +%else
  +        cmd="mv"
  +%endif
  +        $cmd $RPM_BUILD_ROOT%{l_prefix}/bin/$prog \
  +             $RPM_BUILD_ROOT%{l_prefix}/bin/pg_$prog
  +        $cmd $RPM_BUILD_ROOT%{l_prefix}/man/man1/$prog.1 \
  +             $RPM_BUILD_ROOT%{l_prefix}/man/man1/pg_$prog.1
       done
       ( cd $RPM_BUILD_ROOT%{l_prefix}/man/man7
         for man in *.7; do
  @@ -173,29 +223,31 @@
         done
       )
   
  -    #   optionally install pgAccess startup wrapper
  -%if "%{with_tcl}" == "yes"
  -    ( LD_LIBRARY_PATH=%{l_prefix}/lib:$LD_LIBRARY_PATH
  -      %{l_prefix}/share/postgresql/pgaccess/main.tcl ${1+"$@"}
  -    ) >$RPM_BUILD_ROOT%{l_prefix}/bin/pgaccess
  -    chmod 755 $RPM_BUILD_ROOT%{l_prefix}/bin/pgaccess
  -%endif
  -
       #   create additional directories
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/var/postgresql/db \
           $RPM_BUILD_ROOT%{l_prefix}/var/postgresql/run
   
       #   install migration utility
  +%if "%{with_compat}" == "yes"
  +    l_pguser="postgres"
  +    l_pgpass="postgres"
  +%else
  +    l_pguser="postgresql"
  +    l_pgpass="postgresql"
  +%endif
       %{l_shtool} install -c -m 755 \
           -e 's;@l_prefix@;%{l_prefix};g' \
           -e 's;@l_rusr@;%{l_rusr};g' \
           -e 's;@l_rgrp@;%{l_rgrp};g' \
  +        -e "s;@l_pguser@;${l_pguser};g" \
  +        -e "s;@l_pgpass@;${l_pgpass};g" \
           %{SOURCE pg_migrate} \
           $RPM_BUILD_ROOT%{l_prefix}/bin/
   
  -    #   install libpq++ (C++ bindings)
  -    ( cd libpq++-%{V_libpqxx}
  +    #   install C++ bindings (both old and new one)
  +%if "%{with_cxx}" == "yes"
  +    ( cd libpq++-%{V_libpqpp}
         %{l_shtool} mkdir -f -p -m 755 \
             $RPM_BUILD_ROOT%{l_prefix}/include/libpq++
         %{l_shtool} install -c -m 644 \
  @@ -205,6 +257,24 @@
             libpq++.a \
             $RPM_BUILD_ROOT%{l_prefix}/lib/
       )
  +    ( cd libpqxx-%{V_libpqxx}
  +      %{l_shtool} mkdir -f -p -m 755 \
  +          $RPM_BUILD_ROOT%{l_prefix}/include/pqxx
  +      %{l_shtool} install -c -m 644 \
  +          include/pqxx/*.h \
  +          $RPM_BUILD_ROOT%{l_prefix}/include/pqxx/
  +      %{l_shtool} install -c -m 644 \
  +          src/.libs/libpqxx.a \
  +          $RPM_BUILD_ROOT%{l_prefix}/lib/
  +    )
  +%endif
  +
  +    #   build ODBC driver
  +%if "%{with_odbc}" == "yes"
  +    ( cd psqlodbc-%{V_psqlodbc}
  +      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
  +    )
  +%endif
   
       #   install run-command script
       %{l_shtool} mkdir -f -p -m 755 \
  @@ -220,7 +290,8 @@
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%attr(700,%{l_rusr},%{l_rgrp}) %dir %{l_prefix}/var/postgresql/db' \
  -        '%attr(755,%{l_rusr},%{l_rgrp}) %dir %{l_prefix}/var/postgresql/run'
  +        '%attr(755,%{l_rusr},%{l_rgrp}) %dir %{l_prefix}/var/postgresql/run' \
  +        '%config %{l_prefix}/var/postgresql/db/*.conf'
   
   %files -f files
   
  @@ -228,15 +299,15 @@
       rm -rf $RPM_BUILD_ROOT
   
   %pre
  -    if [ $1 -eq 1 ]; then
  -        #   initial installation
  +    if [ $1 -gt 1 ]; then
  +        #   upgrading of installation
           if [ -f $RPM_INSTALL_PREFIX/var/postgresql/db/PG_VERSION -a \
                -f $RPM_INSTALL_PREFIX/bin/pg_migrate ]; then
               #   database migration dumping hint
               v_old_all=`cat $RPM_INSTALL_PREFIX/var/postgresql/db/PG_VERSION`
               v_old_maj=`echo "$v_old_all" | sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
               v_new_all="%{V_postgresql}"
  -            v_new_maj=`echo "$v_new_maj" | sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
  +            v_new_maj=`echo "$v_new_all" | sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
               if [ ".$v_old_maj" != ".$v_new_maj" ]; then
                  if [ ! -f $RPM_INSTALL_PREFIX/var/postgresql/db.dump.sql.bz2 -a 
".$PG_MIGRATE" != .ignore ]; then
                       ( echo "You are upgrading from PostgreSQL $v_old_all to 
PostgresSQL $v_new_all,"
  @@ -252,8 +323,6 @@
                   fi
               fi
           fi
  -    elif [ $1 -gt 1 ]; then
  -        #   upgrading of installation
           rm -f $RPM_INSTALL_PREFIX/var/posgresql/RESTART >/dev/null 2>&1 || true
           if [ ".`$l_prefix/etc/rc postgresql status 2>&1 | grep 'is running'`" != . 
]; then
               echo "Shutting down currently running database engine." | %{l_rpmtool} 
msg -b -t notice
  @@ -266,11 +335,18 @@
   %post
       if [ $1 -eq 1 ]; then
           #   create initial database
  +%if "%{with_compat}" == "yes"
  +        l_pguser="postgres"
  +        l_pgpass="postgres"
  +%else
  +        l_pguser="postgresql"
  +        l_pgpass="postgresql"
  +%endif
           su - %{l_rusr} -c \
               "LC_CTYPE=C; export LC_CTYPE; umask 022; \
  -            (echo 'postgresql'; echo 'postgresql') |\
  +            (echo $l_pguser; echo $l_pgpass) |\
               $RPM_INSTALL_PREFIX/bin/pg_initdb \
  -                -U postgresql -W -D $RPM_INSTALL_PREFIX/var/postgresql/db" 2>&1 |\
  +                -U $l_pguser -W -D $RPM_INSTALL_PREFIX/var/postgresql/db" 2>&1 |\
           $RPM_INSTALL_PREFIX/lib/openpkg/shtool prop \
               -p "Creating initial PostgreSQL DB in 
$RPM_INSTALL_PREFIX/var/postgresql/db"
   
  @@ -290,23 +366,23 @@
           #   display information about next steps
           ( echo "An initial PostgreSQL DB was created with the two standard"
             echo "databases 'template0' and 'template1'. The owner of both"
  -          echo "is the DB user 'postgresql'. Its initial password is 'postgresql'."
  +          echo "is the DB user '$l_pguser'. Its initial password is '$l_pgpass'."
             echo "After starting PostgreSQL you should change this as quick as"
             echo "possible with the following command:"
  -          echo "\$ $RPM_INSTALL_PREFIX/bin/psql -U postgresql -d template1 \\"
  -          echo "  -c \"ALTER USER postgresql WITH PASSWORD '<new-password>'\""
  +          echo "\$ $RPM_INSTALL_PREFIX/bin/psql -U $l_pguser -d template1 \\"
  +          echo "  -c \"ALTER USER $l_pguser WITH PASSWORD '<new-password>'\""
           ) | %{l_rpmtool} msg -b -t notice
   
           #   optionally link into unixODBC
   %if "%{with_odbc}" == "yes"
           ( echo "[PostgreSQL]"
             echo "Description     = PostgreSQL ODBC driver"
  -          echo "Driver          = $RPM_INSTALL_PREFIX/lib/libodbcpsql.so"
  -          echo "Setup           = $RPM_INSTALL_PREFIX/lib/libodbcpsqlS.so"
  +          echo "Driver          = $RPM_INSTALL_PREFIX/lib/psqlodbc.so"
             echo "Threading       = 2"
           ) $RPM_INSTALL_PREFIX/bin/odbcinst -i -d -r
   %endif
       elif [ $1 -gt 1 ]; then
  +        #   upgrading of installation
           if [ -f $RPM_INSTALL_PREFIX/var/posgresql/RESTART ]; then
               echo "Starting database engine again." | %{l_rpmtool} msg -b -t notice
               $RPM_INSTALL_PREFIX/etc/rc postgresql start
  @@ -318,7 +394,7 @@
               v_old_all=`cat $RPM_INSTALL_PREFIX/var/postgresql/db/PG_VERSION`
               v_old_maj=`echo "$v_old_all" | sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
               v_new_all="%{V_postgresql}"
  -            v_new_maj=`echo "$v_new_maj" | sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
  +            v_new_maj=`echo "$v_new_all" | sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
               if [ ".$v_old_maj" != ".$v_new_maj" ]; then
                   ( echo "You upgraded from PostgreSQL $v_old_all to PostgresSQL 
$v_new_all,"
                     echo "which is a major version upgrade. We expect a database 
incompatibility,"
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/postgresql/rc.postgresql
  ============================================================================
  $ cvs diff -u -r1.2 -r1.2.4.1 rc.postgresql
  --- openpkg-src/postgresql/rc.postgresql      6 Feb 2002 08:29:14 -0000       1.2
  +++ openpkg-src/postgresql/rc.postgresql      16 Feb 2003 09:18:15 -0000      1.2.4.1
  @@ -7,6 +7,7 @@
       postgresql_enable="yes"
       postgresql_flags=""
       postgresql_datadir="@l_prefix@/var/postgresql/db"
  +    postgresql_shut_mode="smart"
       postgresql_socket_inet="localhost"
       postgresql_socket_unix="@l_prefix@/var/postgresql/run/"
       postgresql_log_file="@l_prefix@/var/postgresql/run/postmaster.log"
  @@ -26,11 +27,11 @@
   
   %stop -p 200 -u @l_rusr@
       opServiceEnabled postgresql || exit 0
  -    @l_prefix@/bin/pg_ctl stop -l $postgresql_log_file -D $postgresql_datadir -m 
smart
  +    @l_prefix@/bin/pg_ctl stop -l $postgresql_log_file -D $postgresql_datadir -m 
$postgresql_shut_mode
   
   %restart -u @l_rusr@
       opServiceEnabled postgresql || exit 0
  -    @l_prefix@/bin/pg_ctl restart -l $postgresql_log_file -D $postgresql_datadir -o 
"$postgresql_opts" -m smart
  +    @l_prefix@/bin/pg_ctl restart -l $postgresql_log_file -D $postgresql_datadir -o 
"$postgresql_opts" -m $postgresql_shut_mode
   
   %reload -u @l_rusr@
       opServiceEnabled postgresql || exit 0
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to