diff options
Diffstat (limited to 'sysutils/bacula/patches/patch-ac')
| -rw-r--r-- | sysutils/bacula/patches/patch-ac | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/sysutils/bacula/patches/patch-ac b/sysutils/bacula/patches/patch-ac index b44c7fed128..cca271eec7a 100644 --- a/sysutils/bacula/patches/patch-ac +++ b/sysutils/bacula/patches/patch-ac @@ -1,29 +1,38 @@ -$NetBSD: patch-ac,v 1.3 2008/11/21 14:09:31 adam Exp $ +$NetBSD: patch-ac,v 1.4 2009/05/15 10:29:05 adam Exp $ ---- src/console/Makefile.in.orig 2007-05-27 11:34:40.000000000 +0200 +--- src/console/Makefile.in.orig 2009-02-18 12:40:09.000000000 +0100 +++ src/console/Makefile.in -@@ -87,19 +87,19 @@ install: all +@@ -48,7 +48,7 @@ all: Makefile bconsole @STATIC_CONS@ + + bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ +- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ ++ $(DLIB) $(CONS_LIBS) ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) \ + $(OPENSSL_LIBS) + + static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) +@@ -90,19 +90,19 @@ install: all fi - $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(sbindir)/bconsole + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(sbindir)/bconsole @srcconf=bconsole.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 \ destconf=$$srcconf; \ - if test -f ${DESTDIR}${sysconfdir}/console.conf; then \ -+ if test -f ${DESTDIR}%%EXAMPLESDIR%%/console.conf; then \ ++ if test -f ${DESTDIR}/usr/pkg/share/examples/bacula/console.conf; then \ echo "Existing console.conf moved to bconsole.conf"; \ - @$(MV) ${DESTDIR}${sysconfdir}/console.conf ${DESTDIR}${sysconfdir}/bconsole.conf; \ -+ @$(MV) ${DESTDIR}%%EXAMPLESDIR%%/console.conf ${DESTDIR}%%EXAMPLESDIR%%/bconsole.conf; \ ++ @$(MV) ${DESTDIR}/usr/pkg/share/examples/bacula/console.conf ${DESTDIR}/usr/pkg/share/examples/bacula/bconsole.conf; \ destconf=$$srcconf.new; \ fi; \ 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 if test -f static-bconsole; then \ - $(INSTALL_PROGRAM) static-bconsole $(DESTDIR)$(sbindir)/static-bconsole; \ + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bconsole $(DESTDIR)$(sbindir)/static-bconsole; \ fi |