pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils Move some things from Makefile.common to both...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9fdaa229a32c
branches: trunk
changeset: 507498:9fdaa229a32c
user: ghen <ghen%pkgsrc.org@localhost>
date: Fri Feb 03 08:18:45 2006 +0000
description:
Move some things from Makefile.common to both Makefiles, and remove the options
for the gnome-console, wx-console and tray-monitor: they will become separate
packages in the next minute. Ok with wiz.
diffstat:
sysutils/bacula-clientonly/Makefile | 14 +++++++++++---
sysutils/bacula-clientonly/options.mk | 6 ------
sysutils/bacula/Makefile | 9 ++++++++-
sysutils/bacula/Makefile.common | 33 +--------------------------------
sysutils/bacula/PLIST.common_end | 4 ++--
sysutils/bacula/PLIST.gnome-console | 3 ---
sysutils/bacula/PLIST.tray-monitor | 3 ---
sysutils/bacula/PLIST.wx-console | 3 ---
sysutils/bacula/options.mk | 4 +---
9 files changed, 23 insertions(+), 56 deletions(-)
diffs (184 lines):
diff -r b96e3722504e -r 9fdaa229a32c sysutils/bacula-clientonly/Makefile
--- a/sysutils/bacula-clientonly/Makefile Fri Feb 03 07:57:57 2006 +0000
+++ b/sysutils/bacula-clientonly/Makefile Fri Feb 03 08:18:45 2006 +0000
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2005/12/08 01:04:45 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2006/02/03 08:18:45 ghen Exp $
PKGNAME= ${DISTNAME:S/-/-clientonly-/}
COMMENT= The Network Backup Solution (client only)
CONFLICTS= bacula-[0-9]* bacula-client-[0-9]*
-.include "options.mk"
-
DISTINFO_FILE= ${.CURDIR}/../../sysutils/bacula/distinfo
PATCHDIR= ${.CURDIR}/../../sysutils/bacula/patches
FILESDIR= ${.CURDIR}/../../sysutils/bacula/files
@@ -17,7 +15,17 @@
BUILD_DEFS+= BACULA_GROUP
+OWN_DIRS_PERMS+= ${BACULA_WORKINGDIR} root ${BACULA_GROUP} 770
+
+PKG_GROUPS= ${BACULA_GROUP}
+
+CONF_FILES+= ${EXAMPLESDIR}/bacula-fd.conf ${PKG_SYSCONFDIR}/bacula-fd.conf
+CONF_FILES+= ${EXAMPLESDIR}/bconsole.conf ${PKG_SYSCONFDIR}/bconsole.conf
+
RCD_SCRIPTS= bacula-fd
.include "../../sysutils/bacula/Makefile.common"
+
+PLIST_SRC+= ${.CURDIR}/../../sysutils/bacula/PLIST.common_end
+
.include "../../mk/bsd.pkg.mk"
diff -r b96e3722504e -r 9fdaa229a32c sysutils/bacula-clientonly/options.mk
--- a/sysutils/bacula-clientonly/options.mk Fri Feb 03 07:57:57 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2005/12/08 01:04:45 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.bacula
-PKG_SUPPORTED_OPTIONS= gnome-console wx-console tray-monitor
-
-.include "../../mk/bsd.options.mk"
diff -r b96e3722504e -r 9fdaa229a32c sysutils/bacula/Makefile
--- a/sysutils/bacula/Makefile Fri Feb 03 07:57:57 2006 +0000
+++ b/sysutils/bacula/Makefile Fri Feb 03 08:18:45 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/01/24 14:53:40 ghen Exp $
+# $NetBSD: Makefile,v 1.15 2006/02/03 08:18:45 ghen Exp $
CONFLICTS+= bacula-client-[0-9]*
@@ -16,9 +16,14 @@
BUILD_DEFS+= BACULA_DIR_USER BACULA_SD_USER BACULA_GROUP
+OWN_DIRS_PERMS+= ${BACULA_WORKINGDIR} ${ROOT_USER} ${BACULA_GROUP} 770
+
PKG_USERS= ${BACULA_DIR_USER}:${BACULA_GROUP}
PKG_USERS+= ${BACULA_SD_USER}:${BACULA_GROUP}
+PKG_GROUPS= ${BACULA_GROUP}
+CONF_FILES+= ${EXAMPLESDIR}/bacula-fd.conf ${PKG_SYSCONFDIR}/bacula-fd.conf
+CONF_FILES+= ${EXAMPLESDIR}/bconsole.conf ${PKG_SYSCONFDIR}/bconsole.conf
CONF_FILES+= ${EXAMPLESDIR}/bacula-dir.conf ${PKG_SYSCONFDIR}/bacula-dir.conf
CONF_FILES+= ${EXAMPLESDIR}/bacula-sd.conf ${PKG_SYSCONFDIR}/bacula-sd.conf
@@ -26,4 +31,6 @@
.include "Makefile.common"
+PLIST_SRC+= PLIST.common_end
+
.include "../../mk/bsd.pkg.mk"
diff -r b96e3722504e -r 9fdaa229a32c sysutils/bacula/Makefile.common
--- a/sysutils/bacula/Makefile.common Fri Feb 03 07:57:57 2006 +0000
+++ b/sysutils/bacula/Makefile.common Fri Feb 03 08:18:45 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2006/01/17 15:52:52 ghen Exp $
+# $NetBSD: Makefile.common,v 1.26 2006/02/03 08:18:45 ghen Exp $
DISTNAME= bacula-1.38.4
CATEGORIES= sysutils
@@ -20,8 +20,6 @@
BACULA_PIDDIR?= ${VARBASE}/run
BACULA_WORKINGDIR?= ${VARBASE}/spool/bacula
-OWN_DIRS_PERMS+= ${BACULA_WORKINGDIR} root ${BACULA_GROUP} 770
-
FILES_SUBST+= BACULA_ETCDIR=${PKG_SYSCONFDIR:Q}
FILES_SUBST+= BACULA_PIDDIR=${BACULA_PIDDIR:Q}
FILES_SUBST+= BACULA_GROUP=${BACULA_GROUP:Q}
@@ -46,44 +44,15 @@
CONFIGURE_ARGS+= --with-pid-dir=${BACULA_PIDDIR:Q}
CONFIGURE_ARGS+= --with-readline=${PREFIX}/include/readline
-PKG_GROUPS= ${BACULA_GROUP}
-
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Linux"
CONFIGURE_ARGS+= --enable-smartalloc
.endif
-# keep these three blocks here as they are common to bacula and bacula-clientonly
-#
-# optional gnome-console
-.if !empty(PKG_OPTIONS:Mgnome-console)
-.include "../../devel/libgnomeui/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-gnome
-PLIST_SRC+= ${.CURDIR}/../../sysutils/bacula/PLIST.gnome-console
-.endif
-
-# optional wx-console
-.if !empty(PKG_OPTIONS:Mwx-console)
-.include "../../x11/wxGTK/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-wx-console
-PLIST_SRC+= ${.CURDIR}/../../sysutils/bacula/PLIST.wx-console
-.endif
-
-# optional tray-monitor
-.if !empty(PKG_OPTIONS:Mtray-monitor)
-.include "../../x11/gtk2/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-tray-monitor
-PLIST_SRC+= ${.CURDIR}/../../sysutils/bacula/PLIST.tray-monitor
-.endif
-
PTHREAD_OPTS+= require
PTHREAD_AUTO_VARS= yes
EXAMPLESDIR= ${PREFIX}/share/examples/bacula
-CONF_FILES+= ${EXAMPLESDIR}/bacula-fd.conf ${PKG_SYSCONFDIR}/bacula-fd.conf
-CONF_FILES+= ${EXAMPLESDIR}/bconsole.conf ${PKG_SYSCONFDIR}/bconsole.conf
-
-PLIST_SRC+= ${.CURDIR}/../../sysutils/bacula/PLIST.common_end
pre-install:
${INSTALL_DATA_DIR} ${EXAMPLESDIR}
diff -r b96e3722504e -r 9fdaa229a32c sysutils/bacula/PLIST.common_end
--- a/sysutils/bacula/PLIST.common_end Fri Feb 03 07:57:57 2006 +0000
+++ b/sysutils/bacula/PLIST.common_end Fri Feb 03 08:18:45 2006 +0000
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.common_end,v 1.1 2005/12/08 01:04:44 wiz Exp $
-@dirrm share/examples/bacula
+@comment $NetBSD: PLIST.common_end,v 1.2 2006/02/03 08:18:45 ghen Exp $
+@unexec ${RMDIR} %D/share/examples/bacula 2>/dev/null || ${TRUE}
@dirrm libexec/bacula
diff -r b96e3722504e -r 9fdaa229a32c sysutils/bacula/PLIST.gnome-console
--- a/sysutils/bacula/PLIST.gnome-console Fri Feb 03 07:57:57 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.gnome-console,v 1.1 2005/12/08 01:04:44 wiz Exp $
-sbin/gnome-console
-share/examples/bacula/gnome-console.conf
diff -r b96e3722504e -r 9fdaa229a32c sysutils/bacula/PLIST.tray-monitor
--- a/sysutils/bacula/PLIST.tray-monitor Fri Feb 03 07:57:57 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.tray-monitor,v 1.1 2005/12/08 01:04:44 wiz Exp $
-sbin/bacula-tray-monitor
-share/examples/bacula/tray-monitor.conf
diff -r b96e3722504e -r 9fdaa229a32c sysutils/bacula/PLIST.wx-console
--- a/sysutils/bacula/PLIST.wx-console Fri Feb 03 07:57:57 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.wx-console,v 1.1 2005/12/08 01:04:44 wiz Exp $
-sbin/wx-console
-share/examples/bacula/wx-console.conf
diff -r b96e3722504e -r 9fdaa229a32c sysutils/bacula/options.mk
--- a/sysutils/bacula/options.mk Fri Feb 03 07:57:57 2006 +0000
+++ b/sysutils/bacula/options.mk Fri Feb 03 08:18:45 2006 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: options.mk,v 1.8 2005/12/08 01:04:44 wiz Exp $
+# $NetBSD: options.mk,v 1.9 2006/02/03 08:18:45 ghen Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.bacula
PKG_OPTIONS_REQUIRED_GROUPS= database
PKG_OPTIONS_GROUP.database= catalog-sqlite catalog-sqlite3 catalog-pgsql catalog-mysql
-# keep this line in sync with sysutils/bacula-clientonly/options.mk:
-PKG_SUPPORTED_OPTIONS= gnome-console wx-console tray-monitor
PKG_SUGGESTED_OPTIONS= catalog-sqlite
.include "../../mk/bsd.options.mk"
Home |
Main Index |
Thread Index |
Old Index