diff options
Diffstat (limited to 'sysutils/bacula/patches/patch-ai')
| -rw-r--r-- | sysutils/bacula/patches/patch-ai | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/sysutils/bacula/patches/patch-ai b/sysutils/bacula/patches/patch-ai index ef63d1ee47f..4b95de91946 100644 --- a/sysutils/bacula/patches/patch-ai +++ b/sysutils/bacula/patches/patch-ai @@ -1,13 +1,22 @@ -$NetBSD: patch-ai,v 1.4 2008/11/21 14:09:31 adam Exp $ +$NetBSD: patch-ai,v 1.5 2009/05/15 10:29:05 adam Exp $ ---- src/tray-monitor/Makefile.in.orig 2007-08-16 10:44:39.000000000 +0200 +--- src/tray-monitor/Makefile.in.orig 2008-10-19 12:34:03.000000000 +0200 +++ src/tray-monitor/Makefile.in -@@ -69,14 +69,14 @@ devclean: realclean +@@ -45,7 +45,7 @@ all: Makefile bacula-tray-monitor + + bacula-tray-monitor: Makefile $(MONITOROBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(MONITOR_LDFLAGS) -L../lib -o $@ \ +- $(MONITOROBJS) $(DLIB) -lbaccfg -lbac -lm $(LIBS) $(OPENSSL_LIBS) ++ $(MONITOROBJS) $(DLIB) ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(OPENSSL_LIBS) + + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status + cd $(topdir) \ +@@ -71,14 +71,14 @@ devclean: realclean install: all - $(INSTALL_PROGRAM) bacula-tray-monitor $(DESTDIR)$(sbindir)/bacula-tray-monitor + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-tray-monitor $(DESTDIR)$(sbindir)/bacula-tray-monitor @srcconf=tray-monitor.conf; \ - if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \ -+ if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \ ++ if test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$srcconf; then \ destconf=$$srcconf.new; \ echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ else \ @@ -15,8 +24,8 @@ $NetBSD: patch-ai,v 1.4 2008/11/21 14:09:31 adam Exp $ fi; \ - echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \ - ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf -+ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \ -+ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ++ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \ ++ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf uninstall: (cd $(DESTDIR)$(sbindir); $(RMF) bacula-tray-monitor) |