pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils Full DESTDIR support for all bacula packages.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a085a157293
branches:  trunk
changeset: 537173:0a085a157293
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Fri Jan 04 14:32:49 2008 +0000

description:
Full DESTDIR support for all bacula packages.

diffstat:

 sysutils/bacula-clientonly/Makefile    |   4 +++-
 sysutils/bacula-doc/Makefile           |  25 +++++++++++++------------
 sysutils/bacula-gnome-console/Makefile |   6 +++++-
 sysutils/bacula-tray-monitor/Makefile  |   6 +++++-
 sysutils/bacula-wx-console/Makefile    |   6 +++++-
 sysutils/bacula/Makefile               |   4 +++-
 sysutils/bacula/Makefile.common        |   4 ++--
 7 files changed, 36 insertions(+), 19 deletions(-)

diffs (167 lines):

diff -r f00610df763b -r 0a085a157293 sysutils/bacula-clientonly/Makefile
--- a/sysutils/bacula-clientonly/Makefile       Fri Jan 04 14:24:38 2008 +0000
+++ b/sysutils/bacula-clientonly/Makefile       Fri Jan 04 14:32:49 2008 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2007/07/04 20:54:59 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/01/04 14:32:50 ghen Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-clientonly-/}
 COMMENT=               The Network Backup Solution (client only)
 
 CONFLICTS=             bacula-[0-9]* bacula-client-[0-9]*
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DISTINFO_FILE=         ${.CURDIR}/../../sysutils/bacula/distinfo
 PATCHDIR=              ${.CURDIR}/../../sysutils/bacula/patches
 FILESDIR=              ${.CURDIR}/../../sysutils/bacula/files
diff -r f00610df763b -r 0a085a157293 sysutils/bacula-doc/Makefile
--- a/sysutils/bacula-doc/Makefile      Fri Jan 04 14:24:38 2008 +0000
+++ b/sysutils/bacula-doc/Makefile      Fri Jan 04 14:32:49 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/01/31 17:59:10 ghen Exp $
+# $NetBSD: Makefile,v 1.15 2008/01/04 14:32:50 ghen Exp $
 
 DISTNAME=              bacula-docs-2.0.2
 PKGNAME=               ${DISTNAME:S/docs/doc/}
@@ -9,22 +9,23 @@
 HOMEPAGE=              http://www.bacula.org/
 COMMENT=               Documentation for Bacula - The Network Backup Solution
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 NO_CONFIGURE=          yes
 NO_BUILD=              yes
 
 DOCDIR=                        share/doc/bacula
 
+INSTALLATION_DIRS=     ${DOCDIR} ${DOCDIR}/manual ${DOCDIR}/developers
+
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
-       ${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}/manual
-       ${INSTALL_DATA} ${WRKSRC}/manual/bacula/*.html ${PREFIX}/${DOCDIR}/manual/
-       ${INSTALL_DATA} ${WRKSRC}/manual/bacula/bacula.css  ${PREFIX}/${DOCDIR}/manual/
-       ${INSTALL_DATA} ${WRKSRC}/manual/bacula/*.png  ${PREFIX}/${DOCDIR}/manual/
-       ${INSTALL_DATA} ${WRKSRC}/manual/bacula.pdf  ${PREFIX}/${DOCDIR}/manual.pdf
-       ${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}/developers
-       ${INSTALL_DATA} ${WRKSRC}/developers/developers/*.html ${PREFIX}/${DOCDIR}/developers/
-       ${INSTALL_DATA} ${WRKSRC}/developers/developers/developers.css  ${PREFIX}/${DOCDIR}/developers/
-       ${INSTALL_DATA} ${WRKSRC}/developers/developers/*.png  ${PREFIX}/${DOCDIR}/developers/
-       ${INSTALL_DATA} ${WRKSRC}/developers/developers.pdf  ${PREFIX}/${DOCDIR}/developers.pdf
+       ${INSTALL_DATA} ${WRKSRC}/manual/bacula/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/manual/
+       ${INSTALL_DATA} ${WRKSRC}/manual/bacula/bacula.css  ${DESTDIR}${PREFIX}/${DOCDIR}/manual/
+       ${INSTALL_DATA} ${WRKSRC}/manual/bacula/*.png  ${DESTDIR}${PREFIX}/${DOCDIR}/manual/
+       ${INSTALL_DATA} ${WRKSRC}/manual/bacula.pdf  ${DESTDIR}${PREFIX}/${DOCDIR}/manual.pdf
+       ${INSTALL_DATA} ${WRKSRC}/developers/developers/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/developers/
+       ${INSTALL_DATA} ${WRKSRC}/developers/developers/developers.css  ${DESTDIR}${PREFIX}/${DOCDIR}/developers/
+       ${INSTALL_DATA} ${WRKSRC}/developers/developers/*.png  ${DESTDIR}${PREFIX}/${DOCDIR}/developers/
+       ${INSTALL_DATA} ${WRKSRC}/developers/developers.pdf  ${DESTDIR}${PREFIX}/${DOCDIR}/developers.pdf
 
 .include "../../mk/bsd.pkg.mk"
diff -r f00610df763b -r 0a085a157293 sysutils/bacula-gnome-console/Makefile
--- a/sysutils/bacula-gnome-console/Makefile    Fri Jan 04 14:24:38 2008 +0000
+++ b/sysutils/bacula-gnome-console/Makefile    Fri Jan 04 14:32:49 2008 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.14 2007/09/21 13:04:17 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/01/04 14:32:53 ghen Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-gnomeconsole-/}
 PKGREVISION=           3
 COMMENT=               Gnome console for Bacula - The Network Backup Solution
 CATEGORIES+=           gnome
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DISTINFO_FILE=         ${.CURDIR}/../../sysutils/bacula/distinfo
 PATCHDIR=              ${.CURDIR}/../../sysutils/bacula/patches
 
@@ -16,6 +18,8 @@
 BUILD_DIRS=            src/lib
 BUILD_DIRS+=           src/gnome2-console
 
+INSTALLATION_DIRS=     sbin share/examples/bacula
+
 .include "../../sysutils/bacula/Makefile.common"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f00610df763b -r 0a085a157293 sysutils/bacula-tray-monitor/Makefile
--- a/sysutils/bacula-tray-monitor/Makefile     Fri Jan 04 14:24:38 2008 +0000
+++ b/sysutils/bacula-tray-monitor/Makefile     Fri Jan 04 14:32:49 2008 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2006/06/11 12:40:41 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/01/04 14:32:53 ghen Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-traymonitor-/}
 COMMENT=               System tray monitor for Bacula - The Network Backup Solution
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DISTINFO_FILE=         ${.CURDIR}/../../sysutils/bacula/distinfo
 PATCHDIR=              ${.CURDIR}/../../sysutils/bacula/patches
 
@@ -14,6 +16,8 @@
 
 USE_TOOLS+=            pkg-config
 
+INSTALLATION_DIRS=     sbin share/examples/bacula
+
 .include "../../sysutils/bacula/Makefile.common"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f00610df763b -r 0a085a157293 sysutils/bacula-wx-console/Makefile
--- a/sysutils/bacula-wx-console/Makefile       Fri Jan 04 14:24:38 2008 +0000
+++ b/sysutils/bacula-wx-console/Makefile       Fri Jan 04 14:32:49 2008 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2007/11/30 20:33:33 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2008/01/04 14:32:53 ghen Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-wxconsole-/}
 COMMENT=               wxWindows-based console for Bacula - The Network Backup Solution
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DISTINFO_FILE=         ${.CURDIR}/../../sysutils/bacula/distinfo
 PATCHDIR=              ${.CURDIR}/../../sysutils/bacula/patches
 
@@ -12,6 +14,8 @@
 BUILD_DIRS=            src/lib
 BUILD_DIRS+=           src/wx-console
 
+INSTALLATION_DIRS=     sbin share/examples/bacula
+
 .include "../../sysutils/bacula/Makefile.common"
 .include "../../x11/wxGTK/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f00610df763b -r 0a085a157293 sysutils/bacula/Makefile
--- a/sysutils/bacula/Makefile  Fri Jan 04 14:24:38 2008 +0000
+++ b/sysutils/bacula/Makefile  Fri Jan 04 14:32:49 2008 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2007/07/04 20:54:59 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2008/01/04 14:32:49 ghen Exp $
 
 CONFLICTS+=            bacula-client-[0-9]* bacula-clientonly-[0-9]*
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "options.mk"
 
 PLIST_SRC=             PLIST.common
diff -r f00610df763b -r 0a085a157293 sysutils/bacula/Makefile.common
--- a/sysutils/bacula/Makefile.common   Fri Jan 04 14:24:38 2008 +0000
+++ b/sysutils/bacula/Makefile.common   Fri Jan 04 14:32:49 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2007/09/20 13:40:18 ghen Exp $
+# $NetBSD: Makefile.common,v 1.43 2008/01/04 14:32:49 ghen Exp $
 
 DISTNAME=              bacula-2.2.4
 CATEGORIES=            sysutils
@@ -61,7 +61,7 @@
 EXAMPLESDIR=           ${PREFIX}/share/examples/bacula
 
 pre-install:
-       ${INSTALL_DATA_DIR} ${EXAMPLESDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLESDIR}
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"



Home | Main Index | Thread Index | Old Index