From a07c798787131aa71adaea22a2521afc4a54b9b5 Mon Sep 17 00:00:00 2001 From: Lars Koeller Date: Sun, 25 Jul 2004 12:37:14 +0000 Subject: o) Don't install old sample start script o) Fix a typo PR: ports/69285 Submitted by: Dan Langille --- sysutils/bacula-server/Makefile | 8 +++----- sysutils/bacula-server/files/patch-scripts-Makefile.in | 9 ++++----- sysutils/bacula-server/pkg-plist | 3 +-- 3 files changed, 8 insertions(+), 12 deletions(-) (limited to 'sysutils/bacula-server') 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 -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 -- cgit v1.2.3