Date: Sat, 23 Feb 2013 12:30:09 +0000 (UTC) From: Chris Rees <crees@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312808 - in head/sysutils/boxbackup: . files Message-ID: <201302231230.r1NCU9cW093358@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: crees Date: Sat Feb 23 12:30:08 2013 New Revision: 312808 URL: http://svnweb.freebsd.org/changeset/ports/312808 Log: Convert to OPTIONSng Use SUB_FILES for pkg-message processing Use ETCDIR where appropriate PR: ports/176334 Approved by: James O'Gorman <james@netinertia.co.uk> (maintainer) Added: head/sysutils/boxbackup/files/pkg-message.in - copied, changed from r312734, head/sysutils/boxbackup/files/pkg-message.server.in Deleted: head/sysutils/boxbackup/files/pkg-message.client head/sysutils/boxbackup/files/pkg-message.server.in Modified: head/sysutils/boxbackup/Makefile head/sysutils/boxbackup/files/bbstored.in Modified: head/sysutils/boxbackup/Makefile ============================================================================== --- head/sysutils/boxbackup/Makefile Sat Feb 23 11:45:35 2013 (r312807) +++ head/sysutils/boxbackup/Makefile Sat Feb 23 12:30:08 2013 (r312808) @@ -26,27 +26,29 @@ MAKE_JOBS_UNSAFE=yes CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc -PKGMESSAGE= ${WRKDIR}/pkg-message +SUB_FILES= pkg-message -OPTIONS= CLIENT "Install the bbackupd client" On \ - SERVER "Install the bbstored server" On \ - GNUREADLINE "Enable the use of GNU readline" Off +OPTIONS_DEFINE= READLINE -.include <bsd.port.pre.mk> +OPTIONS_MULTI= FLAVOUR +OPTIONS_MULTI_FLAVOUR= CLIENT SERVER -.if defined(WITH_GNUREADLINE) -CONFIGURE_ARGS+=--enable-gnu-readline -.endif +CLIENT_DESC= Install the bbackupd client +SERVER_DESC= Install the bbstored server + +OPTIONS_DEFAULT=CLIENT SERVER + +.include <bsd.port.options.mk> -.if defined(WITHOUT_CLIENT) && defined(WITHOUT_SERVER) -IGNORE= requires at least CLIENT or SERVER to be defined.\ - Please 'make config' again +.if ${PORT_OPTIONS:MREADLINE} +CONFIGURE_ARGS+=--enable-gnu-readline .endif MANCOMPRESSED= yes -.if defined(WITH_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} USE_RC_SUBR+= bbackupd PLIST_SUB+= CLIENT="" +SUB_LIST+= CLIENT="" ALL_TARGET+= build-backup-client INSTALL_TARGET+=install-backup-client MAN5+= bbackupd.conf.5 @@ -54,26 +56,29 @@ MAN8+= bbackupd.8 bbackupctl.8 bbackupd SUB_FILES+= 999.boxbackup .else PLIST_SUB+= CLIENT="@comment " +SUB_LIST+= CLIENT="@comment " .endif -.if defined(WITH_SERVER) +.if ${PORT_OPTIONS:MSERVER} USE_RC_SUBR+= bbstored USERS+= _bbstored GROUPS+= _bbstored PLIST_SUB+= SERVER="" +SUB_LIST+= SERVER="" ALL_TARGET+= build-backup-server INSTALL_TARGET+=install-backup-server MAN5+= bbstored.conf.5 raidfile.conf.5 MAN8+= bbstored.8 bbstoreaccounts.8 bbstored-certs.8 bbstored-config.8 raidfile-config.8 .else PLIST_SUB+= SERVER="@comment " +SUB_LIST+= SERVER="@comment " .endif -.if defined(WITHOUT_CLIENT) +.if ! ${PORT_OPTIONS:MCLIENT} # if this is a server-only install, CONFLICT with an install of the CLIENT or both CONFLICTS= boxbackup-client-[0-9]* boxbackup-[0-9]* CLIENT_OR_SERVER=-server -.elif defined(WITHOUT_SERVER) +.elif ! ${PORT_OPTIONS:MSERVER} # if this is a client-only install, CONFLICT with an install of the SERVER or both CONFLICTS= boxbackup-server-[0-9]* boxbackup-[0-9]* CLIENT_OR_SERVER=-client @@ -85,24 +90,18 @@ CONFLICTS= boxbackup-server-[0-9]* boxba post-patch: @${REINPLACE_CMD} -e '/html/d' ${WRKSRC}/parcels.txt -.if !defined(WITHOUT_CLIENT) - @${CAT} ${FILESDIR}/pkg-message.client >> ${PKGMESSAGE} -.endif -.if !defined(WITHOUT_SERVER) - @${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - ${FILESDIR}/pkg-message.server.in >> ${PKGMESSAGE} -.endif post-configure: - @${REINPLACE_CMD} -e '/share.doc.boxbackup/d' ${WRKSRC}/parcels/scripts/install-backup-* + @${REINPLACE_CMD} -e '/share.doc.boxbackup/d' \ + ${WRKSRC}/parcels/scripts/install-backup-* post-install: -.if !defined(WITHOUT_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} @${MKDIR} -m 0700 ${PREFIX}/etc/boxbackup/bbackupd @${MKDIR} ${PREFIX}/etc/periodic/monthly ${INSTALL_SCRIPT} ${WRKDIR}/999.boxbackup ${PREFIX}/etc/periodic/monthly .endif -.if !defined(WITHOUT_SERVER) +.if ${PORT_OPTIONS:MSERVER} @${MKDIR} -m 0700 ${PREFIX}/etc/boxbackup/bbstored .endif @${CAT} ${PKGMESSAGE} @@ -111,4 +110,4 @@ test: @${ECHO_CMD} "===> Running tests" @${MAKE} -C ${WRKSRC} test -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/sysutils/boxbackup/files/bbstored.in ============================================================================== --- head/sysutils/boxbackup/files/bbstored.in Sat Feb 23 11:45:35 2013 (r312807) +++ head/sysutils/boxbackup/files/bbstored.in Sat Feb 23 12:30:08 2013 (r312808) @@ -18,7 +18,7 @@ rcvar=bbstored_enable load_rc_config $name : ${bbstored_enable:="NO"} -: ${bbstored_flags:="%%PREFIX%%/etc/boxbackup/bbstored.conf"} +: ${bbstored_flags:="%%ETCDIR%%/bbstored.conf"} pidfile=${bbstored_pidfile:-"/var/run/bbstored.pid"} Copied and modified: head/sysutils/boxbackup/files/pkg-message.in (from r312734, head/sysutils/boxbackup/files/pkg-message.server.in) ============================================================================== --- head/sysutils/boxbackup/files/pkg-message.server.in Thu Feb 21 19:27:34 2013 (r312734, copy source) +++ head/sysutils/boxbackup/files/pkg-message.in Sat Feb 23 12:30:08 2013 (r312808) @@ -1,8 +1,13 @@ +%%SERVER%% +%%SERVER%%To run bbstored at startup, add bbstored_enable="YES" to /etc/rc.conf +%%SERVER%%Please see http://www.boxbackup.org/server.html for server +%%SERVER%%configuration options -To run bbstored at startup, add bbstored_enable="YES" to /etc/rc.conf -Please see http://www.boxbackup.org/server.html for server configuration -options +The default location of configuration files changed from +%%PREFIX%%/etc/box to %%ETCDIR%%, if you are upgrading then run + mv %%PREFIX%%/etc/box %%ETCDIR%% -The default location of configuration files changed from %%PREFIX%%/etc/box to -%%PREFIX%%/etc/boxbackup, if you are upgrading then run - mv %%PREFIX%%/etc/box %%PREFIX%%/etc/boxbackup +%%CLIENT%%To run bbackupd at startup, add bbackupd_enable="YES" to /etc/rc.conf +%%CLIENT%%Please see http://www.boxbackup.org/client.html for client +%%CLIENT%%configuration options +%%CLIENT%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302231230.r1NCU9cW093358>