rc_scripts -> pkg_scripts

2011-07-08 02:14:58 +00:00 · 2011-07-08 02:14:58 +00:00 · 70ac96c395
commit 70ac96c395
parent c1a6f780fb
16 changed files with 44 additions and 39 deletions
--- a/devel/jenkins/Makefile
+++ b/devel/jenkins/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2011/06/02 13:41:38 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2011/07/08 02:14:58 ajacoutot Exp $

 COMMENT =		continuous integration server

 VERSION =		1.401
-REVISION =		3
+REVISION =		4
 DISTNAME =		jenkins
 PKGNAME =		jenkins-${VERSION}
 DIST_SUBDIR =		jenkins-${VERSION}
--- a/devel/jenkins/pkg/README
+++ b/devel/jenkins/pkg/README
@ -1,13 +1,13 @@
-$OpenBSD: README,v 1.3 2011/06/02 13:41:38 ajacoutot Exp $
+$OpenBSD: README,v 1.4 2011/07/08 02:14:58 ajacoutot Exp $

 +-----------------------------------------------------------------------
 | Running ${FULLPKGNAME} on OpenBSD
 +-----------------------------------------------------------------------

 To arrange for the standalone Jenkins server to run automatically
-on reboot, add "jenkins" to "rc_scripts" in /etc/rc.conf.local, e.g.:
+on reboot, add "jenkins" to "pkg_scripts" in /etc/rc.conf.local, e.g.:

-rc_scripts="${rc_scripts} jenkins"
+pkg_scripts="${pkg_scripts} jenkins"

 NOTE: This script runs Jenkins on port 8000, not 8080, since most
 Java application servers run on port 8080. By default we disable
--- a/mail/zarafa/zarafa/Makefile
+++ b/mail/zarafa/zarafa/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.93 2011/07/02 22:33:35 sthen Exp $
+# $OpenBSD: Makefile,v 1.94 2011/07/08 02:14:59 ajacoutot Exp $

 COMMENT-main=	MS Exchange groupware suite replacement
 COMMENT-web=	zarafa webaccess frontend and MAPI extensions for PHP
@ -7,7 +7,7 @@ PKGNAME=	zarafa-${V}
 PKGNAME-main=	zarafa-${V}
 PKGNAME-web=	zarafa-webaccess-${V}

-REVISION-main=	11
+REVISION-main=	12
 REVISION-web=	3

 CATEGORIES=	mail www productivity
--- a/mail/zarafa/zarafa/pkg/zarafa.rc
+++ b/mail/zarafa/zarafa/pkg/zarafa.rc
@ -1,18 +1,18 @@
 #!/bin/sh
 #
-# $OpenBSD: zarafa.rc,v 1.7 2011/04/04 08:01:04 ajacoutot Exp $
+# $OpenBSD: zarafa.rc,v 1.8 2011/07/08 02:14:59 ajacoutot Exp $

 # "meta" script running the following rc.d(8) scripts with the given argument
-_rc_scripts="zarafa_server zarafa_spooler zarafa_monitor zarafa_gateway zarafa_ical"
+_pkg_scripts="zarafa_server zarafa_spooler zarafa_monitor zarafa_gateway zarafa_ical"

-set -A _s -- ${_rc_scripts}
+set -A _s -- ${_pkg_scripts}

 if [ "$1" = stop ]; then
-	i=$(echo ${_rc_scripts} | wc -w)
+	i=$(echo ${_pkg_scripts} | wc -w)
 	while [ $i -ne 0 ]; do
 		i=$((i-1))
 		/etc/rc.d/${_s[$i]} $1
 	done
 else
-	for i in ${_rc_scripts}; do /etc/rc.d/$i $1; done
+	for i in ${_pkg_scripts}; do /etc/rc.d/$i $1; done
 fi
--- a/net/icecast/Makefile
+++ b/net/icecast/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.45 2011/06/02 13:41:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.46 2011/07/08 02:14:58 ajacoutot Exp $

 COMMENT=	server for streaming various media formats

 DISTNAME=	icecast-2.3.2
-REVISION=	6
+REVISION=	7
 CATEGORIES=	net audio

 HOMEPAGE=	http://www.icecast.org/
--- a/net/icecast/pkg/README
+++ b/net/icecast/pkg/README
@ -1,4 +1,4 @@
-$OpenBSD: README,v 1.2 2011/06/02 13:41:39 ajacoutot Exp $
+$OpenBSD: README,v 1.3 2011/07/08 02:14:58 ajacoutot Exp $

 +-----------------------------------------------------------------------
 | Running ${FULLPKGNAME} on OpenBSD
@ -54,8 +54,8 @@ unprivileged account.

  5. Make Icecast start at boot.

-     Add 'icecast' to rc_scripts in /etc/rc.conf.local. Eg:
-     rc_scripts="icecast"
+     Add 'icecast' to pkg_scripts in /etc/rc.conf.local. Eg:
+     pkg_scripts="icecast"

 Random hints:

--- a/net/icinga/core/Makefile
+++ b/net/icinga/core/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2011/07/01 16:57:41 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2011/07/08 02:14:59 ajacoutot Exp $

 COMMENT-main =		network monitoring system (improved fork of Nagios)
 COMMENT-cgi =		cgi scripts for Icinga (classic Nagios-style UI)
@ -11,6 +11,8 @@ PKGNAME-cgi =		icinga-cgi-$V
 PKGNAME-ido =		icinga-idoutils-$V
 PKGNAME-api =		icinga-api-$V

+REVISION-main = 	0
+
 MULTI_PACKAGES =	-main -cgi -api -ido
 PREFIX-cgi =		/var/www
 PREFIX-api =		/var/www
--- a/net/icinga/core/pkg/README-main
+++ b/net/icinga/core/pkg/README-main
@ -1,4 +1,4 @@
-$OpenBSD: README-main,v 1.2 2011/06/02 13:41:39 ajacoutot Exp $
+$OpenBSD: README-main,v 1.3 2011/07/08 02:14:59 ajacoutot Exp $

 +-----------------------------------------------------------------------
 | Running ${FULLPKGNAME} on OpenBSD
@ -70,7 +70,7 @@ to move across with minimal changes, you can point Icinga at your
 existing configuration files:

 	echo 'icinga_flags="-d ${SYSCONFDIR}/nagios/nagios.cfg"' >> /etc/rc.conf.local
-	echo 'rc_scripts="${rc_scripts} icinga' >> /etc/rc.conf.local
+	echo 'pkg_scripts="${pkg_scripts} icinga' >> /etc/rc.conf.local

 You will need to merge the settings between Nagios' and Icinga's
 cgi.cfg files.  sdiff(1), as used by sysmerge(8), can help with this.
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.51 2011/06/02 13:41:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.52 2011/07/08 02:14:59 ajacoutot Exp $

 COMMENT=	Network Time Protocol reference implementation

@ -9,7 +9,7 @@ COMMENT=	Network Time Protocol reference implementation
 VERSION=	4.2.6p2
 DISTNAME=	ntp-${VERSION}
 PKGNAME=	ntp-${VERSION:S/p/pl/}
-REVISION=	5
+REVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	http://archive.ntp.org/ntp4/ntp-4.2/

--- a/net/ntp/pkg/README
+++ b/net/ntp/pkg/README
@ -1,4 +1,4 @@
-$OpenBSD: README,v 1.2 2011/06/02 13:41:40 ajacoutot Exp $
+$OpenBSD: README,v 1.3 2011/07/08 02:14:58 ajacoutot Exp $

 +-----------------------------------------------------------------------
 | Running ${FULLPKGNAME} on OpenBSD
@ -15,5 +15,5 @@ Several steps need to be taken to properly configure the NTP daemon.

     /etc/rc.d/ntpd start

-   Or to start 'ntpd' at every boot, add it to rc_scripts in
+   Or to start 'ntpd' at every boot, add it to pkg_scripts in
   /etc/rc.conf.local.
--- a/net/openfire/Makefile
+++ b/net/openfire/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2011/06/02 13:41:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2011/07/08 02:14:59 ajacoutot Exp $

 COMMENT=	XMPP real time collaboration server
 DISTNAME=	openfire_src_3_7_0
 PKGNAME=	openfire-3.7.0
-REVISION=	2
+REVISION=	3
 CATEGORIES=	net

 MASTER_SITES=	http://www.igniterealtime.org/downloadServlet?filename=openfire/
--- a/net/openfire/pkg/README
+++ b/net/openfire/pkg/README
@ -1,4 +1,4 @@
-$OpenBSD: README,v 1.3 2011/06/02 13:41:40 ajacoutot Exp $
+$OpenBSD: README,v 1.4 2011/07/08 02:14:59 ajacoutot Exp $

 +-----------------------------------------------------------------------
 | Running ${FULLPKGNAME} on OpenBSD
