Date: Sun, 30 May 2004 17:23:02 +0300 From: Andrey Slusar <vasallia@ukr.net> To: Pav Lucistnik <pav@FreeBSD.org> Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/67367: [PATCH] comms/bforce: update to 0.22.8.7 and fix warnings Message-ID: <861xl2gfjt.fsf@santinel.home.ua> In-Reply-To: <200405301032.i4UAW5q8099324@freefall.freebsd.org> (Pav Lucistnik's message of "Sun, 30 May 2004 03:32:05 -0700 (PDT)") References: <200405301032.i4UAW5q8099324@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
Hi.
Sun, 30 May 2004 03:32:05 -0700 (PDT), you wrote:
> Synopsis: [PATCH] comms/bforce: update to 0.22.8.7 and fix warnings
> State-Changed-From-To: open->closed
> State-Changed-By: pav
> State-Changed-When: Sun May 30 03:31:37 PDT 2004
> State-Changed-Why:
> Committed, thanks.
> Just a question - would CONFIGDIR under /usr/local worked too
> or have it to be under /etc?
In Makefile.in @prefix@/etc/... and configure-script changing this is
to /usr/local/etc/...
Please, change MAINTAINER to vasallia@ukr.net
Sorry, i adding mistakes in update. Patch in attachment
--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline; filename=bforce-kst.diff
diff -ru bforce-kst/Makefile bforce-kst.new/Makefile
--- bforce-kst/Makefile Sun May 30 17:01:07 2004
+++ bforce-kst.new/Makefile Sun May 30 17:15:08 2004
@@ -20,7 +20,7 @@
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-CONFIGDIR= /etc/fido/bforce
+CONFIGDIR= etc/fido/bforce
FIXME= include/bforce.h include/util.h include/logger.h \
bforce/bforce.c bforce/conf_proc.c bforce/conf_read.c bforce/daemon.c \
@@ -37,23 +37,24 @@
bforce/u_plock.c bfutil/bfindex.c
WRKSRC= ${WRKDIR}/${DISTNAME}/source
+PLIST_SUB+= CONFIGDIR=${CONFIGDIR}
pre-configure:
${MKDIR} ${WRKSRC}/bin
post-patch:
- @${REINPLACE_CMD} -e 's,/etc/bforce,${CONFIGDIR},g' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e 's,/etc/bforce,/${CONFIGDIR},g' ${WRKSRC}/Makefile.in
.for i in ${FIXME}
@${REINPLACE_CMD} -e 's,log(,bf_log(,g' ${WRKSRC}/${i}
.endfor
do-install:
- ${MKDIR} ${PREFIX}/etc/bforce
- ${INSTALL_DATA} ${WRKSRC}/../examples/bforce.conf ${PREFIX}/etc/bforce/bforce.conf.sample
- ${INSTALL_DATA} ${WRKSRC}/../examples/bforce.passwd ${PREFIX}/etc/bforce/bforce.passwd.sample
- ${INSTALL_DATA} ${WRKSRC}/../examples/bforce.subst ${PREFIX}/etc/bforce/bforce.subst.sample
- ${INSTALL_DATA} ${WRKSRC}/../examples/freq.aliases ${PREFIX}/etc/bforce/freq.aliases.sample
- ${INSTALL_DATA} ${WRKSRC}/../examples/freq.dirs ${PREFIX}/etc/bforce/freq.dirs.sample
+ ${MKDIR} ${PREFIX}/${CONFIGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/../examples/bforce.conf ${PREFIX}/${CONFIGDIR}/bforce.conf.sample
+ ${INSTALL_DATA} ${WRKSRC}/../examples/bforce.passwd ${PREFIX}/${CONFIGDIR}/bforce.passwd.sample
+ ${INSTALL_DATA} ${WRKSRC}/../examples/bforce.subst ${PREFIX}/${CONFIGDIR}/bforce.subst.sample
+ ${INSTALL_DATA} ${WRKSRC}/../examples/freq.aliases ${PREFIX}/${CONFIGDIR}/freq.aliases.sample
+ ${INSTALL_DATA} ${WRKSRC}/../examples/freq.dirs ${PREFIX}/${CONFIGDIR}/freq.dirs.sample
${INSTALL_PROGRAM} ${WRKSRC}/bin/bforce ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/bin/bfindex ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/bin/bfstat ${PREFIX}/bin
diff -ru bforce-kst/pkg-plist bforce-kst.new/pkg-plist
--- bforce-kst/pkg-plist Fri Jan 17 13:16:53 2003
+++ bforce-kst.new/pkg-plist Sun May 30 17:02:46 2004
@@ -2,9 +2,9 @@
bin/bfindex
bin/bfstat
bin/nlookup
-etc/bforce/bforce.conf.sample
-etc/bforce/bforce.passwd.sample
-etc/bforce/bforce.subst.sample
-etc/bforce/freq.aliases.sample
-etc/bforce/freq.dirs.sample
-@dirrm etc/bforce
+%%CONFIGDIR%%/bforce.conf.sample
+%%CONFIGDIR%%/bforce.passwd.sample
+%%CONFIGDIR%%/bforce.subst.sample
+%%CONFIGDIR%%/freq.aliases.sample
+%%CONFIGDIR%%/freq.dirs.sample
+@dirrm %%CONFIGDIR%%
--=-=-=
--anray
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?861xl2gfjt.fsf>