ports/56477: [MAINTAINER PATCH] sysutils/flexbackup port needs update

[John Reynolds]

>Number:         56477
>Category:       ports
>Synopsis:       [MAINTAINER PATCH] sysutils/flexbackup port needs update
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 04 22:40:20 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     John Reynolds
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:

System: FreeBSD whale 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Tue Aug 19 23:10:49
MST 2003 root at dolphin:/usr/obj/usr/src/sys/WHALE i386

>Description:

In PR ports/56127 a patch updating and modifying my port of flexbackup was
committed without my approval on the changes. The submitter of the PR
accidentally submitted it using the maintainer-update class as he is the
maintainer of other ports and the committer did not cross-reference the
MAINTAINER address to the PR submitter and committed the patch.

The orignal PR submitter and commiter have apologized in e-mail for the
miscommunication, but there are several things that I want backed out of that
patch--including the copying of the GPL text to the "doc" directory. In
addition, I am installing various WITH_* knobs so that utils that flexbackup
*can* use can be built automatically but have hence forth been taken out of the
absolute dependency list.

>How-To-Repeat:

n/a

>Fix:

please apply the following patch inside sysutils (or sysutils/flexbackup)

diff -urN flexbackup.orig/Makefile flexbackup/Makefile
--- flexbackup.orig/Makefile	Sat Aug 30 07:28:30 2003
+++ flexbackup/Makefile	Thu Sep  4 22:23:47 2003
@@ -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 at 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 @@
 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 -urN flexbackup.orig/pkg-message flexbackup/pkg-message
--- flexbackup.orig/pkg-message	Sat Aug 30 07:28:30 2003
+++ flexbackup/pkg-message	Thu Sep  4 22:03:29 2003
@@ -1,9 +1,23 @@
--------------------------------------------------------------------------------
-Flexbackup supports utilities from the following ports (all optional):
+--------------------- Flexbackup Configuration Information --------------------
 
-archivers/afio
-archivers/star
-archivers/zip
-misc/buffer
+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! **
+ ****************************************************************************
+
+Also see %%PREFIX%%/share/doc/flexbackup/README
+for more information on how to use flexbackup (until the man 
+pages are written :).
 
 -------------------------------------------------------------------------------
diff -urN flexbackup.orig/pkg-plist flexbackup/pkg-plist
--- flexbackup.orig/pkg-plist	Sat Aug 30 07:28:30 2003
+++ flexbackup/pkg-plist	Thu Sep  4 21:36:27 2003
@@ -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


>Release-Note:
>Audit-Trail:
>Unformatted: