- Add additional WITH_* knobs

PR:		56477
Submitted by:	maintainer

3 files changed, 63 insertions, 13 deletions

diff --git a/sysutils/flexbackup/Makefile b/sysutils/flexbackup/Makefile
index 7259ddadda5c..c56e3308c64c 100644
--- a/sysutils/flexbackup/Makefile
+++ b/sysutils/flexbackup/Makefile
@@ -7,19 +7,56 @@
 
 PORTNAME=	flexbackup
 PORTVERSION=	1.2.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.edwinh.org/flexbackup/tarball/ \
 		http://www.reynoldsnet.org/flexbackup/tarball/
 
 MAINTAINER=	johnjen@reynoldsnet.org
-COMMENT=	A flexible backup tool (Perl)
+COMMENT=	Perl-based flexible backup system that can use dump/afio/cpio/tar/star
 
-MAKE_ARGS=	CONFFILE=${LOCALBASE}/etc/flexbackup.conf \
-		PERLPATH=${PERL}
+MAKE_ARGS=	PERLPATH=${PERL}
 
 USE_PERL5=	yes
 
+.if defined(WITH_AFIO)
+RUN_DEPENDS+=	afio:${PORTSDIR}/sysutils/afio
+.endif
+
+.if defined(WITH_BUFFER)
+RUN_DEPENDS+=	buffer:${PORTSDIR}/misc/buffer
+.endif
+
+.if defined(WITH_STAR)
+RUN_DEPENDS+=	star:${PORTSDIR}/archivers/star
+.endif
+
+.if defined(WITH_ZIP)
+RUN_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
+.endif
+
+.if defined(WITH_GTAR)
+RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+.endif
+
+pre-fetch:
+	@${ECHO} "----------------------------------------------------------"
+	@${ECHO} "This port can utilize afio, star, zip, and buffer."
+	@${ECHO} "You may use the following build options to make:"
+	@${ECHO}
+	@${ECHO} "  WITH_AFIO=yes   enable the use of afio"
+	@${ECHO} "  WITH_STAR=yes   enable the use of star"
+	@${ECHO} "  WITH_ZIP=yes    enable the use of zip"
+	@${ECHO} "  WITH_BUFFER=yes enable the use of buffer"
+	@${ECHO}
+	@${ECHO} "----------------------------------------------------------"
+	@${ECHO}
+	@${ECHO} "If you are using and older version of FreeBSD that does not have GNU Tar"
+	@${ECHO} "imported as the system 'tar,' configure this port using WITH_GTAR=yes"
+	@${ECHO} "to enable the port dependency and use the 'path' variable in the"
+	@${ECHO} "flexbackup.conf file to point to 'gtar'"
+	@${ECHO}
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/fb.install ${LOCALBASE}/bin/flexbackup
 	${INSTALL_DATA} ${WRKSRC}/flexbackup.conf ${LOCALBASE}/etc/flexbackup.conf.sample
@@ -27,9 +64,9 @@ do-install:
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for docfile in CHANGES COPYING CREDITS README TODO faq.html
+.for docfile in CHANGES CREDITS README TODO faq.html
 	${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
 .endfor
 .endif
-	@${CAT} ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE} | ${SED} -e 's:%%PREFIX%%:${PREFIX}:g'
 .include <bsd.port.mk>
diff --git a/sysutils/flexbackup/pkg-message b/sysutils/flexbackup/pkg-message
index 080890fd58df..46f06f418fa3 100644
--- a/sysutils/flexbackup/pkg-message
+++ b/sysutils/flexbackup/pkg-message
@@ -1,9 +1,23 @@
--------------------------------------------------------------------------------
-Flexbackup supports utilities from the following ports (all optional):
+--------------------- Flexbackup Configuration Information --------------------
+
+Flexbackup needs to have its configuration file placed in /etc. A template
+copy of this configuration file has been installed into
+
+  %%PREFIX%%/etc/flexbackup.conf.sample
+
+Please copy this file as 
+
+  /etc/flexbackup.conf
+
+(on all machines where you will run flexbackup) and edit appropriately for your
+site configuration. 
+
+ ****************************************************************************
+ **  Changes have occurred in this file up to and including version 1.2.0! **
+ ****************************************************************************
 
-archivers/afio
-archivers/star
-archivers/zip
-misc/buffer
+Also see %%PREFIX%%/share/doc/flexbackup/README
+for more information on how to use flexbackup (until the man 
+pages are written :).
 
 -------------------------------------------------------------------------------
diff --git a/sysutils/flexbackup/pkg-plist b/sysutils/flexbackup/pkg-plist
index 9cb668333991..7695fda94a9e 100644
--- a/sysutils/flexbackup/pkg-plist
+++ b/sysutils/flexbackup/pkg-plist
@@ -1,7 +1,6 @@
 bin/flexbackup
 etc/flexbackup.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO