diff options
author | Lars Koeller <lkoeller@FreeBSD.org> | 2004-11-28 16:39:01 +0000 |
---|---|---|
committer | Lars Koeller <lkoeller@FreeBSD.org> | 2004-11-28 16:39:01 +0000 |
commit | beaccb88a3f414817c93fb847e77cfbd09711afb (patch) | |
tree | 958ea0850444745e7e4f2aac2e658de4fa118f7c /sysutils | |
parent | 3c6dc2a6072f1d475fb05cf9b2b788142a236b46 (diff) | |
download | ports-beaccb88a3f414817c93fb847e77cfbd09711afb.tar.gz ports-beaccb88a3f414817c93fb847e77cfbd09711afb.zip |
Notes
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/bacula-server/Makefile | 8 | ||||
-rw-r--r-- | sysutils/bacula-server/distinfo | 4 | ||||
-rw-r--r-- | sysutils/bacula-server/files/patch-scripts-Makefile.in | 31 | ||||
-rw-r--r-- | sysutils/bacula-server/files/patch-src-wx-console | 31 | ||||
-rw-r--r-- | sysutils/bacula-server/pkg-message | 10 | ||||
-rw-r--r-- | sysutils/bacula-server/pkg-plist | 3 | ||||
-rw-r--r-- | sysutils/bacula/Makefile | 8 | ||||
-rw-r--r-- | sysutils/bacula/distinfo | 4 | ||||
-rw-r--r-- | sysutils/bacula/files/patch-scripts-Makefile.in | 31 | ||||
-rw-r--r-- | sysutils/bacula/files/patch-src-wx-console | 31 | ||||
-rw-r--r-- | sysutils/bacula/pkg-message | 10 | ||||
-rw-r--r-- | sysutils/bacula/pkg-plist | 3 |
12 files changed, 80 insertions, 94 deletions
diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile index c99da649e43d..ee9e1a7cc0d0 100644 --- a/sysutils/bacula-server/Makefile +++ b/sysutils/bacula-server/Makefile @@ -6,8 +6,8 @@ # PORTNAME= bacula -PORTVERSION= 1.34.6 -PORTREVISION= 2 +PORTVERSION= 1.36.1 +PORTREVISION= 0 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= bacula @@ -105,7 +105,7 @@ PLIST_SUB+= SERVER="" RUN_DEPENDS+= ${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx .endif -PORTDOCS= bacula.pdf ReleaseNotes html-manual/* +PORTDOCS= bacula.pdf ReleaseNotes html-manual pre-everything:: .if !defined(WITH_CLIENT_ONLY) @@ -252,4 +252,6 @@ post-install: .endif @${ECHO_MSG} "*********************************************************************" + @$(CAT) pkg-message + .include <bsd.port.post.mk> diff --git a/sysutils/bacula-server/distinfo b/sysutils/bacula-server/distinfo index 5c18b8497be0..ebefb511e6a5 100644 --- a/sysutils/bacula-server/distinfo +++ b/sysutils/bacula-server/distinfo @@ -1,2 +1,2 @@ -MD5 (bacula-1.34.6.tar.gz) = 9de593cb206df126a8e27774281c5bf6 -SIZE (bacula-1.34.6.tar.gz) = 4633962 +MD5 (bacula-1.36.1.tar.gz) = d09ecce1bc9e3a421f7eaf5ad2de5850 +SIZE (bacula-1.36.1.tar.gz) = 6828844 diff --git a/sysutils/bacula-server/files/patch-scripts-Makefile.in b/sysutils/bacula-server/files/patch-scripts-Makefile.in index 135c486aa2c5..f5e2cee7d1b3 100644 --- a/sysutils/bacula-server/files/patch-scripts-Makefile.in +++ b/sysutils/bacula-server/files/patch-scripts-Makefile.in @@ -1,34 +1,43 @@ -*** scripts/Makefile.in.orig Wed Mar 31 00:54:17 2004 ---- scripts/Makefile.in Thu Apr 8 19:56:21 2004 +*** scripts/Makefile.in.orig Wed Nov 17 23:48:21 2004 +--- scripts/Makefile.in Sun Nov 28 15:00:56 2004 *************** -*** 32,46 **** +*** 32,50 **** $(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)$(scriptdir)/bacula -! $(INSTALL_SCRIPT) fd $(DESTDIR)$(scriptdir)/fd -! $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer + @if test -f ${DESTDIR}${scriptdir}/mtx-changer; then \ + echo " ==> Saving existing mtx-changer to mtx-changer.old"; \ + $(MV) -f ${DESTDIR}${scriptdir}/mtx-changer ${DESTDIR}${scriptdir}/mtx-changer.old; \ + fi + $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer ! $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb +! $(INSTALL_DATA) btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx ! $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback - + uninstall: (cd $(DESTDIR)$(scriptdir); $(RMF) startmysql) ---- 32,46 ---- +--- 32,50 ---- $(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) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer + @if test -f ${DESTDIR}${scriptdir}/mtx-changer; then \ + echo " ==> Saving existing mtx-changer to mtx-changer.old"; \ + $(MV) -f ${DESTDIR}${scriptdir}/mtx-changer ${DESTDIR}${scriptdir}/mtx-changer.old; \ + fi + $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer ! # $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb +! # $(INSTALL_DATA) btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx ! # $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback - + uninstall: (cd $(DESTDIR)$(scriptdir); $(RMF) startmysql) diff --git a/sysutils/bacula-server/files/patch-src-wx-console b/sysutils/bacula-server/files/patch-src-wx-console deleted file mode 100644 index 6f388bef45e5..000000000000 --- a/sysutils/bacula-server/files/patch-src-wx-console +++ /dev/null @@ -1,31 +0,0 @@ -*** src/wx-console/wxbconfigpanel.cpp.orig Mon May 31 18:30:40 2004 ---- src/wx-console/wxbconfigpanel.cpp Sat Jul 3 16:37:15 2004 -*************** -*** 88,100 **** - wxString wxbConfigParam::GetValue() { - switch (type) { - case text: -! return (statictext) ? statictext->GetLabel() : ""; - break; - case modifiableText: -! return (textctrl) ? textctrl->GetValue() : ""; - break; - case choice: -! return (choicectrl) ? choicectrl->GetStringSelection() : ""; - break; - } - return ""; ---- 88,100 ---- - wxString wxbConfigParam::GetValue() { - switch (type) { - case text: -! return (statictext != NULL) ? statictext->GetLabel() : wxString(""); - break; - case modifiableText: -! return (textctrl != NULL) ? textctrl->GetValue() : wxString(""); - break; - case choice: -! return (choicectrl != NULL) ? choicectrl->GetStringSelection() : wxString(""); - break; - } - return ""; diff --git a/sysutils/bacula-server/pkg-message b/sysutils/bacula-server/pkg-message new file mode 100644 index 000000000000..3d9d7a8d06ff --- /dev/null +++ b/sysutils/bacula-server/pkg-message @@ -0,0 +1,10 @@ +################################################################################ + Please read the file" + + ${DOCSDIR}/ReleaseNotes" + + for the upgrade procedure! + + IF YOU IGNORE THIS you may !! LOSE DATA !! + +################################################################################ diff --git a/sysutils/bacula-server/pkg-plist b/sysutils/bacula-server/pkg-plist index 9c12c846412e..0bbb75ba717e 100644 --- a/sysutils/bacula-server/pkg-plist +++ b/sysutils/bacula-server/pkg-plist @@ -5,6 +5,7 @@ etc/rc.d/bacula.sh.sample sbin/bacula-fd %%SERVER%%sbin/bacula-sd %%SERVER%%sbin/bextract +%%SERVER%%sbin/bcopy %%SERVER%%sbin/bls %%SERVER%%sbin/bscan %%SERVER%%sbin/btape @@ -29,4 +30,6 @@ sbin/bconsole %%SERVER%%share/bacula/delete_catalog_backup %%SERVER%%share/bacula/make_catalog_backup %%SERVER%%@dirrm share/bacula +@unexec /usr/bin/killall badula-sd > /dev/null 2>&1 || true +@unexec /usr/bin/killall bacula-dir > /dev/null 2>&1 || true @exec mkdir -p %%BACULA_DIR%% diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile index c99da649e43d..ee9e1a7cc0d0 100644 --- a/sysutils/bacula/Makefile +++ b/sysutils/bacula/Makefile @@ -6,8 +6,8 @@ # PORTNAME= bacula -PORTVERSION= 1.34.6 -PORTREVISION= 2 +PORTVERSION= 1.36.1 +PORTREVISION= 0 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= bacula @@ -105,7 +105,7 @@ PLIST_SUB+= SERVER="" RUN_DEPENDS+= ${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx .endif -PORTDOCS= bacula.pdf ReleaseNotes html-manual/* +PORTDOCS= bacula.pdf ReleaseNotes html-manual pre-everything:: .if !defined(WITH_CLIENT_ONLY) @@ -252,4 +252,6 @@ post-install: .endif @${ECHO_MSG} "*********************************************************************" + @$(CAT) pkg-message + .include <bsd.port.post.mk> diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo index 5c18b8497be0..ebefb511e6a5 100644 --- a/sysutils/bacula/distinfo +++ b/sysutils/bacula/distinfo @@ -1,2 +1,2 @@ -MD5 (bacula-1.34.6.tar.gz) = 9de593cb206df126a8e27774281c5bf6 -SIZE (bacula-1.34.6.tar.gz) = 4633962 +MD5 (bacula-1.36.1.tar.gz) = d09ecce1bc9e3a421f7eaf5ad2de5850 +SIZE (bacula-1.36.1.tar.gz) = 6828844 diff --git a/sysutils/bacula/files/patch-scripts-Makefile.in b/sysutils/bacula/files/patch-scripts-Makefile.in index 135c486aa2c5..f5e2cee7d1b3 100644 --- a/sysutils/bacula/files/patch-scripts-Makefile.in +++ b/sysutils/bacula/files/patch-scripts-Makefile.in @@ -1,34 +1,43 @@ -*** scripts/Makefile.in.orig Wed Mar 31 00:54:17 2004 ---- scripts/Makefile.in Thu Apr 8 19:56:21 2004 +*** scripts/Makefile.in.orig Wed Nov 17 23:48:21 2004 +--- scripts/Makefile.in Sun Nov 28 15:00:56 2004 *************** -*** 32,46 **** +*** 32,50 **** $(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)$(scriptdir)/bacula -! $(INSTALL_SCRIPT) fd $(DESTDIR)$(scriptdir)/fd -! $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer + @if test -f ${DESTDIR}${scriptdir}/mtx-changer; then \ + echo " ==> Saving existing mtx-changer to mtx-changer.old"; \ + $(MV) -f ${DESTDIR}${scriptdir}/mtx-changer ${DESTDIR}${scriptdir}/mtx-changer.old; \ + fi + $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer ! $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb +! $(INSTALL_DATA) btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx ! $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback - + uninstall: (cd $(DESTDIR)$(scriptdir); $(RMF) startmysql) ---- 32,46 ---- +--- 32,50 ---- $(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) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer + @if test -f ${DESTDIR}${scriptdir}/mtx-changer; then \ + echo " ==> Saving existing mtx-changer to mtx-changer.old"; \ + $(MV) -f ${DESTDIR}${scriptdir}/mtx-changer ${DESTDIR}${scriptdir}/mtx-changer.old; \ + fi + $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer ! # $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb +! # $(INSTALL_DATA) btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx ! # $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback - + uninstall: (cd $(DESTDIR)$(scriptdir); $(RMF) startmysql) diff --git a/sysutils/bacula/files/patch-src-wx-console b/sysutils/bacula/files/patch-src-wx-console deleted file mode 100644 index 6f388bef45e5..000000000000 --- a/sysutils/bacula/files/patch-src-wx-console +++ /dev/null @@ -1,31 +0,0 @@ -*** src/wx-console/wxbconfigpanel.cpp.orig Mon May 31 18:30:40 2004 ---- src/wx-console/wxbconfigpanel.cpp Sat Jul 3 16:37:15 2004 -*************** -*** 88,100 **** - wxString wxbConfigParam::GetValue() { - switch (type) { - case text: -! return (statictext) ? statictext->GetLabel() : ""; - break; - case modifiableText: -! return (textctrl) ? textctrl->GetValue() : ""; - break; - case choice: -! return (choicectrl) ? choicectrl->GetStringSelection() : ""; - break; - } - return ""; ---- 88,100 ---- - wxString wxbConfigParam::GetValue() { - switch (type) { - case text: -! return (statictext != NULL) ? statictext->GetLabel() : wxString(""); - break; - case modifiableText: -! return (textctrl != NULL) ? textctrl->GetValue() : wxString(""); - break; - case choice: -! return (choicectrl != NULL) ? choicectrl->GetStringSelection() : wxString(""); - break; - } - return ""; diff --git a/sysutils/bacula/pkg-message b/sysutils/bacula/pkg-message new file mode 100644 index 000000000000..3d9d7a8d06ff --- /dev/null +++ b/sysutils/bacula/pkg-message @@ -0,0 +1,10 @@ +################################################################################ + Please read the file" + + ${DOCSDIR}/ReleaseNotes" + + for the upgrade procedure! + + IF YOU IGNORE THIS you may !! LOSE DATA !! + +################################################################################ diff --git a/sysutils/bacula/pkg-plist b/sysutils/bacula/pkg-plist index 9c12c846412e..0bbb75ba717e 100644 --- a/sysutils/bacula/pkg-plist +++ b/sysutils/bacula/pkg-plist @@ -5,6 +5,7 @@ etc/rc.d/bacula.sh.sample sbin/bacula-fd %%SERVER%%sbin/bacula-sd %%SERVER%%sbin/bextract +%%SERVER%%sbin/bcopy %%SERVER%%sbin/bls %%SERVER%%sbin/bscan %%SERVER%%sbin/btape @@ -29,4 +30,6 @@ sbin/bconsole %%SERVER%%share/bacula/delete_catalog_backup %%SERVER%%share/bacula/make_catalog_backup %%SERVER%%@dirrm share/bacula +@unexec /usr/bin/killall badula-sd > /dev/null 2>&1 || true +@unexec /usr/bin/killall bacula-dir > /dev/null 2>&1 || true @exec mkdir -p %%BACULA_DIR%% |