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: 10-Dec-2004 23:22:30 Branch: HEAD Handle: 2004121022223000 Modified files: openpkg-src/openpkg HISTORY openpkg.spec Log: fix system start/stop transfer script for FreeBSD 5 Summary: Revision Changes Path 1.228 +1 -0 openpkg-src/openpkg/HISTORY 1.376 +40 -3 openpkg-src/openpkg/openpkg.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY ============================================================================ $ cvs diff -u -r1.227 -r1.228 HISTORY --- openpkg-src/openpkg/HISTORY 25 Nov 2004 09:38:29 -0000 1.227 +++ openpkg-src/openpkg/HISTORY 10 Dec 2004 22:22:30 -0000 1.228 @@ -2,6 +2,7 @@ 2004 ==== +20041210 fix system start/stop transfer script for FreeBSD 5 20041125 port RPM to NetBSD 2.0 (pre-release) 20041119 upgrade to BeeCrypt 4.1.1 (excluded in 2.2.2) 20041118 upgrade to BeeCrypt 4.1.0 (excluded in 2.2.2) @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec ============================================================================ $ cvs diff -u -r1.375 -r1.376 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 25 Nov 2004 09:38:29 -0000 1.375 +++ openpkg-src/openpkg/openpkg.spec 10 Dec 2004 22:22:30 -0000 1.376 @@ -39,7 +39,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20041125 +%define V_openpkg 20041210 # the used software versions %define V_rpm 4.2.1 @@ -1512,7 +1512,7 @@ echo "openpkg:WARNING: (would require root-privileges)" 1>&2 else case "$plid" in - FreeBSD/* ) + FreeBSD/4.* ) if [ ! -f /etc/rc.d/${name}.sh ]; then # make sure /etc/rc.d exists if [ ! -d /etc/rc.d ]; then @@ -1552,6 +1552,40 @@ chmod 755 /etc/rc.d/${name}.sh fi ;; + FreeBSD/* ) + if [ -f /etc/rc.d/${name}.sh ]; then + # remove old transfer script (for upgrading from FreeBSD 4 only) + rm -f /etc/rc.d/${name}.sh >/dev/null 2>&1 + fi + if [ ! -f /etc/rc.d/openpkg-${name} ]; then + # install transfer script + rm -f /etc/rc.d/openpkg-${name} >/dev/null 2>&1 + ( echo "#!/bin/sh" + echo "##" + echo "## ${name} -- startup/shutdown transfer script for OpenPKG ${prefix} hierarchy" + echo "##" + echo "" + echo "# PROVIDE: openpkg-${name}" + echo "# REQUIRE: LOGIN" + echo "" + echo "name=\"openpkg_${name}\"" + echo "start_cmd=\"openpkg_rc_all start\"" + echo "stop_cmd=\"openpkg_rc_all stop\"" + echo "restart_cmd=\"openpkg_rc_all stop start\"" + echo "" + echo "openpkg_rc_all () {" + echo " if [ -f ${prefix}/etc/rc ]; then" + echo " ${prefix}/etc/rc all \"[EMAIL PROTECTED]"" + echo " fi" + echo "}" + echo "" + echo "load_rc_config \$name" + echo "run_rc_command \"\$1\"" + echo "" + ) >/etc/rc.d/openpkg-${name} + chmod 755 /etc/rc.d/openpkg-${name} + fi + ;; NetBSD/* ) if [ ! -f /etc/rc.d/${name} ]; then ( echo "#!/bin/sh" @@ -2093,9 +2127,12 @@ echo "openpkg:WARNING: (would require root-privileges)" 1>&2 else case "$plid" in - FreeBSD/* ) + FreeBSD/4.* ) rm -f /etc/rc.d/${name}.sh >/dev/null 2>&1 ;; + FreeBSD/* ) + rm -f /etc/rc.d/openpkg-${name} >/dev/null 2>&1 + ;; NetBSD/* ) rm -f /etc/rc.d/${name} >/dev/null 2>&1 ;; @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]