Date: Sun, 20 Aug 2006 01:50:20 GMT From: Jo Rhett <jrhett@svcolo.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/102292: btraceback shouldn't be disabled in bacula-server Message-ID: <200608200150.k7K1oKVF087904@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/102292; it has been noted by GNATS.
From: Jo Rhett <jrhett@svcolo.com>
To: Dan Langille <dan@langille.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/102292: btraceback shouldn't be disabled in bacula-server
Date: Sat, 19 Aug 2006 18:40:56 -0700
Ugh. A patch of a patch looks horrible, don't it?
Nutshell -- leave the btraceback lines in place. Don't remove them.
Here's another attempt, but this is fugly ain't it?
--- files/patch-scripts-Makefile.in_orig Sat Aug 19 14:04:09 2006
+++ files/patch-scripts-Makefile.in Sat Aug 19 18:37:58 2006
@@ -1,5 +1,5 @@
---- scripts/Makefile.in.orig Sat Mar 25 10:37:41 2006
-+++ scripts/Makefile.in Thu Mar 30 13:01:21 2006
+--- scripts/Makefile.in.orig Sat Mar 25 05:37:41 2006
++++ scripts/Makefile.in Sat Aug 19 14:09:11 2006
@@ -33,14 +33,6 @@
$(MKDIR) $(DESTDIR)$(mandir)
@@ -15,15 +15,10 @@
@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; \
-@@ -56,14 +48,7 @@
- $(MV) -f ${DESTDIR}${scriptdir}/dvd-handler
${DESTDIR}${scriptdir}/dvd-handler.old; \
- fi
- $(INSTALL_SCRIPT) dvd-handler $(DESTDIR)$(scriptdir)/dvd-handler
-- $(INSTALL_DATA) btraceback.gdb
$(DESTDIR)$(scriptdir)/btraceback.gdb
-- $(INSTALL_DATA) btraceback.dbx
$(DESTDIR)$(scriptdir)/btraceback.dbx
-- chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \
-- $(DESTDIR)$(scriptdir)/btraceback.dbx
-- $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
+@@ -61,9 +53,7 @@
+ chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \
+ $(DESTDIR)$(scriptdir)/btraceback.dbx
+ $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
- gzip <bacula.man >bacula.8.gz
- $(INSTALL_DATA) bacula.8.gz $(DESTDIR)$(mandir)/bacula.8.gz
- @rm -f bacula.8.gz
Perhaps easier to say that the entire file should be:
--- scripts/Makefile.in.orig Sat Mar 25 05:37:41 2006
+++ scripts/Makefile.in Sat Aug 19 14:09:11 2006
@@ -33,14 +33,6 @@
$(MKDIR) $(DESTDIR)$(mandir)
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) bacula-ctl-dir $(DESTDIR)$(scriptdir)/bacula-ctl-dir
- $(INSTALL_SCRIPT) bacula-ctl-fd $(DESTDIR)$(scriptdir)/bacula-ctl-fd
- $(INSTALL_SCRIPT) bacula-ctl-sd $(DESTDIR)$(scriptdir)/bacula-ctl-sd
@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; \
@@ -61,9 +53,7 @@
chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \
$(DESTDIR)$(scriptdir)/btraceback.dbx
$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
- gzip <bacula.man >bacula.8.gz
- $(INSTALL_DATA) bacula.8.gz $(DESTDIR)$(mandir)/bacula.8.gz
- @rm -f bacula.8.gz
+ $(INSTALL_DATA) bacula.man $(DESTDIR)$(mandir)/bacula.8
--
Jo Rhett
senior geek
SVcolo : Silicon Valley Colocation
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608200150.k7K1oKVF087904>