@ -15,7 +15,7 @@ $OpenBSD: README,v 1.3 2011/06/02 13:41:40 ajacoutot Exp $
   ${SYSCONFDIR}/rc.d/openfire start

   as root. To arrange for this to happen at boot, include 'openfire'
-   in the rc_scripts variable in ${SYSCONFDIR}/rc.d/rc.conf/local
+   in the pkg_scripts variable in /etc/rc.conf.local

 3) After starting openfire, you may access the web interface at
   http://[hostname]:9090/; when you first login there is a configuration
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.144 2011/06/15 19:34:45 sthen Exp $
+# $OpenBSD: Makefile,v 1.145 2011/07/08 02:14:59 ajacoutot Exp $

 SHARED_ONLY=		Yes

@ -9,6 +9,9 @@ DISTNAME=		samba-3.5.9
 PKGNAME-main=		${DISTNAME}
 FULLPKGNAME-docs=	${DISTNAME:S/-/-docs-/}
 FULLPKGPATH-docs=	net/samba,-docs
+
+REVISION-main=		0
+
 SHARED_LIBS=		smbclient	2.0 \
 			smbsharemodes	0.0 \
 			netapi		0.0 \
--- a/net/samba/pkg/samba.rc
+++ b/net/samba/pkg/samba.rc
@ -1,18 +1,18 @@
 #!/bin/sh
 #
-# $OpenBSD: samba.rc,v 1.2 2011/04/03 18:07:52 ajacoutot Exp $
+# $OpenBSD: samba.rc,v 1.3 2011/07/08 02:14:59 ajacoutot Exp $

 # "meta" script running the following rc.d(8) scripts with the given argument
-_rc_scripts="smbd nmbd"
+_pkg_scripts="smbd nmbd"

-set -A _s -- ${_rc_scripts}
+set -A _s -- ${_pkg_scripts}

 if [ "$1" = stop ]; then
-	i=$(echo ${_rc_scripts} | wc -w)
+	i=$(echo ${_pkg_scripts} | wc -w)
 	while [ $i -ne 0 ]; do
 		i=$((i-1))
 		/etc/rc.d/${_s[$i]} $1
 	done
 else
-	for i in ${_rc_scripts}; do /etc/rc.d/$i $1; done
+	for i in ${_pkg_scripts}; do /etc/rc.d/$i $1; done
 fi
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.16 2011/04/28 13:10:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2011/07/08 02:14:59 ajacoutot Exp $

 COMMENT=	cross-platform configuration modules

 GNOME_VERSION=	2.10.2
 GNOME_PROJECT=	system-tools-backends

-REVISION=	1
+REVISION=	2

 CATEGORIES=	sysutils

--- a/sysutils/system-tools-backends/patches/patch-Init_Services_pm
+++ b/sysutils/system-tools-backends/patches/patch-Init_Services_pm
@ -1,4 +1,4 @@
-$OpenBSD: patch-Init_Services_pm,v 1.4 2011/01/17 23:06:21 ajacoutot Exp $
+$OpenBSD: patch-Init_Services_pm,v 1.5 2011/07/08 02:14:59 ajacoutot Exp $
 --- Init/Services.pm.orig	Sat Mar 13 10:37:16 2010
 +++ Init/Services.pm	Tue Jan 18 00:05:10 2011
@@ -54,6 +54,7 @@ sub get_runlevels
@ -42,7 +42,7 @@ $OpenBSD: patch-Init_Services_pm,v 1.4 2011/01/17 23:06:21 ajacoutot Exp $
 +  my $rcconf = '/etc/rc.conf.local';
 +  my ($daemons);
 +
-+  $daemons = &Utils::Parse::get_sh ($rcconf, "rc_scripts");
+  $daemons = &Utils::Parse::get_sh ($rcconf, "pkg_scripts");
 +  $daemons =~ s/[\"\"]//g;
 +
 +  # escape these chars
@ -65,7 +65,7 @@ $OpenBSD: patch-Init_Services_pm,v 1.4 2011/01/17 23:06:21 ajacoutot Exp $
 +  }
 +
 +  $daemons = "\"" . $daemons . "\"";
-+  &Utils::Replace::set_sh ($rcconf, "rc_scripts", $daemons, 1);
+  &Utils::Replace::set_sh ($rcconf, "pkg_scripts", $daemons, 1);
 +  # XXX $script should be $service
 +  &run_rcng_script ($script, ($active) ? "start" : "stop");
 +}