6 files changed, 16 insertions, 24 deletions

diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index 584c0f6054b9..c6185ecd4dc4 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bacula
 PORTVERSION=	1.34.5
-PORTREVISION=   3
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bacula
@@ -38,7 +38,7 @@ CONFIGURE_ARGS=	--with-tcp-wrappers=/usr/lib \
 CONFIGURE_ENV+=	CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
-OPTIONS=	CLIENT_ONLY "Build bacule file daemon only" off
+OPTIONS=	CLIENT_ONLY "Build bacula file daemon only" off
 OPTIONS+=	WXCONSOLE "Build with wxGTK based GUI console" off
 OPTIONS+=	GNOMECONSOLE "Build with GNOME based GUI console" off
 OPTIONS+=	MYSQL "Use MySQL database instead of SqLite" off
@@ -53,7 +53,7 @@ USE_GNOME=	libgnome
 
 .include <bsd.port.pre.mk>
 
-PLIST_SUB+=      BACULA_DIR=${BACULA_DIR}
+PLIST_SUB+=	BACULA_DIR=${BACULA_DIR}
 
 # Build gnome-console
 .if defined(WITH_GNOMECONSOLE)
@@ -139,8 +139,6 @@ post-install:
 	# Extend only /etc/services
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME}
-	# don't know how to make it better
-	${RM} -f ${PREFIX}/etc/rc.d/bacula.sh.sample
 .else
 	# Extend /etc/services and install UID/GID
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
diff --git a/sysutils/bacula-server/files/patch-scripts-Makefile.in b/sysutils/bacula-server/files/patch-scripts-Makefile.in
index f3bb3124f144..100bf38264b5 100644
--- a/sysutils/bacula-server/files/patch-scripts-Makefile.in
+++ b/sysutils/bacula-server/files/patch-scripts-Makefile.in
@@ -3,7 +3,7 @@
 ***************
 *** 32,46 ****
   	$(MKDIR) $(DESTDIR)$(scriptdir)
-  
+
   install: installdirs
 ! 	$(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql
 ! 	$(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql
@@ -14,22 +14,21 @@
 ! 	$(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer
 ! 	$(INSTALL_DATA)   btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb
 ! 	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
-  
+
   uninstall:
   	(cd $(DESTDIR)$(scriptdir); $(RMF) startmysql)
 --- 32,46 ----
   	$(MKDIR) $(DESTDIR)$(scriptdir)
-  
+
   install: installdirs
 ! #	$(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql
 ! #	$(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql
 ! #	$(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole
 ! #	$(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole
 ! 	$(INSTALL_SCRIPT) bacula $(DESTDIR)$(sysconfdir)/rc.d/bacula.sh.sample
-! 	$(INSTALL_SCRIPT) fd $(DESTDIR)$(sysconfdir)/rc.d/fd.sh.sample
 ! #	$(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer
 ! #	$(INSTALL_DATA)   btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb
 ! #	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
-  
+
   uninstall:
   	(cd $(DESTDIR)$(scriptdir); $(RMF) startmysql)
diff --git a/sysutils/bacula-server/pkg-plist b/sysutils/bacula-server/pkg-plist
index 4c40c62aad20..2208322d357e 100644
--- a/sysutils/bacula-server/pkg-plist
+++ b/sysutils/bacula-server/pkg-plist
@@ -1,9 +1,8 @@
 %%SERVER%%share/bacula/query.sql
-%%SERVER%%etc/rc.d/bacula.sh.sample
+etc/rc.d/bacula.sh.sample
 %%SERVER%%sbin/chio-bacula
 %%SERVER%%sbin/bacula-dir
 sbin/bacula-fd
-etc/rc.d/fd.sh.sample
 %%SERVER%%sbin/bacula-sd
 %%SERVER%%sbin/bextract
 %%SERVER%%sbin/bls
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 584c0f6054b9..c6185ecd4dc4 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bacula
 PORTVERSION=	1.34.5
-PORTREVISION=   3
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bacula
@@ -38,7 +38,7 @@ CONFIGURE_ARGS=	--with-tcp-wrappers=/usr/lib \
 CONFIGURE_ENV+=	CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
-OPTIONS=	CLIENT_ONLY "Build bacule file daemon only" off
+OPTIONS=	CLIENT_ONLY "Build bacula file daemon only" off
 OPTIONS+=	WXCONSOLE "Build with wxGTK based GUI console" off
 OPTIONS+=	GNOMECONSOLE "Build with GNOME based GUI console" off
 OPTIONS+=	MYSQL "Use MySQL database instead of SqLite" off
@@ -53,7 +53,7 @@ USE_GNOME=	libgnome
 
 .include <bsd.port.pre.mk>
 
-PLIST_SUB+=      BACULA_DIR=${BACULA_DIR}
+PLIST_SUB+=	BACULA_DIR=${BACULA_DIR}
 
 # Build gnome-console
 .if defined(WITH_GNOMECONSOLE)
@@ -139,8 +139,6 @@ post-install:
 	# Extend only /etc/services
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME}
-	# don't know how to make it better
-	${RM} -f ${PREFIX}/etc/rc.d/bacula.sh.sample
 .else
 	# Extend /etc/services and install UID/GID
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
diff --git a/sysutils/bacula/files/patch-scripts-Makefile.in b/sysutils/bacula/files/patch-scripts-Makefile.in
index f3bb3124f144..100bf38264b5 100644
--- a/sysutils/bacula/files/patch-scripts-Makefile.in
+++ b/sysutils/bacula/files/patch-scripts-Makefile.in
@@ -3,7 +3,7 @@
 ***************
 *** 32,46 ****
   	$(MKDIR) $(DESTDIR)$(scriptdir)
-  
+
   install: installdirs
 ! 	$(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql
 ! 	$(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql
@@ -14,22 +14,21 @@
 ! 	$(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer
 ! 	$(INSTALL_DATA)   btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb
 ! 	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
-  
+
   uninstall:
   	(cd $(DESTDIR)$(scriptdir); $(RMF) startmysql)
 --- 32,46 ----
   	$(MKDIR) $(DESTDIR)$(scriptdir)
-  
+
   install: installdirs
 ! #	$(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql
 ! #	$(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql
 ! #	$(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole
 ! #	$(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole
 ! 	$(INSTALL_SCRIPT) bacula $(DESTDIR)$(sysconfdir)/rc.d/bacula.sh.sample
-! 	$(INSTALL_SCRIPT) fd $(DESTDIR)$(sysconfdir)/rc.d/fd.sh.sample
 ! #	$(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer
 ! #	$(INSTALL_DATA)   btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb
 ! #	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
-  
+
   uninstall:
   	(cd $(DESTDIR)$(scriptdir); $(RMF) startmysql)
diff --git a/sysutils/bacula/pkg-plist b/sysutils/bacula/pkg-plist
index 4c40c62aad20..2208322d357e 100644
--- a/sysutils/bacula/pkg-plist
+++ b/sysutils/bacula/pkg-plist
@@ -1,9 +1,8 @@
 %%SERVER%%share/bacula/query.sql
-%%SERVER%%etc/rc.d/bacula.sh.sample
+etc/rc.d/bacula.sh.sample
 %%SERVER%%sbin/chio-bacula
 %%SERVER%%sbin/bacula-dir
 sbin/bacula-fd
-etc/rc.d/fd.sh.sample
 %%SERVER%%sbin/bacula-sd
 %%SERVER%%sbin/bextract
 %%SERVER%%sbin/bls