From 3687d4b37e139b912e35b78b58129cff4c1685d9 Mon Sep 17 00:00:00 2001
From: merdely <merdely@openbsd.org>
Date: Sat, 16 Feb 2008 21:22:41 +0000
Subject: [PATCH] Fix _bacula-sd uid.  Bump package names.

Pointed out by sthen@
"reads fine" jasper@
---
 infrastructure/db/user.list      | 3 ++-
 sysutils/bacula/Makefile         | 8 ++++----
 sysutils/bacula/pkg/PLIST-bat    | 4 ++--
 sysutils/bacula/pkg/PLIST-main   | 4 ++--
 sysutils/bacula/pkg/PLIST-server | 4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/infrastructure/db/user.list b/infrastructure/db/user.list
index 9f03da8f18d..87558d87e2c 100644
--- a/infrastructure/db/user.list
+++ b/infrastructure/db/user.list
@@ -1,4 +1,4 @@
-$OpenBSD: user.list,v 1.84 2008/02/06 21:43:57 bernd Exp $
+$OpenBSD: user.list,v 1.85 2008/02/16 21:22:41 merdely Exp $
 
 This file lists all users and groups that are created by ports or that
 users are encouraged to create after installing a port (these are marked
@@ -107,3 +107,4 @@ id  user		group		port options
 596 _heartbeat		_heartbeat	sysutils/heartbeat
 597			_kqemu		emulators/kqemu
 598 _iodine		_iodine		net/iodine
+599 _bacula-sd				sysutils/bacula
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 23f451785f8..1e52d606bb1 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.9 2008/02/07 02:53:35 merdely Exp $
+# $OpenBSD: Makefile,v 1.10 2008/02/16 21:22:41 merdely Exp $
 
 COMMENT-main=		network backup solution (client)
 COMMENT-server=		network backup solution (server)
 
 V=			2.2.8
 DISTNAME=		bacula-$V
-FULLPKGNAME-main=	bacula-client-$V
-PKGNAME-server=		bacula-server-$V
+FULLPKGNAME-main=	bacula-client-$Vp0
+PKGNAME-server=		bacula-server-$Vp0
 CATEGORIES=		sysutils
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
@@ -149,7 +149,7 @@ CONFIGURE_ARGS+=	--disable-bat \
 .else
 CONFIGURE_ARGS+=	--enable-bat \
 			--with-qwt=${LOCALBASE}
-FULLPKGNAME-bat=	bacula-bat-$V
+FULLPKGNAME-bat=	bacula-bat-$Vp0
 WANTLIB-bat=		${WANTLIB} ICE QtCore QtGui SM X11 Xcursor Xext Xfixes
 WANTLIB-bat+=		Xi Xinerama Xrandr Xrender fontconfig freetype glib-2.0
 WANTLIB-bat+=		gthread-2.0 iconv intl png
diff --git a/sysutils/bacula/pkg/PLIST-bat b/sysutils/bacula/pkg/PLIST-bat
index ef58abd28e9..1694944a439 100644
--- a/sysutils/bacula/pkg/PLIST-bat
+++ b/sysutils/bacula/pkg/PLIST-bat
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST-bat,v 1.1 2008/02/07 02:53:35 merdely Exp $
+@comment $OpenBSD: PLIST-bat,v 1.2 2008/02/16 21:22:41 merdely Exp $
 @newgroup _bacula:591
 @newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin
-@newuser _bacula-sd:597:_bacula:daemon:Bacula Storage Daemon:/nonexistent:/sbin/nologin
+@newuser _bacula-sd:599:_bacula:daemon:Bacula Storage Daemon:/nonexistent:/sbin/nologin
 @man man/man1/bat.1
 sbin/bat
 share/examples/bacula/
diff --git a/sysutils/bacula/pkg/PLIST-main b/sysutils/bacula/pkg/PLIST-main
index 91e70ce4120..8f3f9699eb6 100644
--- a/sysutils/bacula/pkg/PLIST-main
+++ b/sysutils/bacula/pkg/PLIST-main
@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST-main,v 1.2 2008/02/07 02:53:35 merdely Exp $
+@comment $OpenBSD: PLIST-main,v 1.3 2008/02/16 21:22:41 merdely Exp $
 @conflict bacula-client-*
 @conflict bacula-server-<2.2.7
 @pkgpath sysutils/bacula,-client
 @newgroup _bacula:591
 @newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin
-@newuser _bacula-sd:597:_bacula:daemon:Bacula Storage Daemon:/nonexistent:/sbin/nologin
+@newuser _bacula-sd:599:_bacula:daemon:Bacula Storage Daemon:/nonexistent:/sbin/nologin
 libexec/bacula/
 libexec/bacula/bacula-ctl-fd
 @man man/man8/bacula-fd.8
diff --git a/sysutils/bacula/pkg/PLIST-server b/sysutils/bacula/pkg/PLIST-server
index 0608b8e8c1f..27cc20d910b 100644
--- a/sysutils/bacula/pkg/PLIST-server
+++ b/sysutils/bacula/pkg/PLIST-server
@@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST-server,v 1.2 2008/02/07 02:53:35 merdely Exp $
+@comment $OpenBSD: PLIST-server,v 1.3 2008/02/16 21:22:41 merdely Exp $
 @conflict bacula-<2.2.7
 @newgroup _bacula:591
 @newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin
-@newuser _bacula-sd:597:_bacula:daemon:Bacula Storage Daemon:/nonexistent:/sbin/nologin
+@newuser _bacula-sd:599:_bacula:daemon:Bacula Storage Daemon:/nonexistent:/sbin/nologin
 libexec/bacula/
 libexec/bacula/bacula
 libexec/bacula/bacula-ctl-dir