- Keep la files, this fixes bacula-server build

- A few fixes (put man pages in the good packages,  do not remove things
done by the client dependency in the server part)

sysutils/bacula-server/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	bacula
 DISTVERSION=	5.2.12
-PORTREVISION?=	5
+PORTREVISION?=	6
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -12,7 +12,7 @@ PKGNAMESUFFIX?=	-server
 MAINTAINER=	dan@langille.org
 COMMENT?=	Network backup solution (server)
 
-USES+=		libtool
+USES+=		libtool:keepla
 
 LIB_DEPENDS+=	liblzo2.so:${PORTSDIR}/archivers/lzo2
 
@@ -48,7 +48,7 @@ USE_RC_SUBR?=	bacula-dir bacula-sd
 .if defined(WITH_CLIENT_ONLY)
 SUB_FILES+=	pkg-install.client pkg-deinstall.client pkg-message.client
 .else
-SUB_FILES+=	pkg-install.server pkg-deinstall.server pkg-message.server
+SUB_FILES+=	pkg-message.server
 .endif
 
 MANCOMPRESSED=	yes
@@ -98,10 +98,6 @@ SUB_LIST=	BACULA_USER=${BACULA_USER} \
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-# overridden if client install
-PKGDEINSTALL=	${FILESDIR}/pkg-deinstall.server
-PKGINSTALL=	${FILESDIR}/pkg-install.server
-
 # Client only or full server version
 .if defined(WITH_CLIENT_ONLY)
 CONFFILES=	fd
@@ -146,7 +142,7 @@ MP8+=	bacula.8 bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \
 MP1+=	bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1
 .endif
 
-MAKE_ENV+=	MO8="${MAN8}" MAN1="${MP1}"
+MAKE_ENV+=	MAN8="${MP8}" MAN1="${MP1}"
 
 post-patch:
 #	This port does not install docs.  See bacula-docs for that

sysutils/bacula-server/files/pkg-deinstall.server.in

@@ -1,34 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-# Note how to delete UID/GID
-USER=%%BACULA_USER%%
-GROUP=%%BACULA_GROUP%%
-UID=%%BACULA_UID%%
-GID=%%BACULA_UID%%
-BACULA_DIR=%%BACULA_DIR%%
-
-TMPFILE=/tmp/services-$RANDOM-$$
-
-case "$2" in
-"DEINSTALL")
-	# Delete entries in /etc/services
-        sed -e '/# Bacula port start/,/# Bacule port end/{' \
-            -e 'd' \
-            -e '}' /etc/services > $TMPFILE
-        mv -f $TMPFILE /etc/services
-
-	if [ -d ${BACULA_DIR} ]; then
-	    rmdir ${BACULA_DIR};
-	fi
-	if [ -d ${BACULA_DIR} ]; then
-	    echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port."
-	fi
-
-	if pw usershow "${USER}" 2>/dev/null 1>&2; then
-	    echo "To delete Bacula user permanently, use 'pw userdel ${USER}'"
-	    echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'"
-	fi
-        ;;
-esac

sysutils/bacula-server/files/pkg-install.server.in

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-# Always add lines in /etc/services
-grep -q "bacula-dir" /etc/services
-if [ "$?" != "0" ]; then
-    echo "# Bacula port start
-bacula-dir      9101/tcp   #Bacula director daemon
-bacula-fd       9102/tcp   #Bacula file daemon
-bacula-sd       9103/tcp   #Bacula storage daemon
-# Bacule port end" >> /etc/services
-fi

sysutils/bacula-server/pkg-plist

@@ -3,12 +3,15 @@
 @sample %%ETCDIR%%/bacula-dir.conf.sample
 @group wheel
 @sample %%ETCDIR%%/bacula-sd.conf.sample
+lib/libbaccats.la
 lib/libbaccats.so
 lib/libbaccats.so.5
 lib/libbaccats.so.5.0.2
+lib/libbaccats-%%DBTYPE%%.la
 lib/libbaccats-%%DBTYPE%%.so
 lib/libbaccats-%%DBTYPE%%.so.5
 lib/libbaccats-%%DBTYPE%%.so.5.0.2
+lib/libbacsql.la
 lib/libbacsql.so
 lib/libbacsql.so.5
 lib/libbacsql.so.5.0.2
@@ -16,10 +19,8 @@ man/man1/bacula-bwxconsole.1.gz
 man/man1/bacula-tray-monitor.1.gz
 man/man1/bsmtp.1.gz
 man/man8/bacula-dir.8.gz
-man/man8/bacula-fd.8.gz
 man/man8/bacula-sd.8.gz
 man/man8/bacula.8.gz
-man/man8/bconsole.8.gz
 man/man8/bcopy.8.gz
 man/man8/bextract.8.gz
 man/man8/bls.8.gz
@@ -76,7 +77,3 @@ sbin/dbcheck
 %%DATADIR%%/update_%%DBTYPE%%_tables
 @owner root
 @group wheel
-@dirrm %%DATADIR%%
-@exec mkdir -p %%BACULA_DIR%%
-@dirrmtry %%BACULA_DIR%%
-@dirrmtry %%ETCDIR%%

sysutils/bacula-server/pkg-plist.client

@@ -2,33 +2,25 @@
 @group bacula
 @sample %%ETCDIR%%/bconsole.conf.sample
 @group wheel
+lib/libbac.la
 lib/libbac.so
 lib/libbac.so.5
 lib/libbac.so.5.0.2
+lib/libbaccfg.la
 lib/libbaccfg.so
 lib/libbaccfg.so.5
 lib/libbaccfg.so.5.0.2
+lib/libbacfind.la
 lib/libbacfind.so
 lib/libbacfind.so.5
 lib/libbacfind.so.5.0.2
+lib/libbacpy.la
 lib/libbacpy.so
 lib/libbacpy.so.5
 lib/libbacpy.so.5.0.2
 lib/bpipe-fd.so
-man/man8/bacula-dir.8.gz
 man/man8/bacula-fd.8.gz
-man/man8/bacula-sd.8.gz
-man/man8/bacula.8.gz
 man/man8/bconsole.8.gz
-man/man8/bcopy.8.gz
-man/man8/bextract.8.gz
-man/man8/bls.8.gz
-man/man8/bregex.8.gz
-man/man8/bscan.8.gz
-man/man8/btape.8.gz
-man/man8/btraceback.8.gz
-man/man8/bwild.8.gz
-man/man8/dbcheck.8.gz
 sbin/bacula-fd
 @group bacula
 sbin/bconsole