Full DESTDIR support for all bacula packages.

7 files changed, 36 insertions, 19 deletions

diff --git a/sysutils/bacula-clientonly/Makefile b/sysutils/bacula-clientonly/Makefile
index e06e7c55b92..d193b79b0c2 100644
--- a/sysutils/bacula-clientonly/Makefile
+++ b/sysutils/bacula-clientonly/Makefile
@@ -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 --git a/sysutils/bacula-doc/Makefile b/sysutils/bacula-doc/Makefile
index 0daa1d2dd9f..8b338a56115 100644
--- a/sysutils/bacula-doc/Makefile
+++ b/sysutils/bacula-doc/Makefile
@@ -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 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 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 --git a/sysutils/bacula-gnome-console/Makefile b/sysutils/bacula-gnome-console/Makefile
index 3ffef4fa520..74b1c530be5 100644
--- a/sysutils/bacula-gnome-console/Makefile
+++ b/sysutils/bacula-gnome-console/Makefile
@@ -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 @@ USE_TOOLS+=		pkg-config
 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 --git a/sysutils/bacula-tray-monitor/Makefile b/sysutils/bacula-tray-monitor/Makefile
index 13dc2b8ab5a..a5bf08d182c 100644
--- a/sysutils/bacula-tray-monitor/Makefile
+++ b/sysutils/bacula-tray-monitor/Makefile
@@ -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 @@ BUILD_DIRS+=		src/tray-monitor
 
 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 --git a/sysutils/bacula-wx-console/Makefile b/sysutils/bacula-wx-console/Makefile
index 304262170e1..61c3278f27c 100644
--- a/sysutils/bacula-wx-console/Makefile
+++ b/sysutils/bacula-wx-console/Makefile
@@ -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 @@ CONFIGURE_ARGS+=	--enable-bwx-console
 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 --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index eefc3e84c3e..be5958b830b 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -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 --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common
index 8c079855e33..f3b15f0a029 100644
--- a/sysutils/bacula/Makefile.common
+++ b/sysutils/bacula/Makefile.common
@@ -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 @@ PTHREAD_AUTO_VARS=	yes
 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"