Date: Mon, 27 Dec 2004 01:16:16 +0100 (CET) From: Florent Thoumie <flz@xbsd.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/75522: Update port: net/bnbt - please krisbot, add conflicts, use SUB_FILES. Message-ID: <20041227001616.563DE11707@gate.xbsd.org> Resent-Message-ID: <200412270020.iBR0KO7c027543@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 75522 >Category: ports >Synopsis: Update port: net/bnbt - please krisbot, add conflicts, use SUB_FILES. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Dec 27 00:20:24 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Florent Thoumie >Release: FreeBSD 5.3-RELEASE i386 >Organization: Xbsd.org >Environment: System: FreeBSD gate.xbsd.org 5.3-RELEASE FreeBSD 5.3-RELEASE #2: Wed Nov 24 16:35:34 CET 2004 root@gate.xbsd.org:/usr/src/sys/i386/compile/GATE i386 >Description: Some files remains in PREFIX after port being deinstalled. This patch solves this problem. files/bnbt.sh has been renamed since I now use SUB_FILES variable. I added CONFLICTS so it can't be possible to install both bnbt and bnbt-mysql. >How-To-Repeat: >Fix: --- bnbt.diff begins here --- diff -ruN bnbt/Makefile bnbt.new/Makefile --- bnbt/Makefile Thu Dec 9 00:22:37 2004 +++ bnbt.new/Makefile Wed Dec 22 14:17:07 2004 @@ -17,18 +17,18 @@ USE_ZIP= yes WRKSRC= ${WRKDIR}/${PORTNAME}/src -PKGMESSAGE= ${WRKDIR}/pkg-message USE_GMAKE= yes USE_REINPLACE= yes USE_RC_SUBR= yes -SED_SCRIPT= -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%RC_SUBR%%,${RC_SUBR},g' +SUB_FILES= pkg-message bnbt.sh +SUB_LIST= RC_SUBR="${RC_SUBR}" -PLIST_FILES= bin/bnbt PORTDOCS= footer.html header.html lesser.txt readme.txt users.txt +CONFLICTS= ${PORTNAME}.*-[0-9]* + .if defined(WITH_MYSQL) ALL_TARGET= bnbtmysql PKGNAMESUFFIX= -mysql @@ -46,10 +46,6 @@ ${WRKSRC}/config.cpp @${REINPLACE_CMD} -e 's|bnbt.cfg|${PREFIX}/etc/${PORTNAME}/bnbt.cfg|' \ ${WRKSRC}/config.h ${WRKSRC}/config.cpp ${WRKSRC}/tracker.cpp - -post-build: - @${SED} ${SED_SCRIPT} ${FILESDIR}/bnbt.sh > ${WRKDIR}/bnbt.sh - @${SED} ${SED_SCRIPT} ${FILESDIR}/pkg-message.in > ${WRKDIR}/pkg-message do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${ALL_TARGET} ${PREFIX}/bin/bnbt diff -ruN bnbt/files/bnbt.sh bnbt.new/files/bnbt.sh --- bnbt/files/bnbt.sh Wed Oct 27 23:43:46 2004 +++ bnbt.new/files/bnbt.sh Thu Jan 1 01:00:00 1970 @@ -1,38 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/net/bnbt/files/bnbt.sh,v 1.1 2004/10/27 21:43:46 pav Exp $ -# - -# PROVIDE: bnbt -# REQUIRE: LOGIN abi -# BEFORE: securelevel -# KEYWORD: FreeBSD shutdown - -# Add the following line to /etc/rc.conf to enable `bnbt': -# -#bnbt_enable="YES" -# -# See bnbt(1) for bnbt_flags -# - -. "%%RC_SUBR%%" - -name="bnbt" -rcvar=`set_rcvar` - -# path to your executable, might be libxec, bin, sbin, ... -command="%%PREFIX%%/bin/$name" - -# extra required arguments -command_args="&" - -# you can check for required_dirs and required_vars too, see rc.subr(8) -# -required_dirs="/var/log/$name" - -# read settings, set default values -load_rc_config "$name" -: ${bnbt_enable="NO"} -: ${bnbt_flags=""} - -run_rc_command "$1" diff -ruN bnbt/files/bnbt.sh.in bnbt.new/files/bnbt.sh.in --- bnbt/files/bnbt.sh.in Thu Jan 1 01:00:00 1970 +++ bnbt.new/files/bnbt.sh.in Wed Dec 22 10:57:57 2004 @@ -0,0 +1,38 @@ +#!/bin/sh +# +# $FreeBSD: ports/net/bnbt/files/bnbt.sh,v 1.1 2004/10/27 21:43:46 pav Exp $ +# + +# PROVIDE: bnbt +# REQUIRE: LOGIN abi +# BEFORE: securelevel +# KEYWORD: FreeBSD shutdown + +# Add the following line to /etc/rc.conf to enable `bnbt': +# +#bnbt_enable="YES" +# +# See bnbt(1) for bnbt_flags +# + +. "%%RC_SUBR%%" + +name="bnbt" +rcvar=`set_rcvar` + +# path to your executable, might be libxec, bin, sbin, ... +command="%%PREFIX%%/bin/$name" + +# extra required arguments +command_args="&" + +# you can check for required_dirs and required_vars too, see rc.subr(8) +# +required_dirs="/var/log/$name" + +# read settings, set default values +load_rc_config "$name" +: ${bnbt_enable="NO"} +: ${bnbt_flags=""} + +run_rc_command "$1" diff -ruN bnbt/files/pkg-message.in bnbt.new/files/pkg-message.in --- bnbt/files/pkg-message.in Wed Oct 27 23:43:46 2004 +++ bnbt.new/files/pkg-message.in Thu Dec 23 11:16:47 2004 @@ -1,12 +1,9 @@ ************************************************************ - Bnbt has been successfully installed. In order to run bnbt, add the following lines to /etc/rc.conf: bnbt_enable="YES" -Then start the server with - %%PREFIX%%/etc/rc.d/bnbt.sh start +Then start the server with %%PREFIX%%/etc/rc.d/bnbt.sh start or reboot. - ************************************************************ diff -ruN bnbt/pkg-plist bnbt.new/pkg-plist --- bnbt/pkg-plist Thu Jan 1 01:00:00 1970 +++ bnbt.new/pkg-plist Wed Dec 22 14:30:26 2004 @@ -0,0 +1,3 @@ +bin/bnbt +@exec mkdir -p %D/etc/bnbt +@unexec rmdir %D/etc/bnbt 2>/dev/null || true --- bnbt.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041227001616.563DE11707>