diff options
| author | dholland <dholland@pkgsrc.org> | 2012-03-31 10:33:36 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2012-03-31 10:33:36 +0000 |
| commit | 037d8db41bd19f2934ae271f753fb851646a66ad (patch) | |
| tree | 572b0cbd3e408913b16f303db244a0a7764d1386 /sysutils | |
| parent | 52773b374cf0288db95f5a161942c1f52785d905 (diff) | |
| download | pkgsrc-037d8db41bd19f2934ae271f753fb851646a66ad.tar.gz | |
Reapply version 1.6 of patch-ah to fix handling of $PREFIX for
bacula-wx-client.
everyone, when regenerating patches, please make sure you aren't
expanding substitutions.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/bacula/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/bacula/patches/patch-ah | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo index f5f45543c80..2d4cdc9c7f4 100644 --- a/sysutils/bacula/distinfo +++ b/sysutils/bacula/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.45 2011/06/18 10:40:33 shattered Exp $ +$NetBSD: distinfo,v 1.46 2012/03/31 10:33:36 dholland Exp $ SHA1 (bacula-5.0.3.tar.gz) = 4ced1c4f8984a063a1134b59968d163243017611 RMD160 (bacula-5.0.3.tar.gz) = 0ae8f303b379daffdf09e4eab9b35182759add41 @@ -10,7 +10,7 @@ SHA1 (patch-ad) = ce6bc29858d13dff1a0301db95f9bfedf3e66b01 SHA1 (patch-ae) = 09a5a722c7acf384881198a23ed97d723f4c9698 SHA1 (patch-af) = eb573f4b823c6c693634989883d2f94d2fa81f98 SHA1 (patch-ag) = 53454345615422267e9e50b28a7aac10fd257df0 -SHA1 (patch-ah) = 8cfe18b486fdd49eb162e20509ddf59e4b0c7375 +SHA1 (patch-ah) = 06452df1449ed6f06af00ed2cf9d736c40044dfb SHA1 (patch-ai) = 388e075e7ec54fb377ee9dbe8338c667efb256ee SHA1 (patch-aj) = 125d1503406474fec32e737068328cdfa718f5c2 SHA1 (patch-am) = 28536d3f0de81940773749c3704ad7aca86d374d diff --git a/sysutils/bacula/patches/patch-ah b/sysutils/bacula/patches/patch-ah index 0b471ee68d5..56bc8c7d86f 100644 --- a/sysutils/bacula/patches/patch-ah +++ b/sysutils/bacula/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.8 2010/03/09 07:06:00 adam Exp $ +$NetBSD: patch-ah,v 1.9 2012/03/31 10:33:36 dholland Exp $ --- src/wx-console/Makefile.in.orig 2010-02-24 15:33:48.000000000 +0000 +++ src/wx-console/Makefile.in @@ -16,7 +16,7 @@ $NetBSD: patch-ah,v 1.8 2010/03/09 07:06:00 adam Exp $ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bwx-console $(DESTDIR)$(sbindir)/bwx-console @srcconf=bwx-console.conf; \ - if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \ -+ if test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$srcconf; then \ ++ if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \ destconf=$$srcconf.new; \ echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ else \ @@ -24,8 +24,8 @@ $NetBSD: patch-ah,v 1.8 2010/03/09 07:06:00 adam Exp $ fi; \ - echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \ - ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf -+ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \ -+ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf ++ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \ ++ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf uninstall: (cd $(DESTDIR)$(sbindir); $(RMF) bwx-console) |