The port sysutils/flexbackup needs to be updated to 1.2.1. This update brings in man pages as well as another "knob" for configuring the s/w to use a conf file in a non-default location (WITH_LOCALBASE_CONF). It also uses a "dynamic" pkg-message mechanism that many ports are using so that pkg-message gets spit out correctly (with the right PREFIX) even while being installed from a package. Note: This PR makes ports/56517 obsolete, so please close out ports/56517 too. Fix: please "rm -f pkg-message; cvs remove pkg-message" from the sysutils/flexbackup directory. pkg-message no longer applies as a ".in" version is being kept in "files." The following patch will create files/pkg-message.in. Please "cvs add" this files directory and pkg-message.in. Thanks! How-To-Repeat: n/a
Responsible Changed From-To: freebsd-ports-bugs->mat I'll handle this one
Hi John, great that we finally have a conforming flexbackup package, even though I think /usr/local/etc/flexbackup.conf should be the *default* location. Just a few remarks: > +PKGMESSAGE= pkg-message I assume you want PKGMESSAGE= ${WRKDIR}/pkg-message here > +.if defined(WITH_LOCALBASE_CONF) > +MAKE_ARGS+= CONFFILE=${LOCALBASE}/etc/flexbackup.conf > +.endif This should be ${PREFIX}/etc/flexbackup.conf, and something like .if !defined(WITHOUT_CONFORMING_CONF) > +MANCOMPRESSED= yes Why? Just let the bsd.port.mk do the job... > + ${GZIP_CMD} ${WRKSRC}/flexbackup.1 ${WRKSRC}/flexbackup.conf.5 || true > + ${INSTALL_DATA} ${WRKSRC}/flexbackup.1.gz ${LOCALBASE}/man/man1 > + ${INSTALL_DATA} ${WRKSRC}/flexbackup.conf.5.gz ${LOCALBASE}/man/man5 Simply do > + ${INSTALL_MAN} ${WRKSRC}/flexbackup.1 ${MAN1PREFIX}/man/man1 > + ${INSTALL_MAN} ${WRKSRC}/flexbackup.conf.5 ${MAN5PREFIX}/man/man5 > +pre-build: > + @${RM} -f ${PKGMESSAGE} No need to do that, the directory is clean. > + @${SED} "s:%%PREFIX%%:${PREFIX}:g" ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} @${SED} -e "s:... Regards Oliver
[ On Monday, October 13, Oliver Eikemeier wrote: ] > Hi John, > > great that we finally have a conforming flexbackup package, even though it has always conformed. The flexbackup port has never not followed the rules of file installation within the LOCALBASE hierarchy. > I think /usr/local/etc/flexbackup.conf should be the *default* location. I've been back and forth on this issue with several people. Suffice to say, the default shall remain /etc/flexbackup.conf. The knob is there at this point, so it should make people happy who need to override this. > Just a few remarks: > > I assume you want > PKGMESSAGE= ${WRKDIR}/pkg-message This was my mistake. I had been doing some testing to make sure that pkg-message was displayed when installing from binary .tbz files and didn't understand the shortcomings of bsd.port.mk fully. This is now fixed..... > This should be ${PREFIX}/etc/flexbackup.conf, and something like > .if !defined(WITHOUT_CONFORMING_CONF) $PREFIX I'll agree to, but I want the knob to default to "off." > Why? Just let the bsd.port.mk do the job... I'm following what the porter's handbook says to do about man pages. The section doesn't inform somebody about the INSTALL_MAN macro. > Simply do OK. I did not know about the INSTALL_MAN macro. I will change this and resubmit a different patch. > No need to do that, the directory is clean. See the above. I was doing this on little sleep :( ... and was confused between how "make install && make package" versus "make package" does when you are creating $PKGMESSAGE from a file (i.e. the two separate steps are needed before PKG_ARGS ads the "-D $PKGMESSAGE" option to pkg_create(1)). I will resubmit a slightly different patch to GNATS shortly. Thanks, -Jr -- John & Jennifer Reynolds johnjen at reynoldsnet.org www.reynoldsnet.org Structural / Physical Design - ICG/PNG SCD jreynold at sedona.ch.intel.com Running FreeBSD since 2.1.5-RELEASE. FreeBSD: The Power to Serve! "Unix is user friendly, it's just particular about the friends it chooses."
Based upon feedback, here is a new patch to apply to the 1.2.0 port. It addresses some of the problems found in the other patch set. diff -urN flexbackup.orig/Makefile flexbackup/Makefile --- flexbackup.orig/Makefile Sun Sep 7 16:05:29 2003 +++ flexbackup/Makefile Mon Oct 13 21:05:30 2003 @@ -6,8 +6,7 @@ # PORTNAME= flexbackup -PORTVERSION= 1.2.0 -PORTREVISION?= 2 +PORTVERSION= 1.2.1 CATEGORIES= sysutils MASTER_SITES= http://www.edwinh.org/flexbackup/tarball/ \ http://www.reynoldsnet.org/flexbackup/tarball/ @@ -15,9 +14,17 @@ MAINTAINER= johnjen@reynoldsnet.org COMMENT= Perl-based flexible backup system that can use dump/afio/cpio/tar/star +PKGMESSAGE= ${WRKDIR}/pkg-message + MAKE_ARGS= PERLPATH=${PERL} USE_PERL5= yes +CONFDIR= + +.if defined(WITH_PREFIX_CONF) +MAKE_ARGS+= CONFFILE=${PREFIX}/etc/flexbackup.conf +CONFDIR= ${PREFIX} +.endif .if defined(WITH_AFIO) RUN_DEPENDS+= afio:${PORTSDIR}/sysutils/afio @@ -57,9 +64,17 @@ @${ECHO} "flexbackup.conf file to point to 'gtar'" @${ECHO} +MAN1= flexbackup.1 +MAN5= flexbackup.conf.5 + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/fb.install ${LOCALBASE}/bin/flexbackup ${INSTALL_DATA} ${WRKSRC}/flexbackup.conf ${LOCALBASE}/etc/flexbackup.conf.sample + ${INSTALL_MAN} ${WRKSRC}/flexbackup.1 ${LOCALBASE}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/flexbackup.conf.5 ${LOCALBASE}/man/man5 + +post-configure: + @${SED} -e "s:%%PREFIX%%:${PREFIX}:g" -e "s:%%CONFDIR%%:${CONFDIR}:g" ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} post-install: .if !defined(NOPORTDOCS) @@ -68,5 +83,6 @@ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR} .endfor .endif - @${CAT} ${PKGMESSAGE} | ${SED} -e 's:%%PREFIX%%:${PREFIX}:g' + @${CAT} ${PKGMESSAGE} + .include <bsd.port.mk> diff -urN flexbackup.orig/distinfo flexbackup/distinfo --- flexbackup.orig/distinfo Sun Sep 7 16:05:29 2003 +++ flexbackup/distinfo Mon Oct 13 06:21:11 2003 @@ -1 +1 @@ -MD5 (flexbackup-1.2.0.tar.gz) = a5e57e7070ad3da1b5a9e0aed2aeda83 +MD5 (flexbackup-1.2.1.tar.gz) = 4955c89dbee354248f354a9bf0a480dd diff -urN flexbackup.orig/files/pkg-message.in flexbackup/files/pkg-message.in --- flexbackup.orig/files/pkg-message.in Wed Dec 31 17:00:00 1969 +++ flexbackup/files/pkg-message.in Mon Oct 13 19:45:41 2003 @@ -0,0 +1,23 @@ +--------------------- 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 + + %%CONFDIR%%/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. Man pages have also been written +and included in this version of the port! + +-------------------------------------------------------------------------------
John Reynolds wrote: > Based upon feedback, here is a new patch to apply to the 1.2.0 port. It > addresses some of the problems found in the other patch set. > + ${INSTALL_MAN} ${WRKSRC}/flexbackup.1 ${LOCALBASE}/man/man1 > + ${INSTALL_MAN} ${WRKSRC}/flexbackup.conf.5 ${LOCALBASE}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/flexbackup.1 ${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/flexbackup.conf.5 ${MAN5PREFIX}/man/man5 Would be more appropriate. LOCALBASE is where the other ports live, PREFIX is where your port installes its files.
[ On Tuesday, October 14, Oliver Eikemeier wrote: ] > John Reynolds wrote: > > Based upon feedback, here is a new patch to apply to the 1.2.0 port. It > > addresses some of the problems found in the other patch set. > > > + ${INSTALL_MAN} ${WRKSRC}/flexbackup.1 ${LOCALBASE}/man/man1 > > + ${INSTALL_MAN} ${WRKSRC}/flexbackup.conf.5 ${LOCALBASE}/man/man5 > + ${INSTALL_MAN} ${WRKSRC}/flexbackup.1 ${MAN1PREFIX}/man/man1 > + ${INSTALL_MAN} ${WRKSRC}/flexbackup.conf.5 ${MAN5PREFIX}/man/man5 > > Would be more appropriate. LOCALBASE is where the other ports live, PREFIX > is where your port installes its files. DOH! Yes, that is correct. To whomever commits the patch (second patch) can you change this on the INSTALL_MAN lines? Thanks! -Jr -- John & Jennifer Reynolds johnjen at reynoldsnet.org www.reynoldsnet.org Structural / Physical Design - ICG/PNG SCD jreynold at sedona.ch.intel.com Running FreeBSD since 2.1.5-RELEASE. FreeBSD: The Power to Serve! "Unix is user friendly, it's just particular about the friends it chooses."
State Changed From-To: open->closed Committed, thanks